Implement the experimental sqlite3_bind_parameter_count() API in support

of DBD::SQLite.  Also fix the sqlite3.def export list. (CVS 1797)

FossilOrigin-Name: c44943e6fe0c88830102253591a501dc7d724d2f

diff --git a/manifest b/manifest
index 43096baeefd462316eefc96bf812a92b702e3dd8..1da6de3e2b5390abd643b15e60e07f0a13c0506a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sSrcList.nSrc\sa\ssigned\squantity\sto\savoid\sproblems\sin\sAIX.\s(CVS\s1796)
-D 2004-07-15T13:37:22
+C Implement\sthe\sexperimental\ssqlite3_bind_parameter_count()\sAPI\sin\ssupport\nof\sDBD::SQLite.\s\sAlso\sfix\sthe\ssqlite3.def\sexport\slist.\s(CVS\s1797)
+D 2004-07-15T14:15:01
 F Makefile.in 77d1219b6563476711a7a962e865979a6f314eb0
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -19,11 +19,11 @@ F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
 F main.mk 1fabb57eba6c25d98ec8a2127850673f2425c458
 F mkdll.sh 68d34a961a1fdfa15ef27fc4f4740be583112124
-F publish.sh 5d2c2df82591fb2d92eddcc0736e5265c2e7ffca
+F publish.sh 73703b55b590a7b7ee305b05445a424ec47be29e
 F spec.template a38492f1c1dd349fc24cb0565e08afc53045304b
 F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
-F sqlite3.def 26f4e7b0a3fbaa55701e020fdec429f1594e2866
+F sqlite3.def 7610bb4092dcfa7db8fe6d9a92d3e51adce23566
 F src/attach.c 132498271187144919de139673ad648b8e82c77e
 F src/auth.c 60db23b98bb94c8b0178180faaf49dc116674217
 F src/btree.c 3ed3c19e43bb243f502ee614f6ad0a52e53362a7
@@ -58,11 +58,11 @@ F src/printf.c 3090c8ff397d549bc0de09b16d8ab7fd37a0c3f7
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c f02a65af34231031896e8442161cb5251e191e75
 F src/shell.c ebec5da57ea401f4886eefc790917b939d94d595
-F src/sqlite.h.in b70fded2bdfeaddfb06adea3888118b722975136
+F src/sqlite.h.in aaf46c8d458efd8aca694ec4f18c6ecf616ee55e
 F src/sqliteInt.h aeae6793d1db335ec1179ad9f26b0affc0ec658a
 F src/table.c 4521c278892f60e4d630788c0ea5cf4db1e75c49
 F src/tclsqlite.c 62848128011e59291902c6e5c6f910c05956fcbb
-F src/test1.c 470430e194e43abb7d05b993fb360344f3d58834
+F src/test1.c d491aea9d451d2b6a24cf028cd7e3a9d875bb0f3
 F src/test2.c dafd8bd314a554bf376c6d3a8c83fd69219f5a40
 F src/test3.c d0c56667e89f79ad0f060fdf010d1c34a4bc2988
 F src/test4.c a921a69821fd30209589228e64f94e9f715b6fe2
@@ -76,7 +76,7 @@ F src/vacuum.c b8546f4921719458cc537b9e736df52a8256399c
 F src/vdbe.c ed98f1d70b0d7126c603b086137af85c7b9d7855
 F src/vdbe.h 75b241c02431b9c0f16eaa9cdbb34146c6287f52
 F src/vdbeInt.h 7160653a006b6d2c4a00d204112a095bdf842ab6
-F src/vdbeapi.c 1d2a0bc5033a677f414c592aacd5d02f07ebbef5
+F src/vdbeapi.c c5c6d8f162a9581dde497b1a4034f9a0bf54c355
 F src/vdbeaux.c 4de85e30ca4a83ea0a45eceb7e88ac7a48f4c237
 F src/vdbemem.c bbf621377343bee046547712a144a94f387bb1eb
 F src/where.c 6507074d8ce3f78e7a4cd33f667f11e62020553e
@@ -87,7 +87,7 @@ F test/attach3.test c4cc0b806783ce3d860af6b80c947f93ffb14270
 F test/auth.test 23d1dbf2235635409fee36535a344edc7494aea2
 F test/bigfile.test 62722ac4b420dfbcdceb137b8634e2cf2865fe27
 F test/bigrow.test 8ab252dba108f12ad64e337b0f2ff31a807ac578
-F test/bind.test ca031e902f63fb7d69545b4a47b0c7aea8747ffe
+F test/bind.test 94c3df3da774b48c6946c81b1d7f1b1646e0bd46
 F test/blob.test 8727a7b46b2073a369cfc9bcb6f54dd366b9d884
 F test/btree.test 973791eb269ab320c1a2bf0c440adee28ea936d2
 F test/btree2.test aa4a6d05b1ea90b1acaf83ba89039dd302a88635
@@ -228,12 +228,12 @@ F www/opcode.tcl e8c421fd2c70c503b25cedb3f9617a1f387ac7ea
 F www/quickstart.tcl 4e97bef825e6a4153c43afb9f97235fc4da278ab
 F www/speed.tcl 19cf0c1bf73c4b534dfafc95b3eacff4825740b4
 F www/sqlite.tcl b51fd15f0531a54874de785a9efba323eecd5975
-F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248
+F www/support.tcl 836a8d63f9a4feb72b7004c8dbc7a7e4142d9e10
 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 660b89a0fc031e798ce14f25273468e85e038efa
-R 4d115041ead14b1851e96d639a0c98a5
+P f2bb83cfd7e6b7ff853099897a24346a2991bc57
+R 5e600ef03c9d9c5e0707da9897f4611a
 U drh
-Z f9c34d548d91feacb261d91b1b28841f
+Z 0b45212062ad5a110f22f98ad4c5a9a5

diff --git a/manifest.uuid b/manifest.uuid
index 8f04d73397515ff120bbac36b29dba8cb1138bb9..b1d2458c9f8c3c071b1936df541ef28a3ba37709 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f2bb83cfd7e6b7ff853099897a24346a2991bc57
\ No newline at end of file
+c44943e6fe0c88830102253591a501dc7d724d2f
\ No newline at end of file

diff --git a/publish.sh b/publish.sh
index b6099c7fc23e4cab54e21b1532828acf7ae3ac40..476ed37cd6dfe143ae7cee279e645a309cc7d3bd 100644 (file)
--- a/publish.sh
+++ b/publish.sh
@@ -14,6 +14,7 @@ srcdir=`echo "$0" | sed 's%\(^.*\)/[^/][^/]*$%\1%'`
 # Get the makefile.
 #
 cp $srcdir/Makefile.linux-gcc ./Makefile
+cp $srcdir/sqlite3.def ./sqlite3.def
 chmod +x $srcdir/install-sh
 
 # Get the current version number - needed to help build filenames
@@ -82,76 +83,8 @@ i386-mingw32msvc-dllwrap \
      -dllname tclsqlite3.dll -lmsvcrt *.o $TCLSTUBLIB
 i386-mingw32msvc-strip tclsqlite3.dll
 rm tclsqlite.o
+cp ../sqlite3.def .
 cat >sqlite3.def <<\END_OF_FILE
-EXPORTS
-sqlite3_aggregate_context
-sqlite3_aggregate_count
-sqlite3_bind_blob
-sqlite3_bind_double
-sqlite3_bind_int
-sqlite3_bind_int64
-sqlite3_bind_null
-sqlite3_bind_text
-sqlite3_bind_text16
-sqlite3_busy_handler
-sqlite3_busy_timeout
-sqlite3_close
-sqlite3_column_blob
-sqlite3_column_bytes
-sqlite3_column_bytes16
-sqlite3_column_count
-sqlite3_column_decltype
-sqlite3_column_decltype16
-sqlite3_column_double
-sqlite3_column_int
-sqlite3_column_int64
-sqlite3_column_name
-sqlite3_column_name16
-sqlite3_column_text
-sqlite3_column_text16
-sqlite3_column_type
-sqlite3_complete
-sqlite3_complete16
-sqlite3_create_function
-sqlite3_create_function16
-sqlite3_errcode
-sqlite3_errmsg
-sqlite3_errmsg16
-sqlite3_exec
-sqlite3_finalize
-sqlite3_free
-sqlite3_interrupt
-sqlite3_last_insert_rowid
-sqlite3_mprintf
-sqlite3_open
-sqlite3_open16
-sqlite3_prepare
-sqlite3_prepare16
-sqlite3_reset
-sqlite3_result_blob
-sqlite3_result_double
-sqlite3_result_error
-sqlite3_result_error16
-sqlite3_result_int
-sqlite3_result_int64
-sqlite3_result_null
-sqlite3_result_text
-sqlite3_result_text16
-sqlite3_result_value
-sqlite3_set_authorizer
-sqlite3_step
-sqlite3_user_data
-sqlite3_value_blob
-sqlite3_value_bytes
-sqlite3_value_bytes16
-sqlite3_value_double
-sqlite3_value_int
-sqlite3_value_int64
-sqlite3_value_text
-sqlite3_value_text16
-sqlite3_value_type
-sqlite3_vmprintf
-END_OF_FILE
 i386-mingw32msvc-dllwrap \
      --def sqlite3.def -v --export-all \
      --driver-name i386-mingw32msvc-gcc \

diff --git a/sqlite3.def b/sqlite3.def
index 87461bef3b44400417ff2009a44794b4c262c8e3..b46ec58eecd9ea08ebf00a4587eba4058bdd91e2 100644 (file)
--- a/sqlite3.def
+++ b/sqlite3.def
@@ -1,84 +1,85 @@
-EXPORTS\r
-sqlite3_aggregate_context\r
-sqlite3_aggregate_count\r
-sqlite3_bind_blob\r
-sqlite3_bind_double\r
-sqlite3_bind_int\r
-sqlite3_bind_int64\r
-sqlite3_bind_null\r
-sqlite3_bind_text\r
-sqlite3_bind_text16\r
-sqlite3_busy_handler\r
-sqlite3_busy_timeout\r
-sqlite3_changes\r
-sqlite3_close\r
-sqlite3_collation_needed\r
-sqlite3_collation_needed16\r
-sqlite3_column_blob\r
-sqlite3_column_bytes\r
-sqlite3_column_bytes16\r
-sqlite3_column_count\r
-sqlite3_column_decltype\r
-sqlite3_column_decltype16\r
-sqlite3_column_double\r
-sqlite3_column_int\r
-sqlite3_column_int64\r
-sqlite3_column_name\r
-sqlite3_column_name16\r
-sqlite3_column_text\r
-sqlite3_column_text16\r
-sqlite3_column_type\r
-sqlite3_commit_hook\r
-sqlite3_complete\r
-sqlite3_complete16\r
-sqlite3_create_collation\r
-sqlite3_create_collation16\r
-sqlite3_create_function\r
-sqlite3_create_function16\r
-sqlite3_data_count\r
-sqlite3_errcode\r
-sqlite3_errmsg\r
-sqlite3_errmsg16\r
-sqlite3_exec\r
-sqlite3_finalize\r
-sqlite3_free\r
-sqlite3_free_table\r
-sqlite3_get_table\r
-sqlite3_interrupt\r
-sqlite3_last_insert_rowid\r
-sqlite3_mprintf\r
-sqlite3_open\r
-sqlite3_open16\r
-sqlite3_prepare\r
-sqlite3_prepare16\r
-sqlite3_progress_handler\r
-sqlite3_reset\r
-sqlite3_result_blob\r
-sqlite3_result_double\r
-sqlite3_result_error\r
-sqlite3_result_error16\r
-sqlite3_result_int\r
-sqlite3_result_int64\r
-sqlite3_result_null\r
-sqlite3_result_text\r
-sqlite3_result_text16\r
-sqlite3_result_text16be\r
-sqlite3_result_text16le\r
-sqlite3_result_value\r
-sqlite3_set_authorizer\r
-sqlite3_step\r
-sqlite3_total_changes\r
-sqlite3_trace\r
-sqlite3_user_data\r
-sqlite3_value_blob\r
-sqlite3_value_bytes\r
-sqlite3_value_bytes16\r
-sqlite3_value_double\r
-sqlite3_value_int\r
-sqlite3_value_int64\r
-sqlite3_value_text\r
-sqlite3_value_text16\r
-sqlite3_value_text16be\r
-sqlite3_value_text16le\r
-sqlite3_value_type\r
-sqlite3_vmprintf\r
+EXPORTS
+sqlite3_aggregate_context
+sqlite3_aggregate_count
+sqlite3_bind_blob
+sqlite3_bind_double
+sqlite3_bind_int
+sqlite3_bind_int64
+sqlite3_bind_null
+sqlite3_bind_parameter_count
+sqlite3_bind_text
+sqlite3_bind_text16
+sqlite3_busy_handler
+sqlite3_busy_timeout
+sqlite3_changes
+sqlite3_close
+sqlite3_collation_needed
+sqlite3_collation_needed16
+sqlite3_column_blob
+sqlite3_column_bytes
+sqlite3_column_bytes16
+sqlite3_column_count
+sqlite3_column_decltype
+sqlite3_column_decltype16
+sqlite3_column_double
+sqlite3_column_int
+sqlite3_column_int64
+sqlite3_column_name
+sqlite3_column_name16
+sqlite3_column_text
+sqlite3_column_text16
+sqlite3_column_type
+sqlite3_commit_hook
+sqlite3_complete
+sqlite3_complete16
+sqlite3_create_collation
+sqlite3_create_collation16
+sqlite3_create_function
+sqlite3_create_function16
+sqlite3_data_count
+sqlite3_errcode
+sqlite3_errmsg
+sqlite3_errmsg16
+sqlite3_exec
+sqlite3_finalize
+sqlite3_free
+sqlite3_free_table
+sqlite3_get_table
+sqlite3_interrupt
+sqlite3_last_insert_rowid
+sqlite3_mprintf
+sqlite3_open
+sqlite3_open16
+sqlite3_prepare
+sqlite3_prepare16
+sqlite3_progress_handler
+sqlite3_reset
+sqlite3_result_blob
+sqlite3_result_double
+sqlite3_result_error
+sqlite3_result_error16
+sqlite3_result_int
+sqlite3_result_int64
+sqlite3_result_null
+sqlite3_result_text
+sqlite3_result_text16
+sqlite3_result_text16be
+sqlite3_result_text16le
+sqlite3_result_value
+sqlite3_set_authorizer
+sqlite3_step
+sqlite3_total_changes
+sqlite3_trace
+sqlite3_user_data
+sqlite3_value_blob
+sqlite3_value_bytes
+sqlite3_value_bytes16
+sqlite3_value_double
+sqlite3_value_int
+sqlite3_value_int64
+sqlite3_value_text
+sqlite3_value_text16
+sqlite3_value_text16be
+sqlite3_value_text16le
+sqlite3_value_type
+sqlite3_vmprintf

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 69750ebddfe717f67e3d8d8f338e8229211fef2d..9eba6d53c219cd9e2f53d4adc7513106c22f4847 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -12,7 +12,7 @@
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.
 **
-** @(#) $Id: sqlite.h.in,v 1.107 2004/06/25 10:25:11 danielk1977 Exp $
+** @(#) $Id: sqlite.h.in,v 1.108 2004/07/15 14:15:02 drh Exp $
 */
 #ifndef _SQLITE_H_
 #define _SQLITE_H_
@@ -621,6 +621,14 @@ int sqlite3_bind_text(sqlite3_stmt*, int, const char*, int n, void(*)(void*));
 int sqlite3_bind_text16(sqlite3_stmt*, int, const void*, int, void(*)(void*));
 int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
 
+/*
+** Return the number of wildcards in a compiled SQL statement.  This
+** routine was added to support DBD::SQLite.
+**
+**** EXPERIMENTAL *****
+*/
+int sqlite3_bind_parameter_count(sqlite3_stmt*);
+
 /*
 ** Return the number of columns in the result set returned by the compiled
 ** SQL statement. This routine returns 0 if pStmt is an SQL statement

diff --git a/src/test1.c b/src/test1.c
index 2fc8164c6cac2943a4113d66744746898a8017cc..38271b6cfb317284ec57d6188b749e5b68f0f035 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.92 2004/06/30 08:20:16 danielk1977 Exp $
+** $Id: test1.c,v 1.93 2004/07/15 14:15:02 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -1527,6 +1527,28 @@ static int test_bind_blob(
   return TCL_OK;
 }
 
+/*
+** Usage:   sqlite3_bind_parameter_count  STMT
+**
+** Return the number of wildcards in the given statement.
+*/
+static int test_bind_parameter_count(
+  void * clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  sqlite3_stmt *pStmt;
+
+  if( objc!=2 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "STMT");
+    return TCL_ERROR;
+  }
+  if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR;
+  Tcl_SetObjResult(interp, Tcl_NewIntObj(sqlite3_bind_parameter_count(pStmt)));
+  return TCL_OK;
+}
+
 /*
 ** Usage: sqlite3_errcode DB
 **
@@ -2295,6 +2317,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
      { "sqlite3_bind_text",             test_bind_text     ,0 },
      { "sqlite3_bind_text16",           test_bind_text16   ,0 },
      { "sqlite3_bind_blob",             test_bind_blob     ,0 },
+     { "sqlite3_bind_parameter_count",  test_bind_parameter_count, 0},
      { "sqlite3_errcode",               test_errcode       ,0 },
      { "sqlite3_errmsg",                test_errmsg        ,0 },
      { "sqlite3_errmsg16",              test_errmsg16      ,0 },

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index e8e389ca37c18f07dfcc3bf9597ef86b9c255d88..ced6437d4b266491f42a49506cf4aa9006258221 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -514,3 +514,13 @@ int sqlite3_bind_text16(
   rc = sqlite3VdbeChangeEncoding(pVar, p->db->enc);
   return rc;
 }
+
+/*
+** Return the number of wildcards that can be potentially bound to.
+** This routine is added to support DBD::SQLite.  
+**
+******** EXPERIMENTAL *******
+*/
+int sqlite3_bind_parameter_count(sqlite3_stmt *pStmt){
+  return ((Vdbe*)pStmt)->nVar;
+}

diff --git a/test/bind.test b/test/bind.test
index 3ddb208db979625de104305c65529346bf2111c8..5b548b92133e1f12936b4ea6f371f13221608097 100644 (file)
--- a/test/bind.test
+++ b/test/bind.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the sqlite_bind API.
 #
-# $Id: bind.test,v 1.14 2004/06/28 13:09:11 danielk1977 Exp $
+# $Id: bind.test,v 1.15 2004/07/15 14:15:02 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -41,6 +41,9 @@ do_test bind-1.1 {
   set VM [sqlite3_prepare $DB {INSERT INTO t1 VALUES(?,?,?)} -1 TAIL]
   set TAIL
 } {}
+do_test bind-1.1.1 {
+  sqlite3_bind_parameter_count $VM
+} 3
 do_test bind-1.2 {
   sqlite_step $VM N VALUES COLNAMES
 } {SQLITE_DONE}

diff --git a/www/support.tcl b/www/support.tcl
index 939b6774256f818e34d6b97fde1c44091c0af01e..54714bd9a5273cb8f08ec675c00816db6fab4902 100644 (file)
--- a/www/support.tcl
+++ b/www/support.tcl
@@ -1,4 +1,4 @@
-set rcsid {$Id: support.tcl,v 1.2 2004/06/02 00:08:56 drh Exp $}
+set rcsid {$Id: support.tcl,v 1.3 2004/07/15 14:15:02 drh Exp $}
 source common.tcl
 header {SQLite Support Options}
 puts {
@@ -27,7 +27,9 @@ sent by to you by return email.
 <p>
 An archive of the mailing list can be found at
 <a href="http://www.mail-archive.com/sqlite-users%40sqlite.org/">
-http://www.mail-archive.com/sqlite-users%40sqlite.org</a>.
+http://www.mail-archive.com/sqlite-users%40sqlite.org</a> and at
+<a href="http://www.theaimsgroup.com/">
+http://www.theaimsgroup.com/</a>.
 </p>
 
 <h3>Professional Support</h3>