Mercurial > urweb

diff src/monoize.sml @ 684:f0224c7f12bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expunging nullable fields
author Adam Chlipala <adamc@hcoop.net>
date Sun, 29 Mar 2009 14:13:50 -0400
parents 9a2c18dab11d
children a3ddf05fb3e3
line wrap: on
line diff
--- a/src/monoize.sml	Sun Mar 29 13:30:01 2009 -0400
+++ b/src/monoize.sml	Sun Mar 29 14:13:50 2009 -0400
@@ -2500,33 +2500,44 @@
                                                  | _ => st)
                                             | _ => st) ([], []) xts
 
+                            fun cond (x, v) =
+                                (L'.EStrcat ((L'.EPrim (Prim.String ("uw_" ^ x
+                                                                     ^ (case v of
+                                                                            Client => ""
+                                                                          | Channel => " >> 32")
+                                                                     ^ " = ")), loc),
+                                             target), loc)
+
+                            val e =
+                                foldl (fn ((x, v), e) =>
+                                          (L'.ESeq (
+                                           (L'.EDml (L'.EStrcat (
+                                                     (L'.EPrim (Prim.String ("UPDATE uw_"
+                                                                             ^ tab
+                                                                             ^ " SET uw_"
+                                                                             ^ x
+                                                                             ^ " = NULL WHERE ")), loc),
+                                                     cond (x, v)), loc), loc),
+                                           e), loc))
+                                      e nullable
+
                             val e =
                                 case notNullable of
                                     [] => e
                                   | eb :: ebs =>
-                                    let
-                                        fun cond (x, v) =
-                                            (L'.EStrcat ((L'.EPrim (Prim.String ("uw_" ^ x
-                                                                                 ^ (case v of
-                                                                                        Client => ""
-                                                                                      | Channel => " >> 32")
-                                                                                 ^ " = ")), loc),
-                                                         target), loc)
-                                    in
-                                        (L'.ESeq (
-                                         (L'.EDml (foldl
-                                                       (fn (eb, s) =>
-                                                           (L'.EStrcat (s,
-                                                                        (L'.EStrcat ((L'.EPrim (Prim.String " AND "),
-                                                                                      loc),
-                                                                                     cond eb), loc)), loc))
-                                                       (L'.EStrcat ((L'.EPrim (Prim.String ("DELETE FROM uw_"
-                                                                                            ^ tab
-                                                                                            ^ " WHERE ")), loc),
-                                                                    cond eb), loc)
-                                                       ebs), loc),
-                                         e), loc)
-                                    end
+                                    (L'.ESeq (
+                                     (L'.EDml (foldl
+                                                   (fn (eb, s) =>
+                                                       (L'.EStrcat (s,
+                                                                    (L'.EStrcat ((L'.EPrim (Prim.String " AND "),
+                                                                                  loc),
+                                                                                 cond eb), loc)), loc))
+                                                   (L'.EStrcat ((L'.EPrim (Prim.String ("DELETE FROM uw_"
+                                                                                        ^ tab
+                                                                                        ^ " WHERE ")), loc),
+                                                                cond eb), loc)
+                                                   ebs), loc),
+                                     e), loc)
                         in
                             e
                         end