Fix problems in the est_count pragma for indexes and WITHOUT ROWID tables.

FossilOrigin-Name: c39fd9b8f11b3f1df489df1df4197fe4a670732c

diff --git a/manifest b/manifest
index 615523ae78ea65271d2ffa149065da920cb9d473..ab3ba2497d7d00bc5fc12f51e99148b1a2e493fe 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimental\sest_count\spragma.
-D 2016-10-20T22:02:43.512
+C Fix\sproblems\sin\sthe\sest_count\spragma\sfor\sindexes\sand\sWITHOUT\sROWID\stables.
+D 2016-10-21T15:36:51.551
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -379,7 +379,7 @@ F src/parse.y 07f68096c97093793ed04d69db8bb75e55c3e00e
 F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
-F src/pragma.c baf707463944a0788df1503e9920c36edca1fe8f
+F src/pragma.c e33c2c772e838402ff940eed581992a693a4a91a
 F src/pragma.h 30d6559672c6755be452ea5fdf2e9bf32acc69a3
 F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
@@ -1526,10 +1526,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 fd81d8a4300c36d02f07371b722124ccf619654c
-R 43cd10c5c43a5cc4c174b3be405d48f3
-T *branch * est_count_pragma
-T *sym-est_count_pragma *
-T -sym-multi-arg-pragma *
+P 340822afbe0c6b47fdd789c56acd9e1058a434cb
+R e90ad2ebf1bcb25a55e3e2678b19c035
 U drh
-Z 5a2d49857d0ed608295dc142049c4e6c
+Z 01c14e3ae29abee9ef7e5b8de3cc1480

diff --git a/manifest.uuid b/manifest.uuid
index 641e3013bc8259352e416dc2216565a4fc40bc0a..b65dc96bc325b65e532c934da5f9b8c942b55eb0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-340822afbe0c6b47fdd789c56acd9e1058a434cb
\ No newline at end of file
+c39fd9b8f11b3f1df489df1df4197fe4a670732c
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index d88a9a0bf80ec7f50f8e88e09653e3d752f94ba2..b2eedbcf0a8c0c21d8ac773370c0eb5a293274bf 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1390,7 +1390,7 @@ void sqlite3Pragma(
   */
   case PragTyp_EST_COUNT: {
     Index *pIdx;
-    Table *pTab;
+    Table *pTab = 0;
     Pgno iRoot = 0;
     const char *zName = 0;
     int regResult;
@@ -1400,8 +1400,13 @@ void sqlite3Pragma(
       iRoot = pIdx->tnum;
       zName = pIdx->zName;
     }else if( (pTab = sqlite3FindTable(db, zRight, zDb))!=0 ){
-      iRoot = pTab->tnum;
       zName = pTab->zName;
+      if( HasRowid(pTab) ){
+        iRoot = pTab->tnum;
+      }else{
+        pIdx = sqlite3PrimaryKeyIndex(pTab);
+        iRoot = pIdx->tnum;
+      }
     }else{
       break;
     }
@@ -1419,6 +1424,7 @@ void sqlite3Pragma(
     sqlite3CodeVerifySchema(pParse, iDb);
     pParse->nTab++;
     sqlite3VdbeAddOp4Int(v, OP_OpenRead, 0, iRoot, iDb, 1);
+    if( pIdx ) sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
     sqlite3VdbeAddOp3(v, OP_EstRowCnt, 0, regResult, (int)(r*1000000000));
     sqlite3VdbeAddOp2(v, OP_ResultRow, regResult, 1);
   }