Fix DBSTAT so that it returns now rows, rather than an error when the

WHERE clause is "schema=NULL".

FossilOrigin-Name: 5b246b47aeadc25dbec0956e2d6edcd49fbe874a01734fdf15b770507648222d

diff --git a/manifest b/manifest
index 2e28981e5901f6e5db93471ccb073e390d42131b..b57e98dd4563ee2d4ba18033c5403fbebf4361a8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2020-01-04T19:12:13.469
+C Fix\sDBSTAT\sso\sthat\sit\sreturns\snow\srows,\srather\sthan\san\serror\swhen\sthe\nWHERE\sclause\sis\s"schema=NULL".
+D 2020-01-04T19:14:48.556
 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 bf7fbea4ed607f30977ae568e4729c42041024ceee4aa11100c8bb3c631d9a56
+F src/dbstat.c 5125f559b33787a29f7ded750f2a69080f50a85bced98fe8ad02a99e543c4b44
 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 7bdfc6ae0fc11f12d2eecdb679f1ff0b84021617f3fdef4ebd2403e5bcfc4c4a
+F test/stat.test 423257dc36e5865fb9dd1d9051ac985763b6fba1daec134932f37772d5ed1e64
 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 cfff5cb2279088aa66f435bd0d627b2c74c9a99ad9addfd44a4df8ba770b795a
-R 5d16430269a33945616966e2b0b7c322
+P 8452fe03430d34abecab618d6136b863630f91d68d69ebbc115f808bc81c3817
+R 9bbb5a6f7d16bf33483ed4a1fd18c9fb
 U drh
-Z 8726c818ce12b415934c3be6ffc42642
+Z 32947d987d272ea0b93a36e52a4c48c8

diff --git a/manifest.uuid b/manifest.uuid
index 635c137be470a36365fdfee0e3cf379b3159736f..336cd39a1430154b610ba168c9cf41cd72ebe6aa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8452fe03430d34abecab618d6136b863630f91d68d69ebbc115f808bc81c3817
\ No newline at end of file
+5b246b47aeadc25dbec0956e2d6edcd49fbe874a01734fdf15b770507648222d
\ No newline at end of file

diff --git a/src/dbstat.c b/src/dbstat.c
index ae38944dd7862bd54e3e4943b9642553da8604ce..d0ce82e8c602e2a2127d16bf284387d0a7d15758 100644 (file)
--- a/src/dbstat.c
+++ b/src/dbstat.c
@@ -700,9 +700,9 @@ static int statFilter(
     const char *zDbase = (const char*)sqlite3_value_text(argv[iArg++]);
     pCsr->iDb = sqlite3FindDbName(pTab->db, zDbase);
     if( pCsr->iDb<0 ){
-      sqlite3_free(pCursor->pVtab->zErrMsg);
-      pCursor->pVtab->zErrMsg = sqlite3_mprintf("no such schema: %s", zDbase);
-      return pCursor->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM_BKPT;
+      pCsr->iDb = 0;
+      pCsr->isEof = 1;
+      return SQLITE_OK;
     }
   }else{
     pCsr->iDb = pTab->iDb;

diff --git a/test/stat.test b/test/stat.test
index 34f977bca19be3da583914358b5d86a6de9d4603..105169df1d7b45d5570d073adc13bdc0c953bacc 100644 (file)
--- a/test/stat.test
+++ b/test/stat.test
@@ -303,16 +303,16 @@ do_execsql_test 8.1 {
   CREATE VIRTUAL TABLE st4 USING dbstat;
 }
 do_execsql_test 8.2 {
-  SELECT * FROM st4 WHERE st4.aggregate = NULL
+  SELECT * FROM st4 WHERE st4.aggregate = NULL;
 }
 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 {
+} {}
+do_execsql_test 8.5 {
   SELECT * FROM st4 WHERE schema = NULL;
-} {1 {no such schema: }}
+} {}
 
 finish_test