From: drh <drh@noemail.net>
Date: Tue, 27 Mar 2012 18:00:05 +0000 (+0000)
Subject: Add output of PRAGMAs auto_vacuum and encoding to the "schema" command of the
X-Git-Tag: mountain-lion~3^2~9^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdb86dc4374bd1d0c7791e0a8999b249ee8c6eda;p=thirdparty%2Fsqlite.git

Add output of PRAGMAs auto_vacuum and encoding to the "schema" command of the
fts3view utility program.

FossilOrigin-Name: e31076319363a46905836880765bae3bf204ed19
---

diff --git a/ext/fts3/tool/fts3view.c b/ext/fts3/tool/fts3view.c
index 6fa2e40d20..479ae9868d 100644
--- a/ext/fts3/tool/fts3view.c
+++ b/ext/fts3/tool/fts3view.c
@@ -75,14 +75,16 @@ static sqlite3_stmt *prepare(sqlite3 *db, const char *zFormat, ...){
 /*
 ** Run an SQL statement
 */
-static void runSql(sqlite3 *db, const char *zFormat, ...){
+static int runSql(sqlite3 *db, const char *zFormat, ...){
   va_list ap;
   char *zSql;
+  int rc;
 
   va_start(ap, zFormat);
   zSql = sqlite3_vmprintf(zFormat, ap);
-  sqlite3_exec(db, zSql, 0, 0, 0);
+  rc = sqlite3_exec(db, zSql, 0, 0, 0);
   va_end(ap);
+  return rc;
 }
 
 /*
@@ -109,6 +111,22 @@ static void showSchema(sqlite3 *db, const char *zTab){
     printf("PRAGMA journal_mode=%s;\n", sqlite3_column_text(pStmt, 0));
   }
   sqlite3_finalize(pStmt);
+  pStmt = prepare(db, "PRAGMA auto_vacuum");
+  while( sqlite3_step(pStmt)==SQLITE_ROW ){
+    const char *zType = "???";
+    switch( sqlite3_column_int(pStmt, 0) ){
+      case 0:  zType = "OFF";         break;
+      case 1:  zType = "FULL";        break;
+      case 2:  zType = "INCREMENTAL"; break;
+    }
+    printf("PRAGMA auto_vacuum=%s;\n", zType);
+  }
+  sqlite3_finalize(pStmt);
+  pStmt = prepare(db, "PRAGMA encoding");
+  while( sqlite3_step(pStmt)==SQLITE_ROW ){
+    printf("PRAGMA encoding=%s;\n", sqlite3_column_text(pStmt, 0));
+  }
+  sqlite3_finalize(pStmt);
 }
 
 /* 
@@ -801,6 +819,7 @@ int main(int argc, char **argv){
   int rc;
   const char *zTab;
   const char *zCmd;
+
   if( argc<2 ) usage(argv[0]);
   rc = sqlite3_open(argv[1], &db);
   if( rc ){
diff --git a/manifest b/manifest
index 61f584f692..94e76c98c2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Really\sdelete\sthe\sfts3merge.test\sscript\s(should\shave\sbeen\sdeleted\sby\sthe\sprevious\scommit).
-D 2012-03-27T15:10:50.636
+C Add\soutput\sof\sPRAGMAs\sauto_vacuum\sand\sencoding\sto\sthe\s"schema"\scommand\sof\sthe\nfts3view\sutility\sprogram.
+D 2012-03-27T18:00:05.762
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -81,7 +81,7 @@ F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 F ext/fts3/fts3_write.c ceb65d6a85f44c7dd1d96f12d04e20f75884bfe3
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
-F ext/fts3/tool/fts3view.c 2c7f1bc1feddca85397be174fb6871007c27898b
+F ext/fts3/tool/fts3view.c 6cfc5b67a5f0e09c0d698f9fd012c784bfaa9197
 F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
 F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
@@ -999,7 +999,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 5c447e226afca0d46b9ed994dea26a16a9ae168c
-R 5d18089d511e28a909d4de9046e3cbed
-U dan
-Z f30e1777f0eaeb639d51fafd86db0092
+P 83838149d9dd7956c5f48f760c2f321180d2db5f
+R 1fdbec6e653dc840496748cca8fc7c51
+U drh
+Z bdf85c43146250da50e5176dbc98907c
diff --git a/manifest.uuid b/manifest.uuid
index e67e18a6c4..0d2aaa0b71 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83838149d9dd7956c5f48f760c2f321180d2db5f
\ No newline at end of file
+e31076319363a46905836880765bae3bf204ed19
\ No newline at end of file