more sql changes

diff --git a/libs/sql/simple.factor b/libs/sql/simple.factor
index 64f912a26bbf6bab8f868583f69c5b22c2345353..5ab99d28fafac9320c49c855cc1a6da2e03b416a 100644 (file)
--- a/libs/sql/simple.factor
+++ b/libs/sql/simple.factor
@@ -16,38 +16,38 @@ G: select-sql* ( db tuple -- string ) 1 standard-combination ;
 : update-sql ( tuple -- string ) >r db get r> update-sql* ;\r
 : select-sql ( tuple -- string ) >r db get r> select-sql* ;\r
 \r
-M: connection create-sql* ( db tuple -- string )\r
-    nip [\r
-        "create table " %\r
-        dup class unparse % "(" %\r
-        tuple>mapping%\r
-        ");" %\r
-    ] "" make ;\r
-\r
-M: connection drop-sql* ( db tuple -- string )\r
-    nip [ "drop table " % tuple>sql-name % ";" % ] "" make ;\r
-\r
-M: connection insert-sql* ( db tuple -- string )\r
-    nip [\r
-        "insert into " %\r
-        dup tuple>sql-name %\r
-        ! " (" % fulltuple>insert-all-parts dup first ", " join %\r
-        ") values(" %\r
-        second [ escape-sql enquote ] map ", " join %\r
-        ");" %\r
-    ] "" make ;\r
-\r
-M: connection delete-sql* ( db tuples -- string )\r
-    nip [\r
-        ! "delete from table " % unparse % ";" %\r
-    ] "" make ;\r
-\r
-M: connection update-sql* ( db tuples -- string )\r
-    nip [\r
-    ] "" make ;\r
-\r
-M: connection select-sql* ( db tuples -- string )\r
-    nip [\r
-    ] "" make ;\r
+! M: connection create-sql* ( db tuple -- string )\r
+    ! nip [\r
+        ! "create table " %\r
+        ! dup class unparse % "(" %\r
+        ! tuple>mapping%\r
+        ! ");" %\r
+    ! ] "" make ;\r
+\r
+! M: connection drop-sql* ( db tuple -- string )\r
+    ! nip [ "drop table " % tuple>sql-name % ";" % ] "" make ;\r
+! \r
+! M: connection insert-sql* ( db tuple -- string )\r
+    ! nip [\r
+        ! "insert into " %\r
+        ! dup tuple>sql-name %\r
+        ! ! " (" % fulltuple>insert-all-parts dup first ", " join %\r
+        ! ") values(" %\r
+        ! second [ escape-sql enquote ] map ", " join %\r
+        ! ");" %\r
+    ! ] "" make ;\r
+! \r
+! M: connection delete-sql* ( db tuples -- string )\r
+    ! nip [\r
+        ! ! "delete from table " % unparse % ";" %\r
+    ! ] "" make ;\r
+! \r
+! M: connection update-sql* ( db tuples -- string )\r
+    ! nip [\r
+    ! ] "" make ;\r
+! \r
+! M: connection select-sql* ( db tuples -- string )\r
+    ! nip [\r
+    ! ] "" make ;\r
 \r
 \r

diff --git a/libs/sql/sqlite/simple.factor b/libs/sql/sqlite/simple.factor
index 6970c91f107a266ec38d0bf53b99e3fc0f411a22..eed89fcf0b077cc89d3eb405a953416c634b8fd2 100644 (file)
--- a/libs/sql/sqlite/simple.factor
+++ b/libs/sql/sqlite/simple.factor
@@ -14,6 +14,9 @@ M: sqlite create-sql* ( db tuple -- string )
         ");" %\r
     ] "" make ;\r
 \r
+M: sqlite drop-sql* ( db tuple -- string )\r
+    nip [ "drop table " % tuple>sql-name % ";" % ] "" make \r
+\r
 M: sqlite insert-sql* ( db tuple -- string )\r
     #! Insert and fill in the ID column\r
     nip [\r