Omit the "_except" term from the name of the new interface.

FossilOrigin-Name: e5ba47c2d8eb9f48a0e0d325e57d0092d536f85983819634c871ebd51829f1d1

diff --git a/manifest b/manifest
index 97b204c96fae6db475ed7cbfb3be9e83b435087a..bc476dd61d410d2c6d86798c9099f1a53480dc95 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sexperimental\ssqlite3_drop_modules_except()\sinterface.
-D 2019-08-17T19:45:25.613
+C Omit\sthe\s"_except"\sterm\sfrom\sthe\sname\sof\sthe\snew\sinterface.
+D 2019-08-19T20:35:30.961
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -524,8 +524,8 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c b2733d39a22f5023ab489b8535ca6854b51ff8667ca975815d004bb7388b0e41
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 80b8b4c857db2f20d98f80b71ef3bb0d70cdd17bd6b00217dcff803e9b989bd8
-F src/shell.c.in e0754f1d73c8e7d09548a29537e9e7d65fa0f4869c41722b7b89a64d9cdeff91
-F src/sqlite.h.in cbc4729565b6787c462fffac540b912acc24b32d22428f07d2cf3a937ba7a72e
+F src/shell.c.in e0f0758b6ab506d8ab12502fd2b8c55546bb9e4bb772374344a5a1b73f5bc2b9
+F src/sqlite.h.in 50fc0914ccd347437db9a0278a47d7541df3a45eb6e641e9680750c6f98dad27
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
 F src/sqliteInt.h b7d612d9c63abc8a8a7dcf7fbec5326b1770f40c81502c56f508e272154e7615
@@ -533,7 +533,7 @@ F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
 F src/tclsqlite.c 50c93be3e1c03b4e6cf6756e5197afcfe7f5cd0497d83a7ac317cde09e19b290
-F src/test1.c 17f5334199c02e69292d826ba660f0fcb75f50f7686a76553afb55a2c74e87f7
+F src/test1.c af2f21f9aee617582129bdef3934734d88c0d53de0c71019453bb72185430389
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb
@@ -604,7 +604,7 @@ F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b
 F src/vdbemem.c 920285c3b7f5c64369e02da437dab71e9e91862df9c486541c14633739f91d75
 F src/vdbesort.c 3531ae3a431ad6b98b67bd891fb42ec9d66867157188a2b1a9e58c55da6151b2
 F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
-F src/vtab.c 8849cbd67596bebe58e2095fb95309aa3c5bf330d5501ec2b2511109de5a8f13
+F src/vtab.c 6b36944fdf05a33150787236e3506e878dca027a239e39eaf408f09c4821170c
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c bbd6838bd79c0a32144d482fb0b6a9d2d1a252fb3b16d5005ec30f2f80413b0d
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
@@ -1836,10 +1836,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5d6f4dfeea75c7dcd8c511545accb9eb4b405a02db034332249ba54794e313d2
-R 1452e34f48dd7f53a8de382ba3305e88
-T *branch * sqlite3_drop_modules_except
-T *sym-sqlite3_drop_modules_except *
-T -sym-trunk *
+P 0851db4d337a87f8b2d3ce2ae9f9c928b9483591ca41a9e39cc01548059b1888
+R 0f164de667dc5b660a325950332b0cdd
 U drh
-Z 3751a55606ec64d5cdbb771325aed7c0
+Z 965480cc8555a710613c03b1277cb66b

diff --git a/manifest.uuid b/manifest.uuid
index 9cc49bf88fbfd7361754ea213c55a043d9a2e5aa..8140e9400cf17ccff218032e1ef858a4ca32e1b4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0851db4d337a87f8b2d3ce2ae9f9c928b9483591ca41a9e39cc01548059b1888
\ No newline at end of file
+e5ba47c2d8eb9f48a0e0d325e57d0092d536f85983819634c871ebd51829f1d1
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 9bfca22e5387f57790484d55067de37fb2bf1c1c..0ee136389d1ae686a522859e9bd8263806e7b63e 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -9409,6 +9409,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 #ifdef SQLITE_DEBUG
   if( c=='u' && strncmp(azArg[0], "unmodule", n)==0 ){
     int ii;
+    int lenOpt;
     char *zOpt;
     if( nArg<2 ){
       raw_printf(stderr, "Usage: .unmodule [--allexcept] NAME ...\n");
@@ -9418,9 +9419,10 @@ static int do_meta_command(char *zLine, ShellState *p){
     open_db(p, 0);
     zOpt = azArg[1];
     if( zOpt[0]=='-' && zOpt[1]=='-' && zOpt[2]!=0 ) zOpt++;
-    if( strcmp(zOpt, "-allexcept")==0 ){
+    lenOpt = (int)strlen(zOpt);
+    if( lenOpt>=3 && strncmp(zOpt, "-allexcept",lenOpt)==0 ){
       assert( azArg[nArg]==0 );
-      sqlite3_drop_modules_except(p->db, nArg>2 ? (const char**)(azArg+2) : 0);
+      sqlite3_drop_modules(p->db, nArg>2 ? (const char**)(azArg+2) : 0);
     }else{
       for(ii=1; ii<nArg; ii++){
         sqlite3_create_module(p->db, azArg[ii], 0, 0);

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index ace4da70b14e12e5b7e25a39bdbf8fef518b9deb..521ddffdb4b240e596eb9461383d00f1bf00706e 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -6639,6 +6639,8 @@ struct sqlite3_index_info {
 ** ^If the third parameter (the pointer to the sqlite3_module object) is
 ** NULL then no new module is create and any existing modules with the
 ** same name are dropped.
+**
+** See also: [sqlite3_drop_modules()]
 */
 int sqlite3_create_module(
   sqlite3 *db,               /* SQLite connection to register module with */
@@ -6658,13 +6660,15 @@ int sqlite3_create_module_v2(
 ** CAPI3REF: Remove Unnecessary Virtual Table Implementations
 ** METHOD: sqlite3
 **
-** ^The sqlite3_drop_modules_except(D,L) interface removes all virtual
+** ^The sqlite3_drop_modules(D,L) interface removes all virtual
 ** table modules from database connection D except those named on list L.
 ** The L parameter must be either NULL or a pointer to an array of pointers
 ** to strings where the array is terminated by a single NULL pointer.
 ** ^If the L parameter is NULL, then all virtual table modules are removed.
+**
+** See also: [sqlite3_create_module()]
 */
-int sqlite3_drop_modules_except(
+int sqlite3_drop_modules(
   sqlite3 *db,                /* Remove modules from this connection */
   const char **azKeep         /* Except, do not remove the ones named here */
 );

diff --git a/src/test1.c b/src/test1.c
index 7243339056962c804d8b4dfe2f7b6067563db434..e238d31e84ff9aa3be6cc99f16da9c9d257d4b42 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -1111,13 +1111,13 @@ static int SQLITE_TCLAPI test_create_function(
 }
 
 /*
-** Usage:  sqlite3_drop_modules_except DB ?NAME ...?
+** Usage:  sqlite3_drop_modules DB ?NAME ...?
 **
-** Invoke the sqlite3_drop_modules_except(D,L) interface on database
+** Invoke the sqlite3_drop_modules(D,L) interface on database
 ** connection DB, in order to drop all modules except those named in
 ** the argument.
 */
-static int SQLITE_TCLAPI test_drop_except(
+static int SQLITE_TCLAPI test_drop_modules(
   void *NotUsed,
   Tcl_Interp *interp,    /* The TCL interpreter that invoked this command */
   int argc,              /* Number of arguments */
@@ -1132,7 +1132,7 @@ static int SQLITE_TCLAPI test_drop_except(
     return TCL_ERROR;
   }
   if( getDbPointer(interp, argv[1], &db) ) return TCL_ERROR;
-  sqlite3_drop_modules_except(db, argc>2 ? (const char**)(argv+2) : 0);
+  sqlite3_drop_modules(db, argc>2 ? (const char**)(argv+2) : 0);
   return TCL_OK;
 }
 
@@ -7886,7 +7886,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
      { "sqlite3_close_v2",              (Tcl_CmdProc*)sqlite_test_close_v2  },
      { "sqlite3_create_function",       (Tcl_CmdProc*)test_create_function  },
      { "sqlite3_create_aggregate",      (Tcl_CmdProc*)test_create_aggregate },
-     { "sqlite3_drop_modules_except",   (Tcl_CmdProc*)test_drop_except      },
+     { "sqlite3_drop_modules",          (Tcl_CmdProc*)test_drop_modules     },
      { "sqlite_register_test_function", (Tcl_CmdProc*)test_register_func    },
      { "sqlite_abort",                  (Tcl_CmdProc*)sqlite_abort          },
      { "sqlite_bind",                   (Tcl_CmdProc*)test_bind             },

diff --git a/src/vtab.c b/src/vtab.c
index 760993120c27609b17e1e1858d551c241532bcb9..dd8a755be2992771af45ad3ccf46deede31bbcb4 100644 (file)
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -137,7 +137,7 @@ int sqlite3_create_module_v2(
 ** External API to drop all virtual-table modules, except those named
 ** on the azNames list.
 */
-int sqlite3_drop_modules_except(sqlite3 *db, const char** azNames){
+int sqlite3_drop_modules(sqlite3 *db, const char** azNames){
   HashElem *pThis, *pNext;
 #ifdef SQLITE_ENABLE_API_ARMOR
   if( !sqlite3SafetyCheckOk(db) || zName==0 ) return SQLITE_MISUSE_BKPT;