--- a/src/cjr_print.sml	Tue Jun 30 16:17:32 2009 -0400
+++ b/src/cjr_print.sml	Sun Jul 12 13:16:05 2009 -0400
@@ -1652,7 +1652,7 @@
 
                           #query (Settings.currentDbms ())
                                  {loc = loc,
-                                  numCols = length outputs,
+                                  cols = map (fn (_, t) => sql_type_in env t) outputs,
                                   doCols = doCols}]
                    | SOME (id, query) =>
                      box [p_list_sepi newline
@@ -1675,7 +1675,7 @@
                                           id = id,
                                           query = query,
                                           inputs = map #2 inputs,
-                                          numCols = length outputs,
+                                          cols = map (fn (_, t) => sql_type_in env t) outputs,
                                           doCols = doCols}],
                  newline,
 
@@ -2797,7 +2797,8 @@
                                                             box [string "uw_",
                                                                  string (CharVector.map Char.toLower x),
                                                                  space,
-                                                                 p_sqltype env (t, ErrorMsg.dummySpan)]) xts,
+                                                                 string (#p_sql_type (Settings.currentDbms ())
+                                                                                     (sql_type_in env t))]) xts,
                                                  case (pk, csts) of
                                                      ("", []) => box []
                                                    | _ => string ",",