Remove the ".explain" command from the ".help" output of the command-line

shell, though keep the implementation around for backwards compatibility.

FossilOrigin-Name: 7782c04e9b2c0e95b5ac2a38876c1a233becfd892140bc6844790d62aeaff4f7

diff --git a/manifest b/manifest
index 759cc4d3a38646a7a5690465f2dc748d8b45d5fb..cdd364e3d01ea4f3fa0cfb2303167a143eccafb1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Some\ssimple\stests\sfor\sthe\sSTMT\svirtual\stable.
-D 2017-06-29T20:31:01.137
+C Remove\sthe\s".explain"\scommand\sfrom\sthe\s".help"\soutput\sof\sthe\scommand-line\nshell,\sthough\skeep\sthe\simplementation\saround\sfor\sbackwards\scompatibility.
+D 2017-06-29T21:11:27.834
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@@ -449,7 +449,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c d1e69759e7a79c156c692793f5d16f82f9a60ce5e82efd95e4374b2423034946
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 741937503c74d85e64828b63d5a4219d3cfce480a717efef635839606001b1ba
-F src/shell.c 227b86f2bdd707d0a177a4805a5c0b0378ef8337ab1ad04f5d79dc479568735a
+F src/shell.c d001562954e126af263435fab73221b538e2df5e7d2930715dfe3b7f7b477328
 F src/sqlite.h.in 5d9e3996052222789c2031a0a0107d7bbaea447ff91cb8af1388f01a2e4d8571
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
@@ -1215,7 +1215,7 @@ F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
 F test/stat.test f8f1279ffffabe6df825723af18cc6e0ae70a893
 F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
-F test/stmtvtab1.test 2a3cee496574ee9515e5e7a92fb8d9447903ccc14536a21545debeda267ff3c8 w test/stmt1.test
+F test/stmtvtab1.test 2a3cee496574ee9515e5e7a92fb8d9447903ccc14536a21545debeda267ff3c8
 F test/subjournal.test 2121a93ef3d3e83d52bf236c8a02aef4009fbf52884754104b2b6cad9a041095
 F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
 F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
@@ -1628,7 +1628,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 3ed6877f89106131fd030c183fac036fed7231cd92dc4715e87a34a045500bdf
-R f67ff22f1b8b20f94ea7b59db6307e02
+P a26e17ee56d3c019fc4772fcf95480b4515eea6cfc74c3d494be0d1941e49666
+R 654dacaf054d8d36a1fa42cefe34b183
 U drh
-Z bbd5de16ec21a4e6e27746cc3cb954d3
+Z 7feda7ce63e7c3acebc54f5aa04a2832

diff --git a/manifest.uuid b/manifest.uuid
index 40c8924072fa658d8b6f1cdd62ed44819864f94c..46c68d3a7ad3847a8b183d371f2505dabbe6ba3a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a26e17ee56d3c019fc4772fcf95480b4515eea6cfc74c3d494be0d1941e49666
\ No newline at end of file
+7782c04e9b2c0e95b5ac2a38876c1a233becfd892140bc6844790d62aeaff4f7
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index ec255a6737cfb6422c185590f560244c1609b401..50186a5d1b5c71cd6063710aa16ae57056e051c6 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -3327,7 +3327,9 @@ static char zHelp[] =
   ".echo on|off           Turn command echo on or off\n"
   ".eqp on|off|full       Enable or disable automatic EXPLAIN QUERY PLAN\n"
   ".exit                  Exit this program\n"
-  ".explain ?on|off|auto? Turn EXPLAIN output mode on or off or to automatic\n"
+/* Because explain mode comes on automatically now, the ".explain" mode
+** is removed from the help screen.  It is still supported for legacy, however */
+/*".explain ?on|off|auto? Turn EXPLAIN output mode on or off or to automatic\n"*/
   ".fullschema ?--indent? Show schema and the content of sqlite_stat tables\n"
   ".headers on|off        Turn display of headers on or off\n"
   ".help                  Show this message\n"
@@ -5035,6 +5037,8 @@ static int do_meta_command(char *zLine, ShellState *p){
     rc = 2;
   }else
 
+  /* The ".explain" command is automatic now.  It is largely pointless.  It
+  ** retained purely for backwards compatibility */
   if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){
     int val = 1;
     if( nArg>=2 ){