From 80b09cb075fae057d8c201dc2f10106b32c2f083 Mon Sep 17 00:00:00 2001 From: erg Date: Wed, 20 Dec 2006 17:38:39 +0000 Subject: [PATCH] more sql changes --- libs/sql/simple.factor | 66 +++++++++++++++++------------------ libs/sql/sqlite/simple.factor | 3 ++ 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/libs/sql/simple.factor b/libs/sql/simple.factor index 64f912a26b..5ab99d28fa 100644 --- 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* ; : select-sql ( tuple -- string ) >r db get r> select-sql* ; -M: connection create-sql* ( db tuple -- string ) - nip [ - "create table " % - dup class unparse % "(" % - tuple>mapping% - ");" % - ] "" make ; - -M: connection drop-sql* ( db tuple -- string ) - nip [ "drop table " % tuple>sql-name % ";" % ] "" make ; - -M: connection insert-sql* ( db tuple -- string ) - nip [ - "insert into " % - dup tuple>sql-name % - ! " (" % fulltuple>insert-all-parts dup first ", " join % - ") values(" % - second [ escape-sql enquote ] map ", " join % - ");" % - ] "" make ; - -M: connection delete-sql* ( db tuples -- string ) - nip [ - ! "delete from table " % unparse % ";" % - ] "" make ; - -M: connection update-sql* ( db tuples -- string ) - nip [ - ] "" make ; - -M: connection select-sql* ( db tuples -- string ) - nip [ - ] "" make ; +! M: connection create-sql* ( db tuple -- string ) + ! nip [ + ! "create table " % + ! dup class unparse % "(" % + ! tuple>mapping% + ! ");" % + ! ] "" make ; + +! M: connection drop-sql* ( db tuple -- string ) + ! nip [ "drop table " % tuple>sql-name % ";" % ] "" make ; +! +! M: connection insert-sql* ( db tuple -- string ) + ! nip [ + ! "insert into " % + ! dup tuple>sql-name % + ! ! " (" % fulltuple>insert-all-parts dup first ", " join % + ! ") values(" % + ! second [ escape-sql enquote ] map ", " join % + ! ");" % + ! ] "" make ; +! +! M: connection delete-sql* ( db tuples -- string ) + ! nip [ + ! ! "delete from table " % unparse % ";" % + ! ] "" make ; +! +! M: connection update-sql* ( db tuples -- string ) + ! nip [ + ! ] "" make ; +! +! M: connection select-sql* ( db tuples -- string ) + ! nip [ + ! ] "" make ; diff --git a/libs/sql/sqlite/simple.factor b/libs/sql/sqlite/simple.factor index 6970c91f10..eed89fcf0b 100644 --- a/libs/sql/sqlite/simple.factor +++ b/libs/sql/sqlite/simple.factor @@ -14,6 +14,9 @@ M: sqlite create-sql* ( db tuple -- string ) ");" % ] "" make ; +M: sqlite drop-sql* ( db tuple -- string ) + nip [ "drop table " % tuple>sql-name % ";" % ] "" make + M: sqlite insert-sql* ( db tuple -- string ) #! Insert and fill in the ID column nip [ -- 2.34.1