From: dan <Dan Kennedy>
Date: Thu, 30 Sep 2021 18:42:52 +0000 (+0000)
Subject: Fix a problem with view handling in SQLITE_OMIT_VIRTUAL_TABLE builds.
X-Git-Tag: version-3.37.0~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afaa660aef3d596fabbbcf6e99746294f77dbafa;p=thirdparty%2Fsqlite.git

Fix a problem with view handling in SQLITE_OMIT_VIRTUAL_TABLE builds.

FossilOrigin-Name: 6e791a24ce259ff6cc46a7c2188aea094a5021e154368f57019a0653c8a81217
---

diff --git a/manifest b/manifest
index e31e958ec7..f8e221911d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\srtreedoc.test\sso\sthat\sit\sworks\swith\sSQLITE_DEFAULT_AUTOVACUUM=1\sbuilds.
-D 2021-09-30T17:39:21.613
+C Fix\sa\sproblem\swith\sview\shandling\sin\sSQLITE_OMIT_VIRTUAL_TABLE\sbuilds.
+D 2021-09-30T18:42:52.222
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -549,7 +549,7 @@ F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
 F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c b9e60afa56d0484ee573aba54d9e73603736236df33d2ae3421b4cd0367d907d
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 030c3d07326708343208418c84da607752aebc13c92df929b7c68c7c08e7df54
+F src/select.c 47a6e97bb04caeb71cc0b748b69d635eaa0aa765915d177949d21c386eb0cc97
 F src/shell.c.in 9df263dc0949698a8728ecc5bb826666ca8ced75201d5440a161b629455cd462
 F src/sqlite.h.in 4e977a5e2ed1a9e8987ff65a2cab5f99a4298ebf040ea5ff636e1753339ff45a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1928,7 +1928,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 7d16b302826fec3606dbc6e20df0d2182f6946a2ed4076d2412d1df30c552ecb
-R 2143874191f6cae16de1c082807e1380
+P a300adc21151fb70ab8573477fd89a10300ee678f068fe123f22ada2f1f876d2
+R 92a62ddf3c003fbdf03af7f31b764e73
 U dan
-Z 61fa72261b66a2f7b05e61aabc214b91
+Z 6842d9a35eaf3ec77461f481929e2588
diff --git a/manifest.uuid b/manifest.uuid
index b96f216a75..d636c50acd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a300adc21151fb70ab8573477fd89a10300ee678f068fe123f22ada2f1f876d2
\ No newline at end of file
+6e791a24ce259ff6cc46a7c2188aea094a5021e154368f57019a0653c8a81217
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index ba82d624d0..6af8b85bc1 100644
--- a/src/select.c
+++ b/src/select.c
@@ -5499,9 +5499,9 @@ static int selectExpander(Walker *pWalker, Select *p){
               pTab->zName);
           }
           pFrom->pSelect = sqlite3SelectDup(db, pTab->u.view.pSelect, 0);
-        }else
+        }
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-        if( ALWAYS(IsVirtual(pTab))
+        else if( ALWAYS(IsVirtual(pTab))
          && pFrom->fg.fromDDL
          && ALWAYS(pTab->u.vtab.p!=0)
          && pTab->u.vtab.p->eVtabRisk > ((db->flags & SQLITE_TrustedSchema)!=0)