Use the IsOrdinaryTable() macro, not a test of tnum, to distinguish tables

from views and virtual tables.

FossilOrigin-Name: 6189b7809d774bf697d14e27a4bd961df5c318d261dce97db7801ce83f12c59a

diff --git a/manifest b/manifest
index 667bae24e886b893aeb289d3ef70eaa7cc205b64..541b6d884a1d6e7582a3ba1cfb8ddfd185d3c41f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\stest\scases\sadded\sto\stest/fuzzdata8.db
-D 2021-10-11T09:48:59.129
+C Use\sthe\sIsOrdinaryTable()\smacro,\snot\sa\stest\sof\stnum,\sto\sdistinguish\stables\nfrom\sviews\sand\svirtual\stables.
+D 2021-10-11T15:21:42.574
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c 9578c5a54027166688ec3e679ed10e85a3d08b986210e98d736f57aacc63335a
-F src/analyze.c 979b6d2cdaca992a9c9f0818de55d08fb9a4e52929a509752b52d9fd23bb86d3
+F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
 F src/attach.c e3f9d9a2a4a844750f3f348f37afb244535f21382cbfcd840152cb21cb41cfaf
 F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
@@ -542,7 +542,7 @@ F src/parse.y 0bd7971a7489bbf6c3726f1b50da6e508bdff8fa493e9cc3f5a96b12cbb2361e
 F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
-F src/pragma.c 8d029903aac7d73ad9a304c32c98a0f65ec6fd3be37eae5d63a37900ace8e3b0
+F src/pragma.c 5a37120a6cb9848e5d071b1646cc85f6ce7fc4983dd265b26c20925faf51a441
 F src/pragma.h 87330ed2fbfa2a1274de93ca0ab850fba336189228cb256089202c3b52766fad
 F src/prepare.c 8f07616db04337057b8498b72d051ee90f73c54615c2e908c05404cef1e060b7
 F src/printf.c 5901672228f305f7d493cbc4e7d76a61a5caecdbc1cd06b1f9ec42ea4265cf8d
@@ -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 e2bb82a4095427eb810903180fa27fb85b52144bdcfe33388352638428d017f5
-R ecdc864c9fe624410248844455e3e5af
+P 2e475fecadc6d9e9a0537435827f56a5c7345f69a9b713d7812da4c9a0f27a96
+R 23dee1b3cc387091f13965964f5dc241
 U drh
-Z 43de5116009e259c1c06d2a670d3069b
+Z 74c39a96d037d547a4b8ace527c80bd7

diff --git a/manifest.uuid b/manifest.uuid
index 6beec941c0e7f2ef98d4be349c3ea507c3e528a8..e04a1c374cdd098a04c44df3c0e074e0c5c1be66 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e475fecadc6d9e9a0537435827f56a5c7345f69a9b713d7812da4c9a0f27a96
\ No newline at end of file
+6189b7809d774bf697d14e27a4bd961df5c318d261dce97db7801ce83f12c59a
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index d38cb18784dd8262ad2049812fbc0935cdc74cf6..5bbd34f9a2056951ac7a93362ec7e68342d72528 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -996,7 +996,7 @@ static void analyzeOneTable(
   if( v==0 || NEVER(pTab==0) ){
     return;
   }
-  if( pTab->tnum==0 ){
+  if( !IsOrdinaryTable(pTab) ){
     /* Do not gather statistics on views or virtual tables */
     return;
   }

diff --git a/src/pragma.c b/src/pragma.c
index b997408b911199ba618b6c670af74da48a00e908..1c00e68b09dea30d9e84481c5cac5f0fb690a7b4 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1714,7 +1714,7 @@ void sqlite3Pragma(
         int r1 = -1;
         int bStrict;
 
-        if( pTab->tnum<1 ) continue;  /* Skip VIEWs or VIRTUAL TABLEs */
+        if( !IsOrdinaryTable(pTab) ) continue;
         if( pObjTab && pObjTab!=pTab ) continue;
         pPk = HasRowid(pTab) ? 0 : sqlite3PrimaryKeyIndex(pTab);
         sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenRead, 0,