Fix a bug in error handling in the ".trace" command of the command-line shell.

FossilOrigin-Name: 6a48b5d794e891fdd167547c76835d677eb5e31d

diff --git a/manifest b/manifest
index ca434d481ce0aea82589919fa58fdfe1693c7b53..38d28bca9b96d72e035e17cec88a183c6eccbccc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sanother\ssqlite3FaultSim()\sto\sthe\smulti-threaded\ssorter\slogic\sto\nimprove\stestability.
-D 2015-03-18T16:00:44.998
+C Fix\sa\sbug\sin\serror\shandling\sin\sthe\s".trace"\scommand\sof\sthe\scommand-line\sshell.
+D 2015-03-19T13:30:41.360
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -231,7 +231,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907
-F src/shell.c cce82ca26392578a4a1ee927dfe55ea3411c7c92
+F src/shell.c 3e8fc22bc1cd63fe595c84a880bd6184deb6c87b
 F src/sqlite.h.in 2d48e05677d0f9b06b7757662eef3cebea02d837
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
@@ -866,7 +866,7 @@ F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
 F test/shell1.test ca88b14a8fc8b1f3543a24e519d019585ac9c903
 F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
 F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
-F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
+F test/shell4.test 4cd3bd50200bf2efd6a74175d98da65aa86daf26
 F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
@@ -1246,7 +1246,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 2c0e0d87fb418d684fba1c83d9fd8e4e96588c54
-R 58ae90a14e230c20fd6999f0bc3305de
+P 49ea2cded4a76596f85419c820cdaf4a1751d7ac
+R df8b9299e9511ef4e1117da2a3444343
 U drh
-Z 224b0621dbed3257af56f4d91f4f2bf9
+Z 8cda5daec6a5d1c3721d0a7774b9a78e

diff --git a/manifest.uuid b/manifest.uuid
index cc37f4c412b46c5d69dc45d4a50f979ee333a1a3..52200038fddb7151f2e0addd9603c8c649822470 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-49ea2cded4a76596f85419c820cdaf4a1751d7ac
\ No newline at end of file
+6a48b5d794e891fdd167547c76835d677eb5e31d
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index cf2481a37c0a9147bc8a1b28f6fcbe4de91f37a4..436c23d47b63a065891a2a53c6043be715329011 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -3841,12 +3841,12 @@ static int do_meta_command(char *zLine, ShellState *p){
   
   if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
     open_db(p, 0);
-    output_file_close(p->traceOut);
     if( nArg!=2 ){
       fprintf(stderr, "Usage: .trace FILE|off\n");
       rc = 1;
       goto meta_command_exit;
     }
+    output_file_close(p->traceOut);
     p->traceOut = output_file_open(azArg[1]);
 #if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
     if( p->traceOut==0 ){

diff --git a/test/shell4.test b/test/shell4.test
index c29faf00cfa18c085bdb862caa7d5693c4508cdb..d1466f638ca9552bd697ef3013932bf0e3e3c220 100644 (file)
--- a/test/shell4.test
+++ b/test/shell4.test
@@ -12,12 +12,12 @@
 # The focus of this file is testing the CLI shell tool.
 # These tests are specific to the .stats command.
 #
-# $Id: shell4.test,v 1.7 2009/07/17 16:54:48 shaneh Exp $
-#
+# 2015-03-19:  Added tests for .trace
 
 # Test plan:
 #
 #   shell4-1.*: Basic tests specific to the "stats" command.
+#   shell4-2.*: Basic tests for ".trace"
 #
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -113,4 +113,22 @@ SELECT 1;
        [regexp {Autoindex Inserts} $res]
 } {1 1 1}
 
+do_test shell4-2.1 {
+  catchcmd ":memory:" "CREATE TABLE t1(x);\n.trace"
+} {1 {Usage: .trace FILE|off}}
+do_test shell4-2.2 {
+  catchcmd ":memory:" "CREATE TABLE t1(x);\n.trace off\n.trace off\n"
+} {0 {}}
+do_test shell4-2.3 {
+  catchcmd ":memory:" ".trace stdout\n.trace\n.trace off\n.dump\n"
+} {/^1 {PRAGMA.*Usage:.*}$/}
+do_test shell4-2.4 {
+  catchcmd ":memory:" ".trace stdout\nCREATE TABLE t1(x);SELECT * FROM t1;"
+} {0 {CREATE TABLE t1(x);
+SELECT * FROM t1;}}
+do_test shell4-2.5 {
+  catchcmd ":memory:" "CREATE TABLE t1(x);\n.trace stdout\nSELECT * FROM t1;"
+} {0 {SELECT * FROM t1;}}
+
+
 finish_test