Omit the omit flat from eq constraints on column "name" of dbstat virtual tables...

FossilOrigin-Name: cfff5cb2279088aa66f435bd0d627b2c74c9a99ad9addfd44a4df8ba770b795a

diff --git a/manifest b/manifest
index ad173b212c4d404a8226a698e831933250e24b91..cf931dd1fbc2b2c87f16fc9ee64b21ccc81778e4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Record\swhen\sthe\sOP_IfNotOpen\sbranch\sis\sand\sis\snot\staken.
-D 2020-01-04T18:33:20.975
+C Omit\sthe\somit\sflat\sfrom\seq\sconstraints\son\scolumn\s"name"\sof\sdbstat\svirtual\stables.\sFix\sfor\s[74a4c386].
+D 2020-01-04T18:38:58.874
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,7 @@ F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 1b0724e66f95f33b160b1af85caaf9cceb325d22abf39bd24df4f54a73982251
 F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
-F src/dbstat.c 427b13c25884ffdf55739a1d23c989326adbba284637b9d767d1aa7b21cadfc2
+F src/dbstat.c bf7fbea4ed607f30977ae568e4729c42041024ceee4aa11100c8bb3c631d9a56
 F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
 F src/expr.c e25df342c1b8b9b87b5d6f9990e5b36f94469b1227c0a492cb5894e379f983ea
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
@@ -1376,7 +1376,7 @@ F test/spellfix4.test 51c7c26514ade169855c66bcf130bd5acfb4d7fd090cc624645ab275ae
 F test/sqldiff1.test 28cd737cf1b0078b1ec1bbf425e674c47785835e
 F test/sqllimits1.test 264f4b0f941800ba139d25e33ee919c5d95fea06dfbe8ac291d6811a30984ca5
 F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
-F test/stat.test f36f58c0acf5f280d1c427b94de41d9bf5877309bc1ea0f029a05f773df9fd22
+F test/stat.test 7bdfc6ae0fc11f12d2eecdb679f1ff0b84021617f3fdef4ebd2403e5bcfc4c4a
 F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 F test/stmt.test 54ed2cc0764bf3e48a058331813c3dbd19fc1d0827c3d8369914a5d8f564ec75
 F test/stmtvtab1.test 6873dfb24f8e79cbb5b799b95c2e4349060eb7a3b811982749a84b359468e2d5
@@ -1853,7 +1853,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 481f4956aff52797880930752693a8c0b10d7fdd71d86919fe8ee13c90ad5b81
-R f594eb9d0ec38ea8878d8a695e9205a6
-U drh
-Z f7c2b4f08ecc73e3215818c3db84b227
+P 182a898b14d585edd5fcfdcd6584c957911f0d81773d2868f16b5762dec031ca
+R e5d20f1d7a3c3631aa9f23cc00d086d7
+U dan
+Z 2755770051f083685d92f69a4addf7e4

diff --git a/manifest.uuid b/manifest.uuid
index 97ca4e38627af5ebf45cc56bff338f51fe23f3ba..99505f377ca9ce1551daad39d158f5a1dee16bc5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-182a898b14d585edd5fcfdcd6584c957911f0d81773d2868f16b5762dec031ca
\ No newline at end of file
+cfff5cb2279088aa66f435bd0d627b2c74c9a99ad9addfd44a4df8ba770b795a
\ No newline at end of file

diff --git a/src/dbstat.c b/src/dbstat.c
index 262da7c3738050c676f82fa0bd8611820eeff1ee..ae38944dd7862bd54e3e4943b9642553da8604ce 100644 (file)
--- a/src/dbstat.c
+++ b/src/dbstat.c
@@ -237,18 +237,14 @@ static int statBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
   i = 0;
   if( iSchema>=0 ){
     pIdxInfo->aConstraintUsage[iSchema].argvIndex = ++i;
-    pIdxInfo->aConstraintUsage[iSchema].omit = 1;
     pIdxInfo->idxNum |= 0x01;
   }
   if( iName>=0 ){
     pIdxInfo->aConstraintUsage[iName].argvIndex = ++i;
-    pIdxInfo->aConstraintUsage[iName].omit = 1;
     pIdxInfo->idxNum |= 0x02;
   }
   if( iAgg>=0 ){
     pIdxInfo->aConstraintUsage[iAgg].argvIndex = ++i;
-    /* As of ticket [727074e2], this constraint is not omitted. */
-    /* pIdxInfo->aConstraintUsage[iAgg].omit = 1; */
     pIdxInfo->idxNum |= 0x04;
   }
   pIdxInfo->estimatedCost = 1.0;

diff --git a/test/stat.test b/test/stat.test
index b3edc7e28ab7f19f750e9065650e4cf1b848382c..34f977bca19be3da583914358b5d86a6de9d4603 100644 (file)
--- a/test/stat.test
+++ b/test/stat.test
@@ -298,6 +298,7 @@ do_catchsql_test 7.2.4 {
   SELECT * FROM x3;
 } {1 {unrecognized token: "123corp"}}
 
+
 do_execsql_test 8.1 {
   CREATE VIRTUAL TABLE st4 USING dbstat;
 }
@@ -307,5 +308,11 @@ do_execsql_test 8.2 {
 do_execsql_test 8.3 {
   SELECT aggregate=1 FROM st4 WHERE aggregate = 5
 }
+do_execsql_test 8.4 {
+  SELECT * FROM st4 WHERE name = NULL;
+}
+do_catchsql_test 8.5 {
+  SELECT * FROM st4 WHERE schema = NULL;
+} {1 {no such schema: }}
 
 finish_test