From: drh <drh@noemail.net>
Date: Wed, 9 Jan 2019 11:06:03 +0000 (+0000)
Subject: Small simplification to the dbstat virtual table.
X-Git-Tag: version-3.27.0~193
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e08ba4521c29df5c8b64692548ecdbe33ebf888;p=thirdparty%2Fsqlite.git

Small simplification to the dbstat virtual table.

FossilOrigin-Name: 9d4c156fa26f80bb8f88b6ad8f24520a15af296de9c110604f6bd42c257455a0
---

diff --git a/manifest b/manifest
index d8002eef9c..b1e25001ac 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\sALTER\sTABLE\sRENAME\sCOLUMN\sfeature\sso\sthat\sit\sworks\son\stables\nthat\shave\sredundant\sUNIQUE\sand/or\sPRIMARY\sKEY\sconstraints.\nFix\sfor\sticket\s[bc8d94f0fbd633fd9a051e3]
-D 2019-01-09T02:02:24.819
+C Small\ssimplification\sto\sthe\sdbstat\svirtual\stable.
+D 2019-01-09T11:06:03.627
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@ -462,7 +462,7 @@ F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
 F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
-F src/dbstat.c 3c8bd4e77f0244fd2bd7cc90acf116ad2f8e82d70e536637f35ac2bc99b726f9
+F src/dbstat.c 71f0bb9c38eac48812ed32cf926a6a41bf5d7f285740a2dcf5c3cbb67fbc2f1b
 F src/delete.c 209cd8345b15d1843abeff2d91a6d9c765cf32ff4abcb24411c38fe08e18baab
 F src/expr.c 9ad9c40a83c4218d79de19153b7a8ba7810564a123af7e09281927990bea2964
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
@@ -1797,7 +1797,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 ca67f2ec0e294384c397db438605df1b47aae5f348a8de94f97286997625d169
-R af2c1cedc8f3f69cab4d85bf53ec7003
+P f09aa3248e2b4a32ff5b5d37084cb2a27445322cb06a3354cef723f4f0b2cd34
+R 904b5dbe2cf1d3f367b8019199e2bad4
 U drh
-Z 39f916b96ea6a4b0b2d0a87edcd02ba6
+Z 7d313c98edbc8f55ad96808211d5313e
diff --git a/manifest.uuid b/manifest.uuid
index c64e6eee02..2822ebe46a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f09aa3248e2b4a32ff5b5d37084cb2a27445322cb06a3354cef723f4f0b2cd34
\ No newline at end of file
+9d4c156fa26f80bb8f88b6ad8f24520a15af296de9c110604f6bd42c257455a0
\ No newline at end of file
diff --git a/src/dbstat.c b/src/dbstat.c
index a6e521bee0..c9a8bb3e2f 100644
--- a/src/dbstat.c
+++ b/src/dbstat.c
@@ -602,7 +602,6 @@ static int statFilter(
   StatTable *pTab = (StatTable*)(pCursor->pVtab);
   char *zSql;
   int rc = SQLITE_OK;
-  char *zMaster;
 
   if( idxNum==1 ){
     const char *zDbase = (const char*)sqlite3_value_text(argv[0]);
@@ -618,13 +617,12 @@ static int statFilter(
   statResetCsr(pCsr);
   sqlite3_finalize(pCsr->pStmt);
   pCsr->pStmt = 0;
-  zMaster = pCsr->iDb==1 ? "sqlite_temp_master" : "sqlite_master";
   zSql = sqlite3_mprintf(
       "SELECT 'sqlite_master' AS name, 1 AS rootpage, 'table' AS type"
       "  UNION ALL  "
       "SELECT name, rootpage, type"
-      "  FROM \"%w\".%s WHERE rootpage!=0"
-      "  ORDER BY name", pTab->db->aDb[pCsr->iDb].zDbSName, zMaster);
+      "  FROM \"%w\".sqlite_master WHERE rootpage!=0"
+      "  ORDER BY name", pTab->db->aDb[pCsr->iDb].zDbSName);
   if( zSql==0 ){
     return SQLITE_NOMEM_BKPT;
   }else{