Fix SQLITE_TESTCTRL_IMPOSTER so that it is a harmless no-op if the schema

parameter is invalid.

FossilOrigin-Name: 2d9a45ab10aaad681e11d639195430c0988b6ca1b96db6bf0b31b889e88a5430

diff --git a/manifest b/manifest
index 1fc8dc67037d3d09845f7e0d7343390a6d67ef3f..5faa6fdf66466fd778e97e40901444e3fa3ccdea 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Factor\sthe\snoop-join-elimination\soptimization\sout\sof\sthe\ssqlite3WhereBegin()\nroutine\sand\sinto\sa\sseparate\s"no-inline"\ssubroutine,\sin\sorder\sto\sreduce\sthe\ncomplexity\sof\ssqlite3WhereBegin()\sand\sthereby\sencourage\sC\scompilers\sto\ninline\ssqlite3WhereCodeOneLoopStart().
-D 2021-12-03T18:53:53.434
+C Fix\sSQLITE_TESTCTRL_IMPOSTER\sso\sthat\sit\sis\sa\sharmless\sno-op\sif\sthe\sschema\nparameter\sis\sinvalid.
+D 2021-12-06T15:08:30.916
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -514,7 +514,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c e0293a6f686e18cb2c9dd0619a731518e0109d7e1f1db1932974659e7843cfd1
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c e1dcff1c916bf6834e150b492eddda5d9792453182d2ad64294d2266b6e93c4c
-F src/main.c 7bd4fdc41ef53535271a1816ff043ba153cda03842b444b6e2f57b27b2cb9090
+F src/main.c e94230dba03f44b73c52abc8b814468a0cb6d4a66d71af33452edd78ed1b1228
 F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1933,7 +1933,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 8029e6bab508bf0b8ec1df00a829c5d4de2a84d66dc56b9ff03da879ceef7788
-R 963c220f26757d3ffbc2edfb4f7e86f0
+P 6225e9abcb0261fefca4a26530524ffc449f937f8ae1ece718af2c3c3d73d78d
+R 6fd46b2d7adccacab3c0abe27b9e56ae
 U drh
-Z 180dbfc838231c2ae95c395bdf32b1d2
+Z 22c0cc9c8951bcb92c9322270d05ef33

diff --git a/manifest.uuid b/manifest.uuid
index 9b8ce11932382b31c4cc30d0b818da559691ec50..0d58923b4243f2736cdad7edc6ac1f33600da78a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6225e9abcb0261fefca4a26530524ffc449f937f8ae1ece718af2c3c3d73d78d
\ No newline at end of file
+2d9a45ab10aaad681e11d639195430c0988b6ca1b96db6bf0b31b889e88a5430
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 4b2d0592c9c56ee23483a9332881c83173dabd44..ce53496bc09a8f7fbe2b860c941cf5f266b419ac 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4260,12 +4260,16 @@ int sqlite3_test_control(int op, ...){
     */
     case SQLITE_TESTCTRL_IMPOSTER: {
       sqlite3 *db = va_arg(ap, sqlite3*);
+      int iDb;
       sqlite3_mutex_enter(db->mutex);
-      db->init.iDb = sqlite3FindDbName(db, va_arg(ap,const char*));
-      db->init.busy = db->init.imposterTable = va_arg(ap,int);
-      db->init.newTnum = va_arg(ap,int);
-      if( db->init.busy==0 && db->init.newTnum>0 ){
-        sqlite3ResetAllSchemasOfConnection(db);
+      iDb = sqlite3FindDbName(db, va_arg(ap,const char*));
+      if( iDb>=0 ){
+        db->init.iDb = iDb;
+        db->init.busy = db->init.imposterTable = va_arg(ap,int);
+        db->init.newTnum = va_arg(ap,int);
+        if( db->init.busy==0 && db->init.newTnum>0 ){
+          sqlite3ResetAllSchemasOfConnection(db);
+        }
       }
       sqlite3_mutex_leave(db->mutex);
       break;