Add the sqlite3_prepare_v2 and sqlite3_prepare16_v2 APIs to the loadable

extension interface. (CVS 3713)

FossilOrigin-Name: f02ba56d5c6bbd57682a6bb57e9f92021dfb066e

diff --git a/manifest b/manifest
index 5159ea4ffe11a392b0708d2873fa139499295696..9aee18d65a9dd2b5b54d84fd8b9239185d1eedb7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sfor\sexclusive\saccess\smode.\sThere\sare\sstill\ssome\sbugs.\s(CVS\s3712)
-D 2007-03-24T16:45:05
+C Add\sthe\ssqlite3_prepare_v2\sand\ssqlite3_prepare16_v2\sAPIs\sto\sthe\sloadable\nextension\sinterface.\s(CVS\s3713)
+D 2007-03-25T19:08:47
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -72,7 +72,7 @@ F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c 72cb64b698796f2005c0158e098124d9490868bb
 F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6
-F src/loadext.c bbfdbf452c71b6f2723375478a365788498ec3cd
+F src/loadext.c c186ad5c9e8a0aaa73d0caf5f604d112e45e8b89
 F src/main.c af8922e0205cf618392de2836c9efad71786d0d6
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/os.c 6df3e9c23eaa982d3e66ef770ad2519de5dd4d97
@@ -97,7 +97,7 @@ F src/select.c 4d68a0d7f98fb59bcedd0be69750e0445b05899c
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 3ae4654560e91220a95738a73d135d91d937cda1
 F src/sqlite.h.in 6b7383baf76070214f6381f603328ca9b22a7fae
-F src/sqlite3ext.h 011c75fd6459a61454514af07c7a4f1f5c767f27
+F src/sqlite3ext.h 832e13de075d920e2c76584e2b7af1054bb212df
 F src/sqliteInt.h 5451308c885e8620e0d4764ae162da2566520073
 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
 F src/tclsqlite.c cd2b3b86ab07c0e0779f6c6e71e72c6c7dc1e704
@@ -307,7 +307,7 @@ F test/table.test feea6a3eb08cf166f570255eea5447e42ef82498
 F test/tableapi.test 036575a98dcce7c92e9f39056839bbad8a715412
 F test/tclsqlite.test 51334389283c74bcbe28645a73159b17e239e9f3
 F test/temptable.test c36f3e5a94507abb64f7ba23deeb4e1a8a8c3821
-F test/tester.tcl 3c7545cbd7fc80a986eda77145e18260dbf34c96
+F test/tester.tcl efa900507eabc20de8138d9233b6b0502e4f229a
 F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35
 F test/thread2.test 6d7b30102d600f51b4055ee3a5a19228799049fb
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
@@ -438,7 +438,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 07b56965f3227c9f78680728b955395295c4aa49
-R 5306d65289bf66945a0a4cf7185afe17
-U danielk1977
-Z 4da3e2ad8e93e75be905d9a01fa04929
+P b6c700370be29db2b974f9abd719c3e56abf8058
+R a1856a5f6fc55ec41d9bcb43f52aec37
+U drh
+Z 58bc4e277f7ec6a7398c984dd6cadc27

diff --git a/manifest.uuid b/manifest.uuid
index 3f6a74d77eb71a43dd9caa556d54ad72b132200c..d6b7260028339f249bab72a6ab2ffc8de1b0d85d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b6c700370be29db2b974f9abd719c3e56abf8058
\ No newline at end of file
+f02ba56d5c6bbd57682a6bb57e9f92021dfb066e
\ No newline at end of file

diff --git a/src/loadext.c b/src/loadext.c
index 6af99a6416ed8225173621c531a3b69cf750c341..0a8dc6dae963a96516f5f5ec877f6f1eea580731 100644 (file)
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -229,6 +229,12 @@ const sqlite3_api_routines sqlite3_apis = {
   *************************************************************************
   */
   sqlite3_overload_function,
+
+  /*
+  ** Added after 3.3.13
+  */
+  sqlite3_prepare_v2,
+  sqlite3_prepare16_v2,
 };
 
 /*

diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h
index 23b147d8a5cd282b7e8cc2673201e5a50e0e5e27..da1812d8842727494ba0e2a3518bf9b3d1e048fb 100644 (file)
--- a/src/sqlite3ext.h
+++ b/src/sqlite3ext.h
@@ -15,7 +15,7 @@
 ** as extensions by SQLite should #include this file instead of 
 ** sqlite3.h.
 **
-** @(#) $Id: sqlite3ext.h,v 1.8 2007/01/09 14:37:18 drh Exp $
+** @(#) $Id: sqlite3ext.h,v 1.9 2007/03/25 19:08:47 drh Exp $
 */
 #ifndef _SQLITE3EXT_H_
 #define _SQLITE3EXT_H_
@@ -144,6 +144,8 @@ struct sqlite3_api_routines {
   int  (*value_type)(sqlite3_value*);
   char * (*vmprintf)(const char*,va_list);
   int (*overload_function)(sqlite3*, const char *zFuncName, int nArg);
+  int  (*prepare_v2)(sqlite3*,const char*,int,sqlite3_stmt**,const char**);
+  int  (*prepare16_v2)(sqlite3*,const void*,int,sqlite3_stmt**,const void**);
 };
 
 /*
@@ -232,6 +234,8 @@ struct sqlite3_api_routines {
 #define sqlite3_open16                 sqlite3_api->open16
 #define sqlite3_prepare                sqlite3_api->prepare
 #define sqlite3_prepare16              sqlite3_api->prepare16
+#define sqlite3_prepare_v2             sqlite3_api->prepare_v2
+#define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
 #define sqlite3_profile                sqlite3_api->profile
 #define sqlite3_progress_handler       sqlite3_api->progress_handler
 #define sqlite3_realloc                sqlite3_api->realloc

diff --git a/test/tester.tcl b/test/tester.tcl
index 37b60b05487b58785070de77ae4c8954b93d1e53..d65e8c304fef270f2d4f56dcc6badc8860d72052 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -11,7 +11,7 @@
 # This file implements some common TCL routines used for regression
 # testing the SQLite library
 #
-# $Id: tester.tcl,v 1.75 2007/03/17 10:26:59 danielk1977 Exp $
+# $Id: tester.tcl,v 1.76 2007/03/25 19:08:47 drh Exp $
 
 # Make sure tclsqlite3 was compiled correctly.  Abort now with an
 # error message if not.
@@ -482,6 +482,7 @@ proc do_ioerr_test {testname args} {
     }
   }
   set ::sqlite_io_error_pending 0
+  set ::sqlite_io_error_persist 0
   unset ::ioerropts
 }