Fix a problem with EXPLAIN on pragmas that return single integer values.

Ticket #886 (CVS 1929)

FossilOrigin-Name: 8ce3d730b0bf1a9b9472ff38c58c462ebc3566e3

diff --git a/manifest b/manifest
index 38ccf08d704260369dc47d6b358c226b05771ca3..ba20d1a12d3dafa21278845055c83bac7645f8b4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Transactions\scommit\son\sthe\slast\ssqlite3_step(),\snot\son\ssqlite3_finalize().\nThis\sallows\sthe\ssqlite3_step()\sto\sreturn\sSQLITE_BUSY\sif\sthe\scommit\sis\nblocked\sby\sa\slock.\s\sTicket\s#885.\s(CVS\s1928)
-D 2004-09-02T14:57:08
+C Fix\sa\sproblem\swith\sEXPLAIN\son\spragmas\sthat\sreturn\ssingle\sinteger\svalues.\nTicket\s#886\s(CVS\s1929)
+D 2004-09-02T15:14:01
 F Makefile.in 65a7c43fcaf9a710d62f120b11b6e435eeb4a450
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -55,7 +55,7 @@ F src/os_win.h babd4e912967c6b09088cfe38a45e8005a07ba44
 F src/pager.c ae06c85de0db43f61a7a3e5eacad3fd5615daf59
 F src/pager.h 67739fe649f33be55dba522ca8a9cc4e42d14f71
 F src/parse.y 581a2ce014b843506805b2470c02b7865ad034d5
-F src/pragma.c b39177b96bb5f7354511468c933357ce65a0dd4c
+F src/pragma.c 7156618038546ed4d09d733ceea231aebee3f2f8
 F src/printf.c 17b28a1eedfe8129b05de981719306c18c3f1327
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 14534579535579a082fda8bbc7d621d7d170f406
@@ -151,6 +151,7 @@ F test/null.test 642428b6a5408cc5b954b49e1b6e5025e4458b2b
 F test/pager.test 059cc5c58d3b5a851343dff8c56cf7286425d03a
 F test/pager2.test 55469c7c1c1a54d6b32d7b3cc99001e90101a1ce
 F test/pager3.test 16f546293bb751b8151dc17df613fca938bbec8b
+F test/pagesize.test 81753e370d813e0c32931172baecd13b72561cff
 F test/pragma.test 66a66b7f3b273b93325c9a5794acb418f52fdcbf
 F test/printf.test 5a30fb0d736148fca64cb1b7ed0390be7414e024
 F test/progress.test 76c722f090b1ccb575e7e4e203a71608c5763beb x
@@ -247,7 +248,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 18af6ba580a5ad50a20955bfe2ebce8e30b1d39e
-R 8124409cd5ad134f1cc0a6f820ab9a66
+P d1b29156558f1c576002cdb2544dffaa693da39b
+R 876d7cb431e79f53a95298099ca098db
 U drh
-Z 68ff020543a01eac2435ebdc5d559c02
+Z 4c9b3e6574259aabf5da8d25cc31a80e

diff --git a/manifest.uuid b/manifest.uuid
index c22d4c09c4669fcd051a1ed7068b1a895e03a9db..07ade5de1f165e219602fada721575df07740c4b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d1b29156558f1c576002cdb2544dffaa693da39b
\ No newline at end of file
+8ce3d730b0bf1a9b9472ff38c58c462ebc3566e3
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index 6fc43607c0898267c38a87b9f9a35e8a1e4d4ad8..4c94c0fd7b622842f09b97075833236387e4dcaa 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.61 2004/08/31 13:45:12 drh Exp $
+** $Id: pragma.c,v 1.62 2004/09/02 15:14:01 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -114,10 +114,13 @@ static int changeTempStorage(Parse *pParse, const char *zStorageType){
 /*
 ** Generate code to return a single integer value.
 */
-static void returnSingleInt(Vdbe *v, const char *zLabel, int value){
+static void returnSingleInt(Parse *pParse, const char *zLabel, int value){
+  Vdbe *v = sqlite3GetVdbe(pParse);
   sqlite3VdbeAddOp(v, OP_Integer, value, 0);
-  sqlite3VdbeSetNumCols(v, 1);
-  sqlite3VdbeSetColName(v, 0, zLabel, P3_STATIC);
+  if( pParse->explain==0 ){
+    sqlite3VdbeSetNumCols(v, 1);
+    sqlite3VdbeSetColName(v, 0, zLabel, P3_STATIC);
+  }
   sqlite3VdbeAddOp(v, OP_Callback, 1, 0);
 }
 
@@ -149,7 +152,8 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
       if( zRight==0 ){
         v = sqlite3GetVdbe(pParse);
         if( v ){
-          returnSingleInt(v, aPragma[i].zName, (db->flags&aPragma[i].mask)!=0);
+          returnSingleInt(pParse,
+               aPragma[i].zName, (db->flags&aPragma[i].mask)!=0);
         }
       }else if( getBoolean(zRight) ){
         db->flags |= aPragma[i].mask;
@@ -277,7 +281,7 @@ void sqlite3Pragma(
     Btree *pBt = pDb->pBt;
     if( !zRight ){
       int size = pBt ? sqlite3BtreeGetPageSize(pBt) : 0;
-      returnSingleInt(v, "page_size", size);
+      returnSingleInt(pParse, "page_size", size);
     }else{
       sqlite3BtreeSetPageSize(pBt, atoi(zRight), 0);
     }
@@ -300,7 +304,7 @@ void sqlite3Pragma(
   if( sqlite3StrICmp(zLeft,"cache_size")==0 ){
     if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     if( !zRight ){
-      returnSingleInt(v, "cache_size", pDb->cache_size);
+      returnSingleInt(pParse, "cache_size", pDb->cache_size);
     }else{
       int size = atoi(zRight);
       if( size<0 ) size = -size;
@@ -322,7 +326,7 @@ void sqlite3Pragma(
   */
   if( sqlite3StrICmp(zLeft, "temp_store")==0 ){
     if( !zRight ){
-      returnSingleInt(v, "temp_store", db->temp_store);
+      returnSingleInt(pParse, "temp_store", db->temp_store);
     }else{
       changeTempStorage(pParse, zRight);
     }
@@ -340,7 +344,7 @@ void sqlite3Pragma(
   if( sqlite3StrICmp(zLeft,"synchronous")==0 ){
     if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     if( !zRight ){
-      returnSingleInt(v, "synchronous", pDb->safety_level-1);
+      returnSingleInt(pParse, "synchronous", pDb->safety_level-1);
     }else{
       if( !db->autoCommit ){
         sqlite3ErrorMsg(pParse, 

diff --git a/test/pagesize.test b/test/pagesize.test
new file mode 100644 (file)
index 0000000..6dafeed
--- /dev/null
+++ b/test/pagesize.test
@@ -0,0 +1,56 @@
+# 2004 September 2
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.
+# This file implements tests for the page_size PRAGMA.
+#
+# $Id: pagesize.test,v 1.1 2004/09/02 15:14:01 drh Exp $
+
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+do_test pagesize-1.1 {
+  execsql {PRAGMA page_size}
+} 1024
+do_test pagesize-1.2 {
+  catch {execsql {EXPLAIN PRAGMA page_size}}
+} 0
+do_test pagesize-1.3 {
+  execsql {
+    CREATE TABLE t1(a);
+    PRAGMA page_size=2048;
+    PRAGMA page_size;
+  }
+} 1024
+do_test pagesize-1.4 {
+  db close
+  file delete -force test.db
+  sqlite3 db test.db
+  execsql {
+    PRAGMA page_size=2048;
+    CREATE TABLE t1(a);
+    PRAGMA page_size;
+  }
+} 2048
+do_test pagesize-1.5 {
+  db close
+  sqlite3 db test.db
+  execsql {
+    PRAGMA page_size
+  }
+} 2048
+do_test pagesize-1.6 {
+  file size test.db
+} 2048
+
+
+
+finish_test