diff src/cjr_print.sml @ 879:b2a175a0f2ef

Demo working with MySQL
author Adam Chlipala <adamc@hcoop.net>
date Thu, 16 Jul 2009 18:10:29 -0400
parents a8952047e1d3
children 8e9f2d247dba
line wrap: on
line diff
--- a/src/cjr_print.sml	Thu Jul 16 16:29:13 2009 -0400
+++ b/src/cjr_print.sml	Thu Jul 16 18:10:29 2009 -0400
@@ -1654,7 +1654,7 @@
                                  {loc = loc,
                                   cols = map (fn (_, t) => sql_type_in env t) outputs,
                                   doCols = doCols}]
-                   | SOME (id, query) =>
+                   | SOME {id, query, nested} =>
                      box [p_list_sepi newline
                                       (fn i => fn (e, t) =>
                                                   box [p_sql_type t,
@@ -1676,7 +1676,8 @@
                                           query = query,
                                           inputs = map #2 inputs,
                                           cols = map (fn (_, t) => sql_type_in env t) outputs,
-                                          doCols = doCols}],
+                                          doCols = doCols,
+                                          nested = nested}],
                  newline,
 
                  if wontLeakAnything then
@@ -1703,7 +1704,7 @@
                               newline,
                               newline,
                               #dml (Settings.currentDbms ()) loc]
-               | SOME (id, dml') =>
+               | SOME {id, dml = dml'} =>
                  let
                      val inputs = getPargs dml
                  in
@@ -1748,7 +1749,7 @@
                                                              seqName = case #1 seq of
                                                                            EPrim (Prim.String s) => SOME s
                                                                          | _ => NONE}
-               | SOME (id, query) => #nextvalPrepared (Settings.currentDbms ()) {loc = loc,
+               | SOME {id, query} => #nextvalPrepared (Settings.currentDbms ()) {loc = loc,
                                                                                  id = id,
                                                                                  query = query},
              newline,