Changes to the new initial row of PRAGMA index_list results.

FossilOrigin-Name: 0c4dd9fff0c78c3519bfd5b59100183b97fd1863

diff --git a/manifest b/manifest
index af48feaddab4e18f1dbbd72c37bfd8e8ff79fb85..6e241dbb13848e579d24961ee9a6639b66ee4701 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarning.
-D 2013-10-12T02:33:22.853
+C Changes\sto\sthe\snew\sinitial\srow\sof\sPRAGMA\sindex_list\sresults.
+D 2013-10-12T09:32:05.784
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e2d28ec95bd17ab4f3b6ee40b7102e9d7a0857b9
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -211,7 +211,7 @@ F src/parse.y a97566d6da75075589a7c716d1bda14b586cf8da
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
 F src/pcache1.c a467393909a4ed7ca9de066d85ba5c5b04a5be63
-F src/pragma.c f4ff6e29c316d06bf7dffca0c8cee7c229cae42e
+F src/pragma.c 393efaa787ec5535cf30f6e435b94ec436776745
 F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
 F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
 F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
@@ -725,7 +725,7 @@ F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
 F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
 F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
 F test/permutations.test e154f5ed66d4d4913a99a110e870c9407f75b055
-F test/pragma.test 5c6e8ae9eaa9a505cc1035b51f7f0da9805092c7
+F test/pragma.test 75990a4a9f2b492d715c4ec89c8ced72dd20639b
 F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
 F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
 F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
@@ -1123,7 +1123,10 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 035d03e94252f31025b39da49d8401933352fb77
-R 674aebabd5ad2749788043a817e7f011
+P 4b130f88fba216e088f61252bbcdde57ec7ee6a9
+R 9bf7835789baab295617af1cddd33ae8
+T *branch * indexList
+T *sym-indexList *
+T -sym-trunk *
 U mistachkin
-Z fc9cb3270f125330055c4b37111cf872
+Z d185d392a7046e387236f5f2d221e822

diff --git a/manifest.uuid b/manifest.uuid
index de1b48360a8cd3866b638bf453f77b00bd47a3f0..853e5cb51e255c2c659699160031c74d1c530ee7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4b130f88fba216e088f61252bbcdde57ec7ee6a9
\ No newline at end of file
+0c4dd9fff0c78c3519bfd5b59100183b97fd1863
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index 969af6af343cd46c4070f9bbc897ac39cd033fc6..c61afd1e5eb8e8fc3e69209d8a955acdbfdd0d4e 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1465,8 +1465,10 @@ void sqlite3Pragma(
       sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "unique", SQLITE_STATIC);
       sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "avgrowsize", SQLITE_STATIC);
       sqlite3VdbeAddOp2(v, OP_Integer, 0, 1);
-      sqlite3VdbeAddOp2(v, OP_Null, 0, 2);
-      sqlite3VdbeAddOp2(v, OP_Integer, 1, 3);
+      sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0,
+         sqlite3MPrintf(db, "sqlite_pseudoindex_%s", pTab->zName),
+         P4_DYNAMIC);
+      sqlite3VdbeAddOp2(v, OP_Integer, 0, 3);
       sqlite3VdbeAddOp2(v, OP_Integer,
                            (int)sqlite3LogEstToInt(pTab->szTabRow), 4);
       sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 4);

diff --git a/test/pragma.test b/test/pragma.test
index 808aeb04d986d2c4558cf546e21a51ab78b109b0..a43d2d6378000dfe7fb09104af7b0f7a70ea6cae 100644 (file)
--- a/test/pragma.test
+++ b/test/pragma.test
@@ -574,7 +574,7 @@ ifcapable {foreignkey} {
     execsql {
       pragma index_list(t3);
     }
-  } {/0 {} 1 \d+ 1 sqlite_autoindex_t3_1 1 \d+/}
+  } {/0 sqlite_pseudoindex_t3 0 \d+ 1 sqlite_autoindex_t3_1 1 \d+/}
 }
 ifcapable {!foreignkey} {
   execsql {CREATE TABLE t3(a,b UNIQUE)}
@@ -647,7 +647,7 @@ do_test pragma-7.1.1 {
   execsql {
     pragma index_list(t3);
   }
-} {/0 {} 1 \d+ 1 t3i1 0 \d+ 2 sqlite_autoindex_t3_1 1 \d+/}
+} {/0 sqlite_pseudoindex_t3 0 \d+ 1 t3i1 0 \d+ 2 sqlite_autoindex_t3_1 1 \d+/}
 do_test pragma-7.1.2 {
   execsql {
     pragma index_list(t3_bogus);
@@ -1661,7 +1661,7 @@ do_test 23.3 {
     CREATE INDEX i3 ON t1(d,b,c);
   }
   db2 eval {PRAGMA index_list(t1)}
-} {/0 {} 1 \d+ 1 i3 0 \d+ 2 i2 0 \d+ 3 i1 0 \d+/}
+} {/0 sqlite_pseudoindex_t1 0 \d+ 1 i3 0 \d+ 2 i2 0 \d+ 3 i1 0 \d+/}
 do_test 23.4 {
   db eval {
     ALTER TABLE t1 ADD COLUMN e;