database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-03 16:53:36 +03:00
Code Activity

Change ".fkey_missing_indexes" to ".lint fkey-indexes".

Browse Source 
FossilOrigin-Name: ee621ade38c11806e1df57c459da5f018a6d0670
This commit is contained in:
dan
2016-12-16 17:28:56 +00:00
parent dd9e0be46a
commit 3c7ebeb548
4 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/shell.c
View File

@@ -3255,13 +3255,9 @@ int shellDeleteFile(const char *zFilename){
}
/**************************************************************************
** Beginning of implementation of .fkey_missing_indexes
*/
/*
** The implementation of SQL scalar function fkey_collate_clause(), used
** by the ".fkey_missing_indexes" command. This scalar function is always
** by the ".lint fkey-indexes" command. This scalar function is always
** called with four arguments - the parent table name, the parent column name,
** the child table name and the child column name.
**
@@ -3313,9 +3309,9 @@ static void shellFkeyCollateClause(
/*
** The implementation of dot-command ".fkey_missing_indexes".
** The implementation of dot-command ".lint fkey-indexes".
*/
static int shellFkeyMissingIndexes(
static int lintFkeyIndexes(
ShellState *pState, /* Current shell tool state */
char **azArg, /* Array of arguments passed to dot command */
int nArg /* Number of entries in azArg[] */
@@ -3392,7 +3388,7 @@ static int shellFkeyMissingIndexes(
"ORDER BY (CASE WHEN ? THEN f.[table] ELSE s.name END)"
;
for(i=1; i<nArg; i++){
for(i=2; i<nArg; i++){
int n = strlen(azArg[i]);
if( n>1 && sqlite3_strnicmp("-verbose", azArg[i], n)==0 ){
bVerbose = 1;
@@ -3402,7 +3398,9 @@ static int shellFkeyMissingIndexes(
zIndent = " ";
}
else{
raw_printf(stderr, "Usage: .fkey_lint ?-verbose? ?-groupbyparent?\n");
raw_printf(stderr, "Usage: %s %s ?-verbose? ?-groupbyparent?\n",
azArg[0], azArg[1]
);
return SQLITE_ERROR;
}
}
@@ -3481,9 +3479,27 @@ static int shellFkeyMissingIndexes(
return rc;
}
/*
** End of implementation of .fkey_missing_indexes
**************************************************************************/
** Implementation of ".lint" dot command.
*/
static int lintDotCommand(
ShellState *pState, /* Current shell tool state */
char **azArg, /* Array of arguments passed to dot command */
int nArg /* Number of entries in azArg[] */
){
int n;
n = (nArg>=1 ? strlen(azArg[1]) : 0);
if( n<1 || sqlite3_strnicmp(azArg[1], "fkey-indexes", n) ) goto usage;
return lintFkeyIndexes(pState, azArg, nArg);
usage:
raw_printf(stderr, "Usage %s sub-command ?switches...?\n", azArg[0]);
raw_printf(stderr, "Where sub-commands are:\n");
raw_printf(stderr, " fkey-indexes\n");
return SQLITE_ERROR;
}
/*
** If an input line begins with "." then invoke this routine to
@@ -3798,10 +3814,6 @@ static int do_meta_command(char *zLine, ShellState *p){
}
}else
if( c=='f' && strncmp(azArg[0], "fkey_missing_indexes", n)==0 ){
shellFkeyMissingIndexes(p, azArg, nArg);
}else
if( c=='f' && strncmp(azArg[0], "fullschema", n)==0 ){
ShellState data;
char *zErrMsg = 0;
@@ -4269,6 +4281,10 @@ static int do_meta_command(char *zLine, ShellState *p){
}
}else
if( c=='l' && n>2 && strncmp(azArg[0], "lint", n)==0 ){
lintDotCommand(p, azArg, nArg);
}else
#ifndef SQLITE_OMIT_LOAD_EXTENSION
if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
const char *zFile, *zProc;