Fix PRAGMA integrity_check so that it does not raise an error if the

schema contains a CREATE VIRTUAL TABLE that does not have its module
loaded.

FossilOrigin-Name: 5cb61c6788d7c0170b587e4667ee57d588c991a9901951762e33b97c6a135a82

diff --git a/manifest b/manifest
index 04be4c08388b7a22ce975a5e6e198a2fc05e9c21..21113c63481fb231efb8a140009758617f40a6ba 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\ssome\sredundant\scalls\sto\sstrlen()\sused\sto\sfind\sthe\ssize\sof\nExpr.u.zToken\sin\ssqliteExprDup().\s\sThis\sinefficiency\swas\sseen\swhile\sworking\non\sthe\sprevious\scheck-in,\sand\sI\sthought\sit\sbest\sto\sfix\sit\swhile\sit\swas\nfresh\sin\smind.
-D 2023-10-20T18:09:08.595
+C Fix\sPRAGMA\sintegrity_check\sso\sthat\sit\sdoes\snot\sraise\san\serror\sif\sthe\nschema\scontains\sa\sCREATE\sVIRTUAL\sTABLE\sthat\sdoes\snot\shave\sits\smodule\nloaded.
+D 2023-10-20T19:06:04.049
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -712,12 +712,12 @@ F src/parse.y 020d80386eb216ec9520549106353c517d2bbc89be28752ffdca649a9eaf56ec
 F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
-F src/pragma.c 9f9b8828624ee98de22a2a9793a651daa39bc06cd9e701b6eda23c6d75260f1d
+F src/pragma.c 63b3af7288c91cbfa24797e3eee74913437623683d8080d1db3ea422353aa77a
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c bde74add20fc0e8ce0c4e937a1f70a36d17413afe4f71d3e103f5cb74b17c8d9
 F src/printf.c 9da63b9ae1c14789bcae12840f5d800fd9302500cd2d62733fac77f0041b4750
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c 77d07bcec1b3101ce36ebf4aa04dd0340e77cbfc4f31bd1a6e43fcd2db904626
+F src/resolve.c 31229276a8eb5b5de1428cd2d80f6f1cf8ffc5248be25e47cf575df12f1b8f23
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c f9d8ece7f0742d7b835efa9590ccda4eccee5b9def7581ec94f556e3c52efe51
 F src/shell.c.in cf0a3387c5bb05ca2fe6073fa7df21aaa11e749ca5b3846b80b586a447e728aa
@@ -2134,8 +2134,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f5c01676fd281e938181b846dd2024d050f597dc6a7a91928beab9d8553dfdb5
-R d3b5a604b96f76db93b01c4a13c3d7ea
+P b7a84eff5dcdf5b2ff81331097cdc64d0c5d16a4ae224320f39b64541ec72dc7
+R d49a86076e3848998904865202dcd417
 U drh
-Z 496ee78f77a1d59f8f48d2e1597d6cd9
+Z 9b5fdaea1a9423bb5f088658371340a2
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9e114bfc586de59f802b13eeed4116db5068d6ba..72ef461529e0795dd1c2f1ca64805336fe7e9aa6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7a84eff5dcdf5b2ff81331097cdc64d0c5d16a4ae224320f39b64541ec72dc7
\ No newline at end of file
+5cb61c6788d7c0170b587e4667ee57d588c991a9901951762e33b97c6a135a82
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index 576080e10a42f2edcd6e87ca43c99fe103f6419b..0ec745d57db07cd9281740efaac546045ca7ee14 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1765,8 +1765,11 @@ void sqlite3Pragma(
         if( !IsOrdinaryTable(pTab) ){
           sqlite3_vtab *pVTab;
           int a1;
+          int savedErr = db->suppressErr;
           if( !IsVirtual(pTab) ) continue;
-          sqlite3ViewGetColumnNames(pParse, pTab);
+          db->suppressErr = 1;
+          rc = sqlite3ViewGetColumnNames(pParse, pTab);
+          db->suppressErr = savedErr;
           if( pTab->u.vtab.p==0 ) continue;
           pVTab = pTab->u.vtab.p->pVtab;
           if( NEVER(pVTab==0) ) continue;

diff --git a/src/resolve.c b/src/resolve.c
index 7eba26938af9d38da249382fa37a073763c67f4a..0072f6b6aa239a0bed4cc03273f1fa14823a63dd 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1784,10 +1784,8 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
   while( p ){
     assert( (p->selFlags & SF_Expanded)!=0 );
     assert( (p->selFlags & SF_Resolved)==0 );
-    assert( db->suppressErr==0 ); /* SF_Resolved not set if errors suppressed */
     p->selFlags |= SF_Resolved;
 
-
     /* Resolve the expressions in the LIMIT and OFFSET clauses. These
     ** are not allowed to refer to any names, so pass an empty NameContext.
     */