Improvements to the ".fullschema" command in the command-line shell.

FossilOrigin-Name: fa80c64caa573297bf43cb5b11d9e7db58567200

diff --git a/manifest b/manifest
index 2b4d4ab97f9dce1de5494a02ce2347655f8743dc..baca280a3a62e7b07fe6660e072470c405a3c29f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sthe\sfts3view\sutility\sprogram\sthat\scan\soccur\swith\sMSVC.
-D 2014-07-07T18:03:38.442
+C Improvements\sto\sthe\s".fullschema"\scommand\sin\sthe\scommand-line\sshell.
+D 2014-07-18T14:43:29.403
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1732320ecac3fee229d560d7ef2afa34681d1815
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -223,7 +223,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
-F src/shell.c 56de2dfa3f25def4bf03098f7e2256fbb42f6e3c
+F src/shell.c 566aee8213372a2e81ba0eb34e9759f7b2574009
 F src/sqlite.h.in a98eb3e8c86c934ea6f5bcfc6b69653dde2f4ed4
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1182,7 +1182,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P b04751bd59fed513ab615e7f368fe25c64b3607c
-R 30e3947db20694bb71560953bb8a13c2
-U mistachkin
-Z 58c34cf56858b67c344e911b0fcd0cab
+P 1cec1e030035e5253fb7ebbdfe5c1a3029e4e29b
+R 3a5c863b5d4e43cf3d99c01f25a09c91
+U drh
+Z f91dd8693f049cec144fbd0b43e0e92a

diff --git a/manifest.uuid b/manifest.uuid
index afc22bde21bca61b06244be4051c7b733d254b27..984495a47c5f8448a521135b60241c6dcc230ef0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1cec1e030035e5253fb7ebbdfe5c1a3029e4e29b
\ No newline at end of file
+fa80c64caa573297bf43cb5b11d9e7db58567200
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index ff87d817b93e0ba3a8cab74a181fc6012342a484..97167dc877c13310667294c266aaff0d2ac24f86 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2416,6 +2416,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
   if( c=='f' && strncmp(azArg[0], "fullschema", n)==0 ){
     struct callback_data data;
     char *zErrMsg = 0;
+    int doStats = 0;
     if( nArg!=1 ){
       fprintf(stderr, "Usage: .fullschema\n");
       rc = 1;
@@ -2434,21 +2435,33 @@ static int do_meta_command(char *zLine, struct callback_data *p){
        "ORDER BY rowid",
        callback, &data, &zErrMsg
     );
-    sqlite3_exec(p->db, "SELECT 'ANALYZE sqlite_master;'",
-                 callback, &data, &zErrMsg);
-    data.mode = MODE_Insert;
-    data.zDestTable = "sqlite_stat1";
-    shell_exec(p->db, "SELECT * FROM sqlite_stat1",
-               shell_callback, &data,&zErrMsg);
-    data.zDestTable = "sqlite_stat3";
-    shell_exec(p->db, "SELECT * FROM sqlite_stat3",
-               shell_callback, &data,&zErrMsg);
-    data.zDestTable = "sqlite_stat4";
-    shell_exec(p->db, "SELECT * FROM sqlite_stat4",
-               shell_callback, &data, &zErrMsg);
-    data.mode = MODE_Semi;
-    shell_exec(p->db, "SELECT 'ANALYZE sqlite_master;'",
-               shell_callback, &data, &zErrMsg);
+    if( rc==SQLITE_OK ){
+      sqlite3_stmt *pStmt;
+      rc = sqlite3_prepare_v2(p->db,
+               "SELECT rowid FROM sqlite_master"
+               " WHERE name GLOB 'sqlite_stat[134]'",
+               -1, &pStmt, 0);
+      doStats = sqlite3_step(pStmt)==SQLITE_ROW;
+      sqlite3_finalize(pStmt);
+    }
+    if( doStats==0 ){
+      fprintf(p->out, "/* No STAT tables available */\n");
+    }else{
+      fprintf(p->out, "ANALYZE sqlite_master;\n");
+      sqlite3_exec(p->db, "SELECT 'ANALYZE sqlite_master'",
+                   callback, &data, &zErrMsg);
+      data.mode = MODE_Insert;
+      data.zDestTable = "sqlite_stat1";
+      shell_exec(p->db, "SELECT * FROM sqlite_stat1",
+                 shell_callback, &data,&zErrMsg);
+      data.zDestTable = "sqlite_stat3";
+      shell_exec(p->db, "SELECT * FROM sqlite_stat3",
+                 shell_callback, &data,&zErrMsg);
+      data.zDestTable = "sqlite_stat4";
+      shell_exec(p->db, "SELECT * FROM sqlite_stat4",
+                 shell_callback, &data, &zErrMsg);
+      fprintf(p->out, "ANALYZE sqlite_master;\n");
+    }
   }else
 
   if( c=='h' && strncmp(azArg[0], "headers", n)==0 ){