Fix a bug in the ".show" command of the CLI. Ticket #2942. (CVS 4792)

FossilOrigin-Name: dedf5f230bf34a207f2ee0a8349a2ea602a38aba

diff --git a/manifest b/manifest
index 15cb4e01ea008415018417a1f85c9f64ab49eb64..79d08c72951d09299cf097057c44bd2d52d00494 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sapply\sthe\squery\sflattening\soptimization\swhen\sthe\souter\squery\sis\san\r\naggregate\sand\sthe\sinner\squery\scontains\san\sORDER\sBY\sclause.\s\sTicket\s#2943.\s(CVS\s4791)
-D 2008-02-15T14:33:04
+C Fix\sa\sbug\sin\sthe\s".show"\scommand\sof\sthe\sCLI.\s\sTicket\s#2942.\s(CVS\s4792)
+D 2008-02-15T17:38:06
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in bc2b5df3e3d0d4b801b824b7ef6dec43812b049b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -135,7 +135,7 @@ F src/printf.c eb27822ba2eec669161409ca31279a24c26ac910
 F src/random.c 02ef38b469237482f1ea14a78b2087cfbaec48bd
 F src/select.c aef06a4b157cc7defe8f99255f9a13cf693c8f13
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
-F src/shell.c ca06cb687c40a8bff6307b5fad41a0e86a0f8558
+F src/shell.c c1ef4eb7872afb7417e52d6ec3f2d15be90cba8a
 F src/sqlite.h.in 74e71510ce5967333a36329212eca0833f6300bd
 F src/sqlite3ext.h a93f59cdee3638dc0c9c086f80df743a4e68c3cb
 F src/sqliteInt.h c82511830758350ed4cedd0815add7cbb145e08d
@@ -619,7 +619,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 4df62a55d6fc92c3d0a416c9c03d86d76478feb6
-R 171d3738564305862c44644c7b059e59
+P 6d33cbd99cb0db680767ceb31ec6345e90a805bc
+R 278e440ef39be86aca5c9fcf37732ebc
 U drh
-Z c1c355e8e6620694fb23b02247622eef
+Z 27b6c195ad861a325b1d53c0c1393102

diff --git a/manifest.uuid b/manifest.uuid
index 8bc5686de65174b6955081f5775c77fe2b99bb68..b0e264ea070955e2d061aea2f493256496fffdef 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6d33cbd99cb0db680767ceb31ec6345e90a805bc
\ No newline at end of file
+dedf5f230bf34a207f2ee0a8349a2ea602a38aba
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 6fe9324a68541efa24afb74485ab93d432a79306..a72cf3ac2f5b1616d423ffc0559c0f03d308f253 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.174 2008/01/21 16:22:46 drh Exp $
+** $Id: shell.c,v 1.175 2008/02/15 17:38:06 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -336,10 +336,9 @@ struct callback_data {
 #define MODE_Insert   5  /* Generate SQL "insert" statements */
 #define MODE_Tcl      6  /* Generate ANSI-C or TCL quoted elements */
 #define MODE_Csv      7  /* Quote strings, numbers are plain */
-#define MODE_NUM_OF   8  /* The number of modes (not a mode itself) */
-#define MODE_Explain  9  /* Like MODE_Column, but do not truncate data */
+#define MODE_Explain  8  /* Like MODE_Column, but do not truncate data */
 
-static const char *modeDescr[MODE_NUM_OF] = {
+static const char *modeDescr[] = {
   "line",
   "column",
   "list",
@@ -348,6 +347,7 @@ static const char *modeDescr[MODE_NUM_OF] = {
   "insert",
   "tcl",
   "csv",
+  "explain",
 };
 
 /*