From cc79a0b5321ef71d4e1e3aaeb0f33afcb08e974b Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adamc@hcoop.net>
Date: Sun, 28 Jun 2009 16:03:00 -0400
Subject: Moved query code into Settings

---
 src/settings.sml | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

(limited to 'src/settings.sml')

diff --git a/src/settings.sml b/src/settings.sml
index ed3d1f14..2e0a5ac8 100644
--- a/src/settings.sml
+++ b/src/settings.sml
@@ -274,12 +274,54 @@ val debug = ref false
 fun setDebug b = debug := b
 fun getDebug () = !debug
 
+datatype sql_type =
+         Int
+       | Float
+       | String
+       | Bool
+       | Time
+       | Blob
+       | Channel
+       | Client
+       | Nullable of sql_type
+
+fun p_sql_type t =
+    let
+        open Print.PD
+        open Print
+    in
+        case t of
+            Int => string "uw_Basis_int"
+          | Float => string "uw_Basis_float"
+          | String => string "uw_Basis_string"
+          | Bool => string "uw_Basis_bool"
+          | Time => string "uw_Basis_time"
+          | Blob => string "uw_Basis_blob"
+          | Channel => string "uw_Basis_channel"
+          | Client => string "uw_Basis_client"
+          | Nullable String => string "uw_Basis_string"
+          | Nullable t => box [p_sql_type t, string "*"]
+    end
+
+fun isBlob Blob = true
+  | isBlob (Nullable t) = isBlob t
+  | isBlob _ = false
+
 type dbms = {
      name : string,
      header : string,
      link : string,
      global_init : Print.PD.pp_desc,
-     init : string * (string * int) list -> Print.PD.pp_desc
+     init : string * (string * int) list -> Print.PD.pp_desc,
+     query : {loc : ErrorMsg.span, numCols : int,
+              doCols : ({wontLeakStrings : bool, col : int, typ : sql_type} -> Print.PD.pp_desc)
+                       -> Print.PD.pp_desc}
+             -> Print.PD.pp_desc,
+     queryPrepared : {loc : ErrorMsg.span, id : int, query : string,
+                      inputs : sql_type list, numCols : int,
+                      doCols : ({wontLeakStrings : bool, col : int, typ : sql_type} -> Print.PD.pp_desc)
+                               -> Print.PD.pp_desc}
+                     -> Print.PD.pp_desc
 }
 
 val dbmses = ref ([] : dbms list)
@@ -287,7 +329,9 @@ val curDb = ref ({name = "",
                   header = "",
                   link = "",
                   global_init = Print.box [],
-                  init = fn _ => Print.box []} : dbms)
+                  init = fn _ => Print.box [],
+                  query = fn _ => Print.box [],
+                  queryPrepared = fn _ => Print.box []} : dbms)
 
 fun addDbms v = dbmses := v :: !dbmses
 fun setDbms s =
-- 
cgit v1.2.3