steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more sql changes

darcs last-darcs-commit
erg 2006-12-20 17:38:39 +00:00
parent 4ad2ce0968
commit d43fa51b5f
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
libs/sql/simple.factor
View File

@ -16,38 +16,38 @@ G: select-sql* ( db tuple -- string ) 1 standard-combination ;
: update-sql ( tuple -- string ) >r db get r> update-sql* ; : update-sql ( tuple -- string ) >r db get r> update-sql* ;
: select-sql ( tuple -- string ) >r db get r> select-sql* ; : select-sql ( tuple -- string ) >r db get r> select-sql* ;
M: connection create-sql* ( db tuple -- string ) ! M: connection create-sql* ( db tuple -- string )
nip [ ! nip [
"create table " % ! "create table " %
dup class unparse % "(" % ! dup class unparse % "(" %
tuple>mapping% ! tuple>mapping%
");" % ! ");" %
] "" make ; ! ] "" make ;
M: connection drop-sql* ( db tuple -- string ) ! M: connection drop-sql* ( db tuple -- string )
nip [ "drop table " % tuple>sql-name % ";" % ] "" make ; ! nip [ "drop table " % tuple>sql-name % ";" % ] "" make ;
!
M: connection insert-sql* ( db tuple -- string ) ! M: connection insert-sql* ( db tuple -- string )
nip [ ! nip [
"insert into " % ! "insert into " %
dup tuple>sql-name % ! dup tuple>sql-name %
! " (" % fulltuple>insert-all-parts dup first ", " join % ! ! " (" % fulltuple>insert-all-parts dup first ", " join %
") values(" % ! ") values(" %
second [ escape-sql enquote ] map ", " join % ! second [ escape-sql enquote ] map ", " join %
");" % ! ");" %
] "" make ; ! ] "" make ;
!
M: connection delete-sql* ( db tuples -- string ) ! M: connection delete-sql* ( db tuples -- string )
nip [ ! nip [
! "delete from table " % unparse % ";" % ! ! "delete from table " % unparse % ";" %
] "" make ; ! ] "" make ;
!
M: connection update-sql* ( db tuples -- string ) ! M: connection update-sql* ( db tuples -- string )
nip [ ! nip [
] "" make ; ! ] "" make ;
!
M: connection select-sql* ( db tuples -- string ) ! M: connection select-sql* ( db tuples -- string )
nip [ ! nip [
] "" make ; ! ] "" make ;

3
libs/sql/sqlite/simple.factor
View File

@ -14,6 +14,9 @@ M: sqlite create-sql* ( db tuple -- string )
");" % ");" %
] "" make ; ] "" make ;
M: sqlite drop-sql* ( db tuple -- string )
nip [ "drop table " % tuple>sql-name % ";" % ] "" make
M: sqlite insert-sql* ( db tuple -- string ) M: sqlite insert-sql* ( db tuple -- string )
#! Insert and fill in the ID column #! Insert and fill in the ID column
nip [ nip [