database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2026-01-06 08:01:16 +03:00
Code Activity

Remove the ill-designed "-end" option from the command-line shell. Instead,

Browse Source 
allow multiple SQL or dot-commands as command-line arguments.  Any -cmd
commands are processed first, followed by other command-line arguments, for
backwards compatibility.

FossilOrigin-Name: 24fa2e9832daaa5d68ee28a00c56c55f97a4da9e
This commit is contained in:
drh
2014-11-28 13:35:03 +00:00
parent cb7fe0ab9c
commit ac5649a985
5 changed files with 77 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/shell1.test
View File

@@ -45,20 +45,21 @@ do_test shell1-1.1.1 {
list $rc \
[regexp {Error: unknown option: -bad} $res]
} {1 1}
do_test shell1-1.1.1b {
set res [catchcmd "test.db -bad" ""]
set rc [lindex $res 0]
list $rc \
[regexp {Error: unknown option: -bad} $res]
} {1 1}
# error on extra options
do_test shell1-1.1.2 {
set res [catchcmd "-bad test.db \"select 3\" \"select 4\"" ""]
set rc [lindex $res 0]
list $rc \
[regexp {Error: too many options: "select 4"} $res]
} {1 1}
catchcmd "test.db \"select 3\" \"select 4\"" ""
} {0 {3
4}}
# error on extra options
do_test shell1-1.1.3 {
set res [catchcmd "-bad FOO test.db BAD" ".quit"]
set rc [lindex $res 0]
list $rc \
[regexp {Error: too many options: "BAD"} $res]
} {1 1}
catchcmd "test.db FOO test.db BAD" ".quit"
} {1 {Error: near "FOO": syntax error}}
# -help
do_test shell1-1.2.1 {
@@ -75,11 +76,11 @@ do_test shell1-1.3.1 {
catchcmd "-init FOO test.db" ""
} {0 {}}
do_test shell1-1.3.2 {
set res [catchcmd "-init FOO test.db .quit BAD" ""]
set rc [lindex $res 0]
list $rc \
[regexp {Error: too many options: "BAD"} $res]
} {1 1}
catchcmd "-init FOO test.db .quit BAD" ""
} {0 {}}
do_test shell1-1.3.3 {
catchcmd "-init FOO test.db BAD .quit" ""
} {1 {Error: near "BAD": syntax error}}
# -echo print commands before execution
do_test shell1-1.4.1 {