From: drh <drh@noemail.net>
Date: Fri, 16 Dec 2016 18:41:11 +0000 (+0000)
Subject: Fix minor issues with the ".lint" command implemention in the shell and
X-Git-Tag: version-3.16.0~35^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Ffkey-missing-indexes;p=thirdparty%2Fsqlite.git

Fix minor issues with the ".lint" command implemention in the shell and
the shell help text related to ".lint".

FossilOrigin-Name: 1268dc77712d85de0b62332c88b22f7489f4e87f
---

diff --git a/manifest b/manifest
index ad23b1fdbe..e34d3de33b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\s".fkey_missing_indexes"\sto\s".lint\sfkey-indexes".
-D 2016-12-16T17:28:56.295
+C Fix\sminor\sissues\swith\sthe\s".lint"\scommand\simplemention\sin\sthe\sshell\sand\nthe\sshell\shelp\stext\srelated\sto\s".lint".
+D 2016-12-16T18:41:11.376
 F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8
 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 204491a5e09a66380a067943d8651af8bda1d358
-F src/shell.c 0f1f7935f9a18b5458fd8279d7995c2e1743bdc2
+F src/shell.c 9be556ad9c7cf429d0acc48e386960d290c4df75
 F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1537,7 +1537,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 3ab05987b0cc12af64bf32d885d04aff45d7a77c
-R 17b5d854673e0a0adb6375b01c294779
-U dan
-Z 080e8bf78fe63c73094cbd3615b790ed
+P ee621ade38c11806e1df57c459da5f018a6d0670
+R c295b60403c83c54dd0a041668d05312
+U drh
+Z 639f0a5a4b0a629c3f185644f89569f0
diff --git a/manifest.uuid b/manifest.uuid
index b8d8dbe1a3..fdb102989d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ee621ade38c11806e1df57c459da5f018a6d0670
\ No newline at end of file
+1268dc77712d85de0b62332c88b22f7489f4e87f
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index 27267918fd..c4c1eed3de 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -2185,7 +2185,6 @@ static char zHelp[] =
   ".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"
-  ".fkey_missing_indexes  Find indexes to make FK processing more efficient\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"
@@ -2200,6 +2199,8 @@ static char zHelp[] =
   ".iotrace FILE          Enable I/O diagnostic logging to FILE\n"
 #endif
   ".limit ?LIMIT? ?VAL?   Display or change the value of an SQLITE_LIMIT\n"
+  ".lint OPTIONS          Report potential schema issues. Options:\n"
+  "                         fkey-indexes     Find missing foreign key indexes\n"
 #ifndef SQLITE_OMIT_LOAD_EXTENSION
   ".load FILE ?ENTRY?     Load an extension library\n"
 #endif
@@ -3489,7 +3490,7 @@ static int lintDotCommand(
   int nArg                        /* Number of entries in azArg[] */
 ){
   int n;
-  n = (nArg>=1 ? strlen(azArg[1]) : 0);
+  n = (nArg>=2 ? strlen(azArg[1]) : 0);
   if( n<1 || sqlite3_strnicmp(azArg[1], "fkey-indexes", n) ) goto usage;
   return lintFkeyIndexes(pState, azArg, nArg);
 
@@ -4282,6 +4283,7 @@ static int do_meta_command(char *zLine, ShellState *p){
   }else
 
   if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
+    open_db(p, 0);
     lintDotCommand(p, azArg, nArg);
   }else