Add the sqlite3_cancel_auto_extension(X) interface which will undo a prior

call to sqlite3_auto_extension(X).

FossilOrigin-Name: cdce87eb889a43dafcc560d5f97ab517d0266860

diff --git a/manifest b/manifest
index 6c619adf695881a7276df61f42da5b1b800063b4..c21740737a594f93847016906d404ff120bf6567 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\sshell\sdoes\snot\stry\sto\sput\sa\szero\sterminator\son\sthe\send\sof\san\nunallocated\szero-length\sstring\swhen\srunning\s".import"\son\san\sempty\sfile.
-D 2013-07-12T21:09:24.523
+C Add\sthe\ssqlite3_cancel_auto_extension(X)\sinterface\swhich\swill\sundo\sa\sprior\ncall\sto\ssqlite3_auto_extension(X).
+D 2013-07-15T17:02:28.816
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -184,7 +184,7 @@ F src/insert.c f7cb141e8ce257cb6b15c497f09e4e23d6055599
 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
-F src/loadext.c c48f7f3f170e502fe0cc20748e03c6e0b5a016c2
+F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
 F src/main.c e5810b2d7a0bd19f3d75ce60e3ed918cafc0a3f3
 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@ -218,7 +218,7 @@ F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 91b62654caf8dfe292fb8882715e575d34ad3874
 F src/shell.c 4c02ec99e42aeb624bb221b253273da6c910b814
-F src/sqlite.h.in c8b27ba43bb35a26b6067b8f24f06c24af2d1b64
+F src/sqlite.h.in 30c88ce7862096b0aecf4c2c886bc0934eeaa515
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 F src/sqliteInt.h 6d3115f774aa3e87737f9447c9c0cea992c5bdbf
@@ -236,7 +236,7 @@ F src/test7.c 126b886b53f0358b92aba9b81d3fcbfbe9a93cd6
 F src/test8.c 7ee77ea522ae34aa691dfe407139dec80d4fc039
 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
 F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
-F src/test_autoext.c 5c95b5d435eaa09d6c0e7d90371c5ca8cd567701
+F src/test_autoext.c 32cff3d01cdd3202486e623c3f8103ed04cb57fa
 F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
 F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
 F src/test_config.c 95bb33e9dcaa340a296c0bf0e0ba3d1a1c8004c0
@@ -627,7 +627,7 @@ F test/like.test 935fb4f608e3ea126891496a6e99b9468372bf5c
 F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
 F test/limit.test cc0ab63385239b63c72452b0e93700bf5e8f0b99
 F test/loadext.test 92e6dfefd1229c3ef4aaabd87419efd8fa57a7a5
-F test/loadext2.test 0bcaeb4d81cd5b6e883fdfea3c1bdbe1f173cbca
+F test/loadext2.test 0408380b57adca04004247179837a18e866a74f7
 F test/lock.test 87af515b0c4cf928576d0f89946d67d7c265dfb4
 F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
 F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
@@ -1103,7 +1103,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 7d829bdea3adcda50fbe930acb4e1ce73fd874e6
-R 3ed94849e5c017401e30c707fda6984e
+P 92adaee5bd31c152dbc1592f4aeb5d8da957a1ea
+R 3e75a7374bba2c69c55563b837ab8202
 U drh
-Z e4e9f4e449a4a8d9a8571763475fda13
+Z a6c699be62fa8981abc8311358615b45

diff --git a/manifest.uuid b/manifest.uuid
index 83ce9c684d8af6dd7514f3be50fd40ba77ff87d6..bad5c44835a9341a28e599417fc8503f249a5ec1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-92adaee5bd31c152dbc1592f4aeb5d8da957a1ea
\ No newline at end of file
+cdce87eb889a43dafcc560d5f97ab517d0266860
\ No newline at end of file

diff --git a/src/loadext.c b/src/loadext.c
index cdcf6a93b8c40f914b94240ef14cb4a30a37eca1..828e865b61e49f6ec3eac1b458cad280a8461345 100644 (file)
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -668,6 +668,35 @@ int sqlite3_auto_extension(void (*xInit)(void)){
   }
 }
 
+/*
+** Cancel a prior call to sqlite3_auto_extension.  Remove xInit from the
+** set of routines that is invoked for each new database connection, if it
+** is currently on the list.  If xInit is not on the list, then this
+** routine is a no-op.
+**
+** Return 1 if xInit was found on the list and removed.  Return 0 if xInit
+** was not on the list.
+*/
+int sqlite3_cancel_auto_extension(void (*xInit)(void)){
+#if SQLITE_THREADSAFE
+  sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER);
+#endif
+  int i;
+  int n = 0;
+  wsdAutoextInit;
+  sqlite3_mutex_enter(mutex);
+  for(i=wsdAutoext.nExt-1; i>=0; i--){
+    if( wsdAutoext.aExt[i]==xInit ){
+      wsdAutoext.nExt--;
+      wsdAutoext.aExt[i] = wsdAutoext.aExt[wsdAutoext.nExt];
+      n++;
+      break;
+    }
+  }
+  sqlite3_mutex_leave(mutex);
+  return n;
+}
+
 /*
 ** Reset the automatic extension loading mechanism.
 */

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index eb5ffe3d4c54b566dd04d01ce21ebefeb8516f43..3b7237996b7f89e7572f3ac1e65c2bfa77d7d0fd 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5123,10 +5123,23 @@ int sqlite3_enable_load_extension(sqlite3 *db, int onoff);
 ** on the list of automatic extensions is a harmless no-op. ^No entry point
 ** will be called more than once for each database connection that is opened.
 **
-** See also: [sqlite3_reset_auto_extension()].
+** See also: [sqlite3_reset_auto_extension()]
+** and [sqlite3_cancel_auto_extension()]
 */
 int sqlite3_auto_extension(void (*xEntryPoint)(void));
 
+/*
+** CAPI3REF: Cancel Automatic Extension Loading
+**
+** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the
+** initialization routine X that was registered using a prior call to
+** [sqlite3_auto_extension(X)].  ^The [sqlite3_cancel_auto_extension(X)]
+** routine returns 1 if initialization routine X was successfully 
+** unregistered and it returns 0 if X was not on the list of initialization
+** routines.
+*/
+int sqlite3_cancel_auto_extension(void (*xEntryPoint)(void));
+
 /*
 ** CAPI3REF: Reset Automatic Extension Loading
 **

diff --git a/src/test_autoext.c b/src/test_autoext.c
index b5013f3173a2176e2d9f0caa99193036bfc37e91..4a5a5caa083fc7110a83bb460c1fd637fc34399e 100644 (file)
--- a/src/test_autoext.c
+++ b/src/test_autoext.c
@@ -98,6 +98,22 @@ static int autoExtSqrObjCmd(
   return SQLITE_OK;
 }
 
+/*
+** tclcmd:   sqlite3_cancel_auto_extension_sqr
+**
+** Unregister the "sqr" extension.
+*/
+static int cancelAutoExtSqrObjCmd(
+  void * clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  int rc = sqlite3_cancel_auto_extension((void*)sqr_init);
+  Tcl_SetObjResult(interp, Tcl_NewIntObj(rc));
+  return SQLITE_OK;
+}
+
 /*
 ** tclcmd:   sqlite3_auto_extension_cube
 **
@@ -114,6 +130,22 @@ static int autoExtCubeObjCmd(
   return SQLITE_OK;
 }
 
+/*
+** tclcmd:   sqlite3_cancel_auto_extension_cube
+**
+** Unregister the "cube" extension.
+*/
+static int cancelAutoExtCubeObjCmd(
+  void * clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  int rc = sqlite3_cancel_auto_extension((void*)cube_init);
+  Tcl_SetObjResult(interp, Tcl_NewIntObj(rc));
+  return SQLITE_OK;
+}
+
 /*
 ** tclcmd:   sqlite3_auto_extension_broken
 **
@@ -130,6 +162,22 @@ static int autoExtBrokenObjCmd(
   return SQLITE_OK;
 }
 
+/*
+** tclcmd:   sqlite3_cancel_auto_extension_broken
+**
+** Unregister the broken extension.
+*/
+static int cancelAutoExtBrokenObjCmd(
+  void * clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  int rc = sqlite3_cancel_auto_extension((void*)broken_init);
+  Tcl_SetObjResult(interp, Tcl_NewIntObj(rc));
+  return SQLITE_OK;
+}
+
 #endif /* SQLITE_OMIT_LOAD_EXTENSION */
 
 
@@ -161,6 +209,12 @@ int Sqlitetest_autoext_Init(Tcl_Interp *interp){
   Tcl_CreateObjCommand(interp, "sqlite3_auto_extension_broken",
           autoExtBrokenObjCmd, 0, 0);
 #endif
+  Tcl_CreateObjCommand(interp, "sqlite3_cancel_auto_extension_sqr",
+          cancelAutoExtSqrObjCmd, 0, 0);
+  Tcl_CreateObjCommand(interp, "sqlite3_cancel_auto_extension_cube",
+          cancelAutoExtCubeObjCmd, 0, 0);
+  Tcl_CreateObjCommand(interp, "sqlite3_cancel_auto_extension_broken",
+          cancelAutoExtBrokenObjCmd, 0, 0);
   Tcl_CreateObjCommand(interp, "sqlite3_reset_auto_extension",
           resetAutoExtObjCmd, 0, 0);
   return TCL_OK;

diff --git a/test/loadext2.test b/test/loadext2.test
index 3d01539b31ebacab8219f5104570df0cba17a5db..d5b6ea8d7f809e1ecd4ae8d596de34bdcc2fd334 100644 (file)
--- a/test/loadext2.test
+++ b/test/loadext2.test
@@ -43,6 +43,19 @@ do_test loadext2-1.2 {
   }
 } {1 {no such function: cube}}
 
+# Extensions loaders not currently registered
+#
+do_test loadext2-1.2.1 {
+  sqlite3_cancel_auto_extension_sqr
+} {0}
+do_test loadext2-1.2.2 {
+  sqlite3_cancel_auto_extension_sqr
+} {0}
+do_test loadext2-1.2.3 {
+  sqlite3_cancel_auto_extension_sqr
+} {0}
+
+
 # Register auto-loaders.  Still functions do not exist.
 #
 do_test loadext2-1.3 {
@@ -76,8 +89,19 @@ do_test loadext2-1.6 {
 
 # Reset extension auto loading.  Existing extensions still exist.
 #
-do_test loadext2-1.7 {
-  sqlite3_reset_auto_extension
+do_test loadext2-1.7.1 {
+  sqlite3_cancel_auto_extension_sqr
+} {1}
+do_test loadext2-1.7.2 {
+  sqlite3_cancel_auto_extension_sqr
+} {0}
+do_test loadext2-1.7.3 {
+  sqlite3_cancel_auto_extension_cube
+} {1}
+do_test loadext2-1.7.4 {
+  sqlite3_cancel_auto_extension_cube
+} {0}
+do_test loadext2-1.7.5 {
   catchsql {
     SELECT sqr(2)
   }