In the command-line shell, improve the formatting to the ".databases"

command and on the ".tables" command, only show the schema prefix for
databases past the first ("main") database.

FossilOrigin-Name: c0d5626e274cbf8c2d2167183c4d6835d72dae57

diff --git a/manifest b/manifest
index 28e652f06df239fd359dd5603c88d015a9f154f3..812a43e8c05beff63ae6c3a42e381eb281b28db3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fill\sin\smissing\sopcode\sdocumentation\sentries\sfor\sOP_SorterNext\sand\nOP_SorterSort.
-D 2016-12-23T16:05:22.280
+C In\sthe\scommand-line\sshell,\simprove\sthe\sformatting\sto\sthe\s".databases"\ncommand\sand\son\sthe\s".tables"\scommand,\sonly\sshow\sthe\sschema\sprefix\sfor\ndatabases\spast\sthe\sfirst\s("main")\sdatabase.
+D 2016-12-24T18:04:28.394
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -389,7 +389,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c dfb6cadc3dcfba1b1bdbfba62ebba2b4b673413e
-F src/shell.c bf79a69d1f9b53de958498752b78e9906c5d0aff
+F src/shell.c e99c2d27b263166a1eb58d7db200f481308a2066
 F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1539,7 +1539,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 99fddf2ecb7202bfdf5ddc4cc1c4e155c883f7ec
-R 56df15bb1ab261ae6795a2b612a0d655
+P 2940661b8c014b94973e05c44f1b1f4f443dbdd3
+R 52df4fe6a27080b6c7afd95948d62b3b
 U drh
-Z 214f09845ac7912624c689c7d0a93d7d
+Z 7fc049944b0ca3b30ace09cf9ed6380f

diff --git a/manifest.uuid b/manifest.uuid
index 31b7ace9e9f6ad7fee6c245d2041acca85a3ba9c..ddb2c1308d6d6b909b94a0b9503c1a1e0795e0d0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2940661b8c014b94973e05c44f1b1f4f443dbdd3
\ No newline at end of file
+c0d5626e274cbf8c2d2167183c4d6835d72dae57
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 7e89527d90acf0323cd4b3587bf127e8a8f7fe1b..3549ae36517461c56236e1823d875c8744e3fa44 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -3707,8 +3707,8 @@ static int do_meta_command(char *zLine, ShellState *p){
     data.showHeader = 1;
     data.cMode = data.mode = MODE_Column;
     data.colWidth[0] = 3;
-    data.colWidth[1] = 15;
-    data.colWidth[2] = 58;
+    data.colWidth[1] = 0;
+    data.colWidth[2] = 0;
     data.cnt = 0;
     sqlite3_exec(p->db, "PRAGMA database_list; ", callback, &data, &zErrMsg);
     if( zErrMsg ){
@@ -4978,9 +4978,9 @@ static int do_meta_command(char *zLine, ShellState *p){
         " WHERE type IN ('table','view')"
         "   AND name NOT LIKE 'sqlite_%%'"
         "   AND name LIKE ?1");
-    while( zSql && sqlite3_step(pStmt)==SQLITE_ROW ){
+    for(ii=0; zSql && sqlite3_step(pStmt)==SQLITE_ROW; ii++){
       const char *zDbName = (const char*)sqlite3_column_text(pStmt, 1);
-      if( zDbName==0 || strcmp(zDbName,"main")==0 ) continue;
+      if( zDbName==0 || ii==0 ) continue;
       if( strcmp(zDbName,"temp")==0 ){
         zSql = sqlite3_mprintf(
                  "%z UNION ALL "