more generics in the statement protocol

diff --git a/extra/db2/db2.factor b/extra/db2/db2.factor
index 71f181e8d7e57556bb1e7a86615fcf4ec2539d23..8d4bfd19a04a626a01c2f099139007b6b7995267 100644 (file)
--- a/extra/db2/db2.factor
+++ b/extra/db2/db2.factor
@@ -23,36 +23,24 @@ PRIVATE>
 
 : sql-bind-command ( sequence string -- )
     f f <statement> [
-        sqlite-maybe-prepare [
-            handle>> swap sqlite-bind-sequence
-        ] [
-            >sqlite-result-set drop
-        ] bi
+        prepare-statement
+        [ bind-sequence ] [ statement>result-set drop ] bi
     ] with-disposal ;
 
 : sql-bind-query ( in-sequence string -- out-sequence )
     f f <statement> [
-        sqlite-maybe-prepare [
-            handle>> swap sqlite-bind-sequence
-        ] [
-            statement>result-sequence
-        ] bi
+        prepare-statement
+        [ bind-sequence ] [ statement>result-sequence ] bi
     ] with-disposal ;
 
 : sql-bind-typed-command ( in-sequence string -- )
     f f <statement> [
-        sqlite-maybe-prepare [
-            handle>> swap sqlite-bind-typed-sequence
-        ] [
-            >sqlite-result-set drop
-        ] bi
+        prepare-statement
+        [ bind-typed-sequence ] [ statement>result-set drop ] bi
     ] with-disposal ;
 
 : sql-bind-typed-query ( in-sequence string -- out-sequence )
     f f <statement> [
-        sqlite-maybe-prepare [
-            handle>> swap sqlite-bind-typed-sequence
-        ] [
-            statement>result-sequence
-        ] bi
+        prepare-statement
+        [ bind-typed-sequence ] [ statement>result-sequence ] bi
     ] with-disposal ;

diff --git a/extra/db2/sqlite/lib/lib.factor b/extra/db2/sqlite/lib/lib.factor
index 483987d80398c9ae5a714c3bfd871e5618958477..f8503ee90ff7ae4eb661302e0733ed07749ad5d7 100644 (file)
--- a/extra/db2/sqlite/lib/lib.factor
+++ b/extra/db2/sqlite/lib/lib.factor
@@ -114,8 +114,5 @@ IN: db2.sqlite.lib
 : sqlite-next ( prepared -- ? )
     sqlite3_step sqlite-step-has-more-rows? ;
 
-: sqlite-bind-sequence ( handle sequence -- )
-    [ 1+ swap sqlite-bind-text ] assoc-with each-index ;
-
 : >sqlite-result-set ( statement -- result-set )
     sqlite-result-set new-result-set dup advance-row ;

diff --git a/extra/db2/sqlite/statements/statements.factor b/extra/db2/sqlite/statements/statements.factor
index a856c48075d133eb47d801f7e2e692c89de16772..64ce390308bf6d55e9b4898c7466194acb64830f 100644 (file)
--- a/extra/db2/sqlite/statements/statements.factor
+++ b/extra/db2/sqlite/statements/statements.factor
@@ -14,8 +14,6 @@ M: sqlite-statement dispose
     handle>>
     [ [ sqlite3_reset drop ] [ sqlite-finalize ] bi ] when* ;
 
-: sqlite-maybe-prepare ( statement -- statement )
-    dup handle>> [
-        db-connection get handle>> over sql>> sqlite-prepare
-        >>handle
-    ] unless ;
+M: sqlite-statement prepare-statement* ( statement -- statement )
+    db-connection get handle>> over sql>> sqlite-prepare
+    >>handle ;

diff --git a/extra/db2/sqlite/types/types.factor b/extra/db2/sqlite/types/types.factor
index 5429de0d7cba6515db672fd58ce4a78241ed3a32..7124568fbedbe84f0b0d5340f2b6551428fdb90a 100644 (file)
--- a/extra/db2/sqlite/types/types.factor
+++ b/extra/db2/sqlite/types/types.factor
@@ -84,5 +84,12 @@ IN: db2.sqlite.types
         [ no-sql-type ]
     } case ;
 
-: sqlite-bind-typed-sequence ( handle sequence -- )
-    [ 1+ swap first2 swap bind-next-sqlite-type ] assoc-with each-index ;
+M: sqlite-statement bind-sequence ( sequence statement -- )
+    handle>> '[
+        [ _ ] 2dip 1+ swap sqlite-bind-text
+    ] each-index ;
+
+M: sqlite-statement bind-typed-sequence ( sequence statement -- )
+    handle>> '[
+        [ _ ] 2dip 1+ swap first2 swap bind-next-sqlite-type
+    ] each-index ;

diff --git a/extra/db2/statements/statements.factor b/extra/db2/statements/statements.factor
index 006cda3532ef5bfdaabf20af4ccdd516f7f76a99..989391473dbd62a0396d41a59be33f738375c6d7 100644 (file)
--- a/extra/db2/statements/statements.factor
+++ b/extra/db2/statements/statements.factor
@@ -15,6 +15,9 @@ TUPLE: statement handle sql in out type ;
 HOOK: <statement> db-connection ( sql in out -- statement )
 GENERIC: statement>result-set* ( statement -- result-set )
 GENERIC: execute-statement* ( statement type -- )
+GENERIC: prepare-statement* ( statement -- statement' )
+GENERIC: bind-sequence ( sequence statement -- )
+GENERIC: bind-typed-sequence ( sequence statement -- )
 
 : statement>result-set ( statement -- result-set )
     [ statement>result-set* ]
@@ -31,6 +34,9 @@ M: object execute-statement* ( statement type -- )
     [ [ execute-one-statement ] each ]
     [ execute-one-statement ] if ;
 
+: prepare-statement ( statement -- statement )
+    dup handle>> [ prepare-statement* ] unless ;
+
 : statement-each ( statement quot: ( statement -- ) -- )
     over more-rows?
     [ [ call ] 2keep over advance-row statement-each ]