From: shaneh <shaneh@noemail.net>
Date: Tue, 10 Nov 2009 17:07:30 +0000 (+0000)
Subject: Fix for datbase name being ignored with the -batch option in the CLI.  Ticket [aeff89... 
X-Git-Tag: fts3-refactor~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac81cd71a5c9353825d09db5bc9a49af01f14ee2;p=thirdparty%2Fsqlite.git

Fix for datbase name being ignored with the -batch option in the CLI.  Ticket [aeff892c57].

FossilOrigin-Name: 8097c64acfc74c913bc6d7d631bc1423c90df93f
---

diff --git a/manifest b/manifest
index 5b5c9ca727..2cbae61693 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Remove\sthe\sobsolete\s"$Id:$"\sRCS\sidentifier\sstrings\sfrom\sthe\ssource\scode.
-D 2009-11-10T01:30:53
+C Fix\sfor\sdatbase\sname\sbeing\signored\swith\sthe\s-batch\soption\sin\sthe\sCLI.\s\sTicket\s[aeff892c57].
+D 2009-11-10T17:07:31
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in b24a5d5f12bd6035d120c15f5e78e5d60ee4dd28
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -164,7 +161,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c aa3cb21e1ecd905c071fce8fb64d1a166cefc239
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c ecd7fb2fcb8d207dd381338377b5bacce0b38a2d
-F src/shell.c 0167e247ded3e6358a083c75f12468e6327be990
+F src/shell.c 360ed53f8672a16b0767bf59e947a9ba7bfe7e21
 F src/sqlite.h.in 4464e9772122f0447305d425e04d122b6f1bffec
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h 55d26b83d16107804693982028c8b3a075f5a836
@@ -753,7 +750,8 @@ F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
-F tool/shell1.test 71fa122a37cfd8a4de39e7b53012aae3b1511096
+F tool/shell1.test 37959b1fd1be383b945227830031710028ad6683
+F tool/shell2.test 2058b96a870048aef485223103f6059a58675f3e
 F tool/showdb.c 8ab8b3b53884312aafb7ef60982e255a6c31d238
 F tool/showjournal.c ec3b171be148656827c4949fbfb8ab4370822f87
 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
@@ -765,14 +763,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 01f2271e51751ff66061f65556a5e324f243756a
-R 56718e6d4b1d63d5a69c5734835fad31
-U drh
-Z 9b46296a371f31caf3813c1fee91cc7f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFK+MJQoxKgR168RlERAsjEAJ43LxniUPRfWb2JQ4V9offsR34KtgCfetYp
-fcOHVA2EHM4HQPen81kSKeQ=
-=zFf1
------END PGP SIGNATURE-----
+P f6c045f649036958078cb15cd9d5453680c82b0c
+R 1f800c450b12aea8b2bafa846301d578
+U shaneh
+Z 90330abd89db4a61b87a266140e2ee99
diff --git a/manifest.uuid b/manifest.uuid
index 9053ad0a04..72b465c54d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f6c045f649036958078cb15cd9d5453680c82b0c
\ No newline at end of file
+8097c64acfc74c913bc6d7d631bc1423c90df93f
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index d329c0fa88..0cc34709e2 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -3372,7 +3372,6 @@ int main(int argc, char **argv){
     ** we do the actual processing of arguments later in a second pass.
     */
     }else if( strcmp(argv[i],"-batch")==0 ){
-      i++;
       stdin_is_interactive = 0;
     }
   }
diff --git a/tool/shell1.test b/tool/shell1.test
index 33686c3943..1513fa5c93 100644
--- a/tool/shell1.test
+++ b/tool/shell1.test
@@ -16,8 +16,8 @@
 
 # Test plan:
 #
-#   shell-1.*: Basic "dot" command token parsing.
-#   shell-2.*: Basic test that "dot" command can be called.
+#   shell1-1.*: Basic "dot" command token parsing.
+#   shell1-2.*: Basic test that "dot" command can be called.
 #
 
 package require sqlite3
@@ -57,116 +57,116 @@ sqlite3 db test.db
 
 
 #----------------------------------------------------------------------------
-# Test cases shell-1.* Basic "dot" command token parsing.
+# Test cases shell1-1.* Basic "dot" command token parsing.
 #
 
 # check first token handling
-do_test shell-1.1.1 {
+do_test shell1-1.1.1 {
   catchcmd ".foo"
 } {1 {Error: unknown command or invalid arguments:  "foo". Enter ".help" for help}}
-do_test shell-1.1.2 {
+do_test shell1-1.1.2 {
   catchcmd ".\"foo OFF\""
 } {1 {Error: unknown command or invalid arguments:  "foo OFF". Enter ".help" for help}}
-do_test shell-1.1.3 {
+do_test shell1-1.1.3 {
   catchcmd ".\'foo OFF\'"
 } {1 {Error: unknown command or invalid arguments:  "foo OFF". Enter ".help" for help}}
 
 # unbalanced quotes
-do_test shell-1.2.1 {
+do_test shell1-1.2.1 {
   catchcmd ".\"foo OFF"
 } {1 {Error: unknown command or invalid arguments:  "foo OFF". Enter ".help" for help}}
-do_test shell-1.2.2 {
+do_test shell1-1.2.2 {
   catchcmd ".\'foo OFF"
 } {1 {Error: unknown command or invalid arguments:  "foo OFF". Enter ".help" for help}}
-do_test shell-1.2.3 {
+do_test shell1-1.2.3 {
   catchcmd ".explain \"OFF"
 } {0 {}}
-do_test shell-1.2.4 {
+do_test shell1-1.2.4 {
   catchcmd ".explain \'OFF"
 } {0 {}}
-do_test shell-1.2.5 {
+do_test shell1-1.2.5 {
   catchcmd ".mode \"insert FOO"
 } {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell-1.2.6 {
+do_test shell1-1.2.6 {
   catchcmd ".mode \'insert FOO"
 } {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
 
 # check multiple tokens, and quoted tokens
-do_test shell-1.3.1 {
+do_test shell1-1.3.1 {
   catchcmd ".explain 1"
 } {0 {}}
-do_test shell-1.3.2 {
+do_test shell1-1.3.2 {
   catchcmd ".explain on"
 } {0 {}}
-do_test shell-1.3.3 {
+do_test shell1-1.3.3 {
   catchcmd ".explain \"1 2 3\""
 } {0 {}}
-do_test shell-1.3.4 {
+do_test shell1-1.3.4 {
   catchcmd ".explain \"OFF\""
 } {0 {}}
-do_test shell-1.3.5 {
+do_test shell1-1.3.5 {
   catchcmd ".\'explain\' \'OFF\'"
 } {0 {}}
-do_test shell-1.3.6 {
+do_test shell1-1.3.6 {
   catchcmd ".explain \'OFF\'"
 } {0 {}}
-do_test shell-1.3.7 {
+do_test shell1-1.3.7 {
   catchcmd ".\'explain\' \'OFF\'"
 } {0 {}}
 
 # check quoted args are unquoted
-do_test shell-1.4.1 {
+do_test shell1-1.4.1 {
   catchcmd ".mode FOO"
 } {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell-1.4.2 {
+do_test shell1-1.4.2 {
   catchcmd ".mode csv"
 } {0 {}}
-do_test shell-1.4.2 {
+do_test shell1-1.4.2 {
   catchcmd ".mode \"csv\""
 } {0 {}}
 
 
 #----------------------------------------------------------------------------
-# Test cases shell-2.* Basic test that "dot" command can be called.
+# Test cases shell1-2.* Basic test that "dot" command can be called.
 #
 
 # .backup ?DB? FILE      Backup DB (default "main") to FILE
-do_test shell-2.1.1 {
+do_test shell1-2.1.1 {
   catchcmd ".backup"
 } {1 {Error: unknown command or invalid arguments:  "backup". Enter ".help" for help}}
-do_test shell-2.1.2 {
+do_test shell1-2.1.2 {
   # catchcmd ".backup FOO"
   #TBD!!! this asserts currently
 } {}
-do_test shell-2.1.3 {
+do_test shell1-2.1.3 {
   catchcmd ".backup FOO BAR"
 } {1 {Error: unknown database FOO}}
-do_test shell-2.1.4 {
+do_test shell1-2.1.4 {
   # too many arguments
   catchcmd ".backup FOO BAR BAD"
 } {1 {Error: unknown command or invalid arguments:  "backup". Enter ".help" for help}}
 
 # .bail ON|OFF           Stop after hitting an error.  Default OFF
-do_test shell-2.2.1 {
+do_test shell1-2.2.1 {
   catchcmd ".bail"
 } {1 {Error: unknown command or invalid arguments:  "bail". Enter ".help" for help}}
-do_test shell-2.2.2 {
+do_test shell1-2.2.2 {
   catchcmd ".bail ON"
 } {0 {}}
-do_test shell-2.2.3 {
+do_test shell1-2.2.3 {
   catchcmd ".bail OFF"
 } {0 {}}
-do_test shell-2.2.4 {
+do_test shell1-2.2.4 {
   # too many arguments
   catchcmd ".bail OFF BAD"
 } {1 {Error: unknown command or invalid arguments:  "bail". Enter ".help" for help}}
 
 # .databases             List names and files of attached databases
-do_test shell-2.3.1 {
+do_test shell1-2.3.1 {
   set res [catchcmd ".databases"]
   regexp {0.*main.*test\.db} $res
 } {1}
-do_test shell-2.3.2 {
+do_test shell1-2.3.2 {
   # too many arguments
   catchcmd ".databases BAD"
 } {1 {Error: unknown command or invalid arguments:  "databases". Enter ".help" for help}}
@@ -174,57 +174,57 @@ do_test shell-2.3.2 {
 # .dump ?TABLE? ...      Dump the database in an SQL text format
 #                          If TABLE specified, only dump tables matching
 #                          LIKE pattern TABLE.
-do_test shell-2.4.1 {
+do_test shell1-2.4.1 {
   set res [catchcmd ".dump"]
   list [regexp {BEGIN TRANSACTION;} $res] \
        [regexp {COMMIT;} $res]
 } {1 1}
-do_test shell-2.4.2 {
+do_test shell1-2.4.2 {
   set res [catchcmd ".dump FOO"]
   list [regexp {BEGIN TRANSACTION;} $res] \
        [regexp {COMMIT;} $res]
 } {1 1}
-do_test shell-2.4.3 {
+do_test shell1-2.4.3 {
   # too many arguments
   catchcmd ".dump FOO BAD"
 } {1 {Error: unknown command or invalid arguments:  "dump". Enter ".help" for help}}
 
 # .echo ON|OFF           Turn command echo on or off
-do_test shell-2.5.1 {
+do_test shell1-2.5.1 {
   catchcmd ".echo"
 } {1 {Error: unknown command or invalid arguments:  "echo". Enter ".help" for help}}
-do_test shell-2.5.2 {
+do_test shell1-2.5.2 {
   catchcmd ".echo ON"
 } {0 {}}
-do_test shell-2.5.3 {
+do_test shell1-2.5.3 {
   catchcmd ".echo OFF"
 } {0 {}}
-do_test shell-2.5.4 {
+do_test shell1-2.5.4 {
   # too many arguments
   catchcmd ".echo OFF BAD"
 } {1 {Error: unknown command or invalid arguments:  "echo". Enter ".help" for help}}
 
 # .exit                  Exit this program
-do_test shell-2.6.1 {
+do_test shell1-2.6.1 {
   catchcmd ".exit"
 } {0 {}}
-do_test shell-2.6.2 {
+do_test shell1-2.6.2 {
   # too many arguments
   catchcmd ".exit BAD"
 } {1 {Error: unknown command or invalid arguments:  "exit". Enter ".help" for help}}
 
 # .explain ON|OFF        Turn output mode suitable for EXPLAIN on or off.
-do_test shell-2.7.1 {
+do_test shell1-2.7.1 {
   catchcmd ".explain"
   # explain is the exception to the booleans.  without an option, it turns it on.
 } {0 {}}
-do_test shell-2.7.2 {
+do_test shell1-2.7.2 {
   catchcmd ".explain ON"
 } {0 {}}
-do_test shell-2.7.3 {
+do_test shell1-2.7.3 {
   catchcmd ".explain OFF"
 } {0 {}}
-do_test shell-2.7.4 {
+do_test shell1-2.7.4 {
   # too many arguments
   catchcmd ".explain OFF BAD"
 } {1 {Error: unknown command or invalid arguments:  "explain". Enter ".help" for help}}
@@ -235,51 +235,51 @@ do_test shell-2.7.4 {
 #                          --exec: Execute generated SQL immediately
 #                        See file tool/genfkey.README in the source
 #                        distribution for further information.
-do_test shell-2.8.1 {
+do_test shell1-2.8.1 {
   catchcmd ".genfkey"
 } {0 {}}
-do_test shell-2.8.2 {
+do_test shell1-2.8.2 {
   catchcmd ".genfkey FOO"
 } {1 {unknown option: FOO}}
 
 # .header(s) ON|OFF      Turn display of headers on or off
-do_test shell-2.9.1 {
+do_test shell1-2.9.1 {
   catchcmd ".header"
 } {1 {Error: unknown command or invalid arguments:  "header". Enter ".help" for help}}
-do_test shell-2.9.2 {
+do_test shell1-2.9.2 {
   catchcmd ".header ON"
 } {0 {}}
-do_test shell-2.9.3 {
+do_test shell1-2.9.3 {
   catchcmd ".header OFF"
 } {0 {}}
-do_test shell-2.9.4 {
+do_test shell1-2.9.4 {
   # too many arguments
   catchcmd ".header OFF BAD"
 } {1 {Error: unknown command or invalid arguments:  "header". Enter ".help" for help}}
 
-do_test shell-2.9.5 {
+do_test shell1-2.9.5 {
   catchcmd ".headers"
 } {1 {Error: unknown command or invalid arguments:  "headers". Enter ".help" for help}}
-do_test shell-2.9.6 {
+do_test shell1-2.9.6 {
   catchcmd ".headers ON"
 } {0 {}}
-do_test shell-2.9.7 {
+do_test shell1-2.9.7 {
   catchcmd ".headers OFF"
 } {0 {}}
-do_test shell-2.9.8 {
+do_test shell1-2.9.8 {
   # too many arguments
   catchcmd ".headers OFF BAD"
 } {1 {Error: unknown command or invalid arguments:  "headers". Enter ".help" for help}}
 
 # .help                  Show this message
-do_test shell-2.10.1 {
+do_test shell1-2.10.1 {
   set res [catchcmd ".help"]
   # look for a few of the possible help commands
   list [regexp {.help} $res] \
        [regexp {.quit} $res] \
        [regexp {.show} $res]
 } {1 1 1}
-do_test shell-2.10.2 {
+do_test shell1-2.10.2 {
   # we allow .help to take extra args (it is help after all)
   set res [catchcmd ".help BAD"]
   # look for a few of the possible help commands
@@ -289,16 +289,16 @@ do_test shell-2.10.2 {
 } {1 1 1}
 
 # .import FILE TABLE     Import data from FILE into TABLE
-do_test shell-2.11.1 {
+do_test shell1-2.11.1 {
   catchcmd ".import"
 } {1 {Error: unknown command or invalid arguments:  "import". Enter ".help" for help}}
-do_test shell-2.11.2 {
+do_test shell1-2.11.2 {
   catchcmd ".import FOO"
 } {1 {Error: unknown command or invalid arguments:  "import". Enter ".help" for help}}
-do_test shell-2.11.2 {
+do_test shell1-2.11.2 {
   catchcmd ".import FOO BAR"
 } {1 {Error: no such table: BAR}}
-do_test shell-2.11.3 {
+do_test shell1-2.11.3 {
   # too many arguments
   catchcmd ".import FOO BAR BAD"
 } {1 {Error: unknown command or invalid arguments:  "import". Enter ".help" for help}}
@@ -306,13 +306,13 @@ do_test shell-2.11.3 {
 # .indices ?TABLE?       Show names of all indices
 #                          If TABLE specified, only show indices for tables
 #                          matching LIKE pattern TABLE.
-do_test shell-2.12.1 {
+do_test shell1-2.12.1 {
   catchcmd ".indices"
 } {0 {}}
-do_test shell-2.12.2 {
+do_test shell1-2.12.2 {
   catchcmd ".indices FOO"
 } {0 {}}
-do_test shell-2.12.3 {
+do_test shell1-2.12.3 {
   # too many arguments
   catchcmd ".indices FOO BAD"
 } {1 {Error: unknown command or invalid arguments:  "indices". Enter ".help" for help}}
@@ -326,134 +326,134 @@ do_test shell-2.12.3 {
 #                          list     Values delimited by .separator string
 #                          tabs     Tab-separated values
 #                          tcl      TCL list elements
-do_test shell-2.13.1 {
+do_test shell1-2.13.1 {
   catchcmd ".mode"
 } {1 {Error: unknown command or invalid arguments:  "mode". Enter ".help" for help}}
-do_test shell-2.13.2 {
+do_test shell1-2.13.2 {
   catchcmd ".mode FOO"
 } {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell-2.13.3 {
+do_test shell1-2.13.3 {
   catchcmd ".mode csv"
 } {0 {}}
-do_test shell-2.13.4 {
+do_test shell1-2.13.4 {
   catchcmd ".mode column"
 } {0 {}}
-do_test shell-2.13.5 {
+do_test shell1-2.13.5 {
   catchcmd ".mode html"
 } {0 {}}
-do_test shell-2.13.6 {
+do_test shell1-2.13.6 {
   catchcmd ".mode insert"
 } {0 {}}
-do_test shell-2.13.7 {
+do_test shell1-2.13.7 {
   catchcmd ".mode line"
 } {0 {}}
-do_test shell-2.13.8 {
+do_test shell1-2.13.8 {
   catchcmd ".mode list"
 } {0 {}}
-do_test shell-2.13.9 {
+do_test shell1-2.13.9 {
   catchcmd ".mode tabs"
 } {0 {}}
-do_test shell-2.13.10 {
+do_test shell1-2.13.10 {
   catchcmd ".mode tcl"
 } {0 {}}
-do_test shell-2.13.11 {
+do_test shell1-2.13.11 {
   # too many arguments
   catchcmd ".mode tcl BAD"
 } {1 {Error: invalid arguments:  "BAD". Enter ".help" for help}}
 
 # don't allow partial mode type matches
-do_test shell-2.13.12 {
+do_test shell1-2.13.12 {
   catchcmd ".mode l"
 } {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell-2.13.13 {
+do_test shell1-2.13.13 {
   catchcmd ".mode li"
 } {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell-2.13.14 {
+do_test shell1-2.13.14 {
   catchcmd ".mode lin"
 } {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
 
 # .nullvalue STRING      Print STRING in place of NULL values
-do_test shell-2.14.1 {
+do_test shell1-2.14.1 {
   catchcmd ".nullvalue"
 } {1 {Error: unknown command or invalid arguments:  "nullvalue". Enter ".help" for help}}
-do_test shell-2.14.2 {
+do_test shell1-2.14.2 {
   catchcmd ".nullvalue FOO"
 } {0 {}}
-do_test shell-2.14.3 {
+do_test shell1-2.14.3 {
   # too many arguments
   catchcmd ".nullvalue FOO BAD"
 } {1 {Error: unknown command or invalid arguments:  "nullvalue". Enter ".help" for help}}
 
 # .output FILENAME       Send output to FILENAME
-do_test shell-2.15.1 {
+do_test shell1-2.15.1 {
   catchcmd ".output"
 } {1 {Error: unknown command or invalid arguments:  "output". Enter ".help" for help}}
-do_test shell-2.15.2 {
+do_test shell1-2.15.2 {
   catchcmd ".output FOO"
 } {0 {}}
-do_test shell-2.15.3 {
+do_test shell1-2.15.3 {
   # too many arguments
   catchcmd ".output FOO BAD"
 } {1 {Error: unknown command or invalid arguments:  "output". Enter ".help" for help}}
 
 # .output stdout         Send output to the screen
-do_test shell-2.16.1 {
+do_test shell1-2.16.1 {
   catchcmd ".output stdout"
 } {0 {}}
-do_test shell-2.16.2 {
+do_test shell1-2.16.2 {
   # too many arguments
   catchcmd ".output stdout BAD"
 } {1 {Error: unknown command or invalid arguments:  "output". Enter ".help" for help}}
 
 # .prompt MAIN CONTINUE  Replace the standard prompts
-do_test shell-2.17.1 {
+do_test shell1-2.17.1 {
   catchcmd ".prompt"
 } {1 {Error: unknown command or invalid arguments:  "prompt". Enter ".help" for help}}
-do_test shell-2.17.2 {
+do_test shell1-2.17.2 {
   catchcmd ".prompt FOO"
 } {0 {}}
-do_test shell-2.17.3 {
+do_test shell1-2.17.3 {
   catchcmd ".prompt FOO BAR"
 } {0 {}}
-do_test shell-2.17.4 {
+do_test shell1-2.17.4 {
   # too many arguments
   catchcmd ".prompt FOO BAR BAD"
 } {1 {Error: unknown command or invalid arguments:  "prompt". Enter ".help" for help}}
 
 # .quit                  Exit this program
-do_test shell-2.18.1 {
+do_test shell1-2.18.1 {
   catchcmd ".quit"
 } {0 {}}
-do_test shell-2.18.2 {
+do_test shell1-2.18.2 {
   # too many arguments
   catchcmd ".quit BAD"
 } {1 {Error: unknown command or invalid arguments:  "quit". Enter ".help" for help}}
 
 # .read FILENAME         Execute SQL in FILENAME
-do_test shell-2.19.1 {
+do_test shell1-2.19.1 {
   catchcmd ".read"
 } {1 {Error: unknown command or invalid arguments:  "read". Enter ".help" for help}}
-do_test shell-2.19.2 {
+do_test shell1-2.19.2 {
   file delete -force FOO
   catchcmd ".read FOO"
 } {1 {Error: cannot open "FOO"}}
-do_test shell-2.19.3 {
+do_test shell1-2.19.3 {
   # too many arguments
   catchcmd ".read FOO BAD"
 } {1 {Error: unknown command or invalid arguments:  "read". Enter ".help" for help}}
 
 # .restore ?DB? FILE     Restore content of DB (default "main") from FILE
-do_test shell-2.20.1 {
+do_test shell1-2.20.1 {
   catchcmd ".restore"
 } {1 {Error: unknown command or invalid arguments:  "restore". Enter ".help" for help}}
-do_test shell-2.20.2 {
+do_test shell1-2.20.2 {
   # catchcmd ".restore FOO"
   #TBD!!! this asserts currently
 } {}
-do_test shell-2.20.3 {
+do_test shell1-2.20.3 {
   catchcmd ".restore FOO BAR"
 } {1 {Error: unknown database FOO}}
-do_test shell-2.20.4 {
+do_test shell1-2.20.4 {
   # too many arguments
   catchcmd ".restore FOO BAR BAD"
 } {1 {Error: unknown command or invalid arguments:  "restore". Enter ".help" for help}}
@@ -461,31 +461,31 @@ do_test shell-2.20.4 {
 # .schema ?TABLE?        Show the CREATE statements
 #                          If TABLE specified, only show tables matching
 #                          LIKE pattern TABLE.
-do_test shell-2.21.1 {
+do_test shell1-2.21.1 {
   catchcmd ".schema"
 } {0 {}}
-do_test shell-2.21.2 {
+do_test shell1-2.21.2 {
   catchcmd ".schema FOO"
 } {0 {}}
-do_test shell-2.21.3 {
+do_test shell1-2.21.3 {
   # too many arguments
   catchcmd ".schema FOO BAD"
 } {1 {Error: unknown command or invalid arguments:  "schema". Enter ".help" for help}}
 
 # .separator STRING      Change separator used by output mode and .import
-do_test shell-2.22.1 {
+do_test shell1-2.22.1 {
   catchcmd ".separator"
 } {1 {Error: unknown command or invalid arguments:  "separator". Enter ".help" for help}}
-do_test shell-2.22.2 {
+do_test shell1-2.22.2 {
   catchcmd ".separator FOO"
 } {0 {}}
-do_test shell-2.22.3 {
+do_test shell1-2.22.3 {
   # too many arguments
   catchcmd ".separator FOO BAD"
 } {1 {Error: unknown command or invalid arguments:  "separator". Enter ".help" for help}}
 
 # .show                  Show the current values for various settings
-do_test shell-2.23.1 {
+do_test shell1-2.23.1 {
   set res [catchcmd ".show"]
   list [regexp {echo:} $res] \
        [regexp {explain:} $res] \
@@ -496,7 +496,7 @@ do_test shell-2.23.1 {
        [regexp {separator:} $res] \
        [regexp {width:} $res]
 } {1 1 1 1 1 1 1 1}
-do_test shell-2.23.2 {
+do_test shell1-2.23.2 {
   # too many arguments
   catchcmd ".show BAD"
 } {1 {Error: unknown command or invalid arguments:  "show". Enter ".help" for help}}
@@ -504,61 +504,61 @@ do_test shell-2.23.2 {
 # .tables ?TABLE?        List names of tables
 #                          If TABLE specified, only list tables matching
 #                          LIKE pattern TABLE.
-do_test shell-2.24.1 {
+do_test shell1-2.24.1 {
   catchcmd ".tables"
 } {0 {}}
-do_test shell-2.24.2 {
+do_test shell1-2.24.2 {
   catchcmd ".tables FOO"
 } {0 {}}
-do_test shell-2.24.3 {
+do_test shell1-2.24.3 {
   # too many arguments
   catchcmd ".tables FOO BAD"
 } {1 {Error: unknown command or invalid arguments:  "tables". Enter ".help" for help}}
 
 # .timeout MS            Try opening locked tables for MS milliseconds
-do_test shell-2.25.1 {
+do_test shell1-2.25.1 {
   catchcmd ".timeout"
 } {1 {Error: unknown command or invalid arguments:  "timeout". Enter ".help" for help}}
-do_test shell-2.25.2 {
+do_test shell1-2.25.2 {
   catchcmd ".timeout zzz"
   # this should be treated the same as a '0' timeout
 } {0 {}}
-do_test shell-2.25.3 {
+do_test shell1-2.25.3 {
   catchcmd ".timeout 1"
 } {0 {}}
-do_test shell-2.25.4 {
+do_test shell1-2.25.4 {
   # too many arguments
   catchcmd ".timeout 1 BAD"
 } {1 {Error: unknown command or invalid arguments:  "timeout". Enter ".help" for help}}
 
 # .width NUM NUM ...     Set column widths for "column" mode
-do_test shell-2.26.1 {
+do_test shell1-2.26.1 {
   catchcmd ".width"
 } {1 {Error: unknown command or invalid arguments:  "width". Enter ".help" for help}}
-do_test shell-2.26.2 {
+do_test shell1-2.26.2 {
   catchcmd ".width xxx"
   # this should be treated the same as a '0' width for col 1
 } {0 {}}
-do_test shell-2.26.3 {
+do_test shell1-2.26.3 {
   catchcmd ".width xxx yyy"
   # this should be treated the same as a '0' width for col 1 and 2
 } {0 {}}
-do_test shell-2.26.4 {
+do_test shell1-2.26.4 {
   catchcmd ".width 1 1"
   # this should be treated the same as a '1' width for col 1 and 2
 } {0 {}}
 
 # .timer ON|OFF          Turn the CPU timer measurement on or off
-do_test shell-2.27.1 {
+do_test shell1-2.27.1 {
   catchcmd ".timer"
 } {1 {Error: unknown command or invalid arguments:  "timer". Enter ".help" for help}}
-do_test shell-2.27.2 {
+do_test shell1-2.27.2 {
   catchcmd ".timer ON"
 } {0 {}}
-do_test shell-2.27.3 {
+do_test shell1-2.27.3 {
   catchcmd ".timer OFF"
 } {0 {}}
-do_test shell-2.27.4 {
+do_test shell1-2.27.4 {
   # too many arguments
   catchcmd ".timer OFF BAD"
 } {1 {Error: unknown command or invalid arguments:  "timer". Enter ".help" for help}}
diff --git a/tool/shell2.test b/tool/shell2.test
new file mode 100644
index 0000000000..df638f1a40
--- /dev/null
+++ b/tool/shell2.test
@@ -0,0 +1,71 @@
+# 2009 Nov 11
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# The focus of this file is testing the CLI shell tool.
+#
+# $Id: shell2.test,v 1.7 2009/07/17 16:54:48 shaneh Exp $
+#
+
+# Test plan:
+#
+#   shell2-1.*: Misc. test of various tickets and reported errors.
+#
+
+package require sqlite3
+
+proc do_test {name cmd expected} {
+  puts -nonewline "$name ..."
+  set res [uplevel $cmd]
+  if {$res eq $expected} {
+    puts Ok
+  } else {
+    puts Error
+    puts "  Got: $res"
+    puts "  Expected: $expected"
+    exit
+  }
+}
+
+proc execsql {sql} {
+  uplevel [list db eval $sql]
+}
+
+proc catchsql {sql} {
+  set rc [catch {uplevel [list db eval $sql]} msg]
+  list $rc $msg
+}
+
+proc catchcmd {options db cmd} {
+  set out [open cmds.txt w]
+  puts $out $cmd
+  close $out
+  set rc [catch { exec ./sqlite $options $db < cmds.txt } msg]
+  list $rc $msg
+}
+
+file delete -force test.db test.db.journal
+sqlite3 db test.db
+
+
+#----------------------------------------------------------------------------
+#   shell2-1.*: Misc. test of various tickets and reported errors.
+#
+
+# Batch mode not creating databases.  
+# Reported on mailing list by Ken Zalewski <kennyz@nycap.rr.com>.
+# Ticket [aeff892c57].
+do_test shell2-1.1.1 {
+  file delete -force foo.db
+  set rc [ catchcmd "-batch" "foo.db" "CREATE TABLE t1(a);" ]
+  set fexist [file exist foo.db]
+  list $rc $fexist
+} {{0 {}} 1}
+