aboutsummaryrefslogtreecommitdiff
path: root/src/shell.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2014-09-11 00:27:53 +0000
committerdrh <drh@noemail.net>2014-09-11 00:27:53 +0000
commitd39c40ff5e89601a242f004faa45735e80275fcb (patch)
treed3ec2397a2362c249668d09c7f6c384531670256 /src/shell.c
parent09e60541aecde780c2d16d7d7e8284235247b375 (diff)
downloadsqlite-d39c40ff5e89601a242f004faa45735e80275fcb.tar.gz
sqlite-d39c40ff5e89601a242f004faa45735e80275fcb.zip
Reorder parameters on the sqlite3_user_*() interfaces for consistency.
Add the first TCL test cases. FossilOrigin-Name: 2f6d8f32eef526b5912f42ab467e3c7812480d8b
Diffstat (limited to 'src/shell.c')
-rw-r--r--src/shell.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/shell.c b/src/shell.c
index 2312a7d32..b8ab2dbe9 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -3451,31 +3451,34 @@ static int do_meta_command(char *zLine, ShellState *p){
rc = 1;
goto meta_command_exit;
}
- rc = sqlite3_user_authenticate(p->db, azArg[2], (int)strlen(azArg[3]), azArg[3]);
+ rc = sqlite3_user_authenticate(p->db, azArg[2], azArg[3],
+ (int)strlen(azArg[3]));
if( rc ){
fprintf(stderr, "Authentication failed for user %s\n", azArg[2]);
rc = 1;
}
}else if( strcmp(azArg[1],"add")==0 ){
if( nArg!=5 ){
- fprintf(stderr, "Usage: .user add USER ISADMIN PASSWORD\n");
+ fprintf(stderr, "Usage: .user add USER PASSWORD ISADMIN\n");
rc = 1;
goto meta_command_exit;
}
- rc = sqlite3_user_add(p->db, azArg[2], booleanValue(azArg[3]),
- (int)strlen(azArg[4]), azArg[4]);
+ rc = sqlite3_user_add(p->db, azArg[2],
+ azArg[3], (int)strlen(azArg[3]),
+ booleanValue(azArg[4]));
if( rc ){
fprintf(stderr, "User-Add failed: %d\n", rc);
rc = 1;
}
}else if( strcmp(azArg[1],"edit")==0 ){
if( nArg!=5 ){
- fprintf(stderr, "Usage: .user edit USER ISADMIN PASSWORD\n");
+ fprintf(stderr, "Usage: .user edit USER PASSWORD ISADMIN\n");
rc = 1;
goto meta_command_exit;
}
- rc = sqlite3_user_change(p->db, azArg[2], booleanValue(azArg[3]),
- (int)strlen(azArg[4]), azArg[4]);
+ rc = sqlite3_user_change(p->db, azArg[2],
+ azArg[3], (int)strlen(azArg[3]),
+ booleanValue(azArg[4]));
if( rc ){
fprintf(stderr, "User-Edit failed: %d\n", rc);
rc = 1;