]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Updates to the command-line shell. Simplify the banner message. Add the
authordrh <drh@noemail.net>
Tue, 11 Feb 2014 16:22:18 +0000 (16:22 +0000)
committerdrh <drh@noemail.net>
Tue, 11 Feb 2014 16:22:18 +0000 (16:22 +0000)
".save" command as an alias for ".backup".  When starting with no arguments,
include a banner message warning that the database is transient and in-memory
and mention the ".open" command.

FossilOrigin-Name: f5ad1e1bf2828c5da70c1ff944d8212036142e6f

1  2 
manifest
manifest.uuid
src/shell.c
test/shell1.test

diff --cc manifest
index fc78ad919ee8d1f2747a2fbc8e473e6bba19fd6b,cf02950ed8104bb3e79b94e3f2c0cc23f9a3dd51..72514dd434f42ebeeed671e885418074e0a1f288
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fixes\sto\sthe\s"editline"\ssupport\sin\sthe\scommand-line\sshell.
- D 2014-02-11T14:37:51.706
 -C Add\sthe\s".save"\scommand\sas\san\salias\sfor\s".backup".\s\sImprovements\sto\sthe\nway\sfont\schanges\sare\simplemented\son\sthe\sin-memory\sdatabase\swarning.
 -D 2014-02-10T19:59:27.437
++C Updates\sto\sthe\scommand-line\sshell.\s\sSimplify\sthe\sbanner\smessage.\s\sAdd\sthe\n".save"\scommand\sas\san\salias\sfor\s".backup".\s\sWhen\sstarting\swith\sno\sarguments,\ninclude\sa\sbanner\smessage\swarning\sthat\sthe\sdatabase\sis\stransient\sand\sin-memory\nand\smention\sthe\s".open"\scommand.
++D 2014-02-11T16:22:18.453
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -219,8 -219,8 +219,8 @@@ F src/printf.c 85d07756e45d7496d19439dc
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 -F src/select.c c055a9fa25a4e7fc8c1652c44a31d6382dbb1e8a
 -F src/shell.c cb8d19594483d23d6e35244bb043cf0cd1816a52
 +F src/select.c 50961f0d0ab8f2d45ff29ec5f91d8db221330ca7
- F src/shell.c b1f75cfcd05b7921d74361f1cb9c01b9ca0b13df
++F src/shell.c 3dd86bf73ccd079f0e32ef5069600586085e8239
  F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@@ -803,7 -803,7 +803,7 @@@ F test/shared9.test 5f2a8f79b4d6c7d107a
  F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
  F test/shared_err.test 0079c05c97d88cfa03989b7c20a8b266983087aa
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
--F test/shell1.test e7c0b9ebda25d5e78f0a3ea0dc4e31bb6d8098c0
++F test/shell1.test f2a1d471e5cd2b42f7a65b166dc1ace2b8d11583
  F test/shell2.test c57da3a381c099b02c813ba156298d5c2f5c93a3
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
  F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9
@@@ -1153,7 -1152,7 +1153,7 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P c950d6c4117d076f871518e738cdf9e8c46a19fc
- R c9ba63de227fe5f3c297f7ef3cdd12e1
 -P c9eba2f7be468ae7fc843ffd5b09bd062ee311c3
 -R 5e3b4e27dbbde8802d4b99c9e620e482
++P 7989ce5f105657060a39be295255da8eff9ed56e fe284afe739c497e153ac2bc0275f7c9e862c824
++R 6488d4d20aaa0785dbe5d9952b0b36b8
  U drh
- Z ef37a62508215b02b96d545bd9d80c32
 -Z be8b5d9bf50fdc639aa9aecf25f98639
++Z d484b7c22506286af852445c160c123b
diff --cc manifest.uuid
index 364e642e70fa35382a04aca913bfff522e5a5026,ae460c306734e693ee41cf4eac394bb2b206ef99..eacd85a75dd58641a8778801b70489ea12442854
@@@ -1,1 -1,1 +1,1 @@@
- 7989ce5f105657060a39be295255da8eff9ed56e
 -fe284afe739c497e153ac2bc0275f7c9e862c824
++f5ad1e1bf2828c5da70c1ff944d8212036142e6f
diff --cc src/shell.c
Simple merge
index 2e936a0b53e8142db19d72884a878a720ef263f6,2e936a0b53e8142db19d72884a878a720ef263f6..6ea4f4a82c498304576b56b08d14b8b1044d47e4
@@@ -105,7 -105,7 +105,7 @@@ do_test shell1-1.7.1 
    set rc [lindex $res 0]
    list $rc \
         [regexp {SQLite version} $res] \
--       [regexp {Enter SQL statements} $res]
++       [regexp {Enter ".help" for usage hints} $res]
  } {0 1 1}
  
  # -batch               force batch I/O