:-) (CVS 174)

FossilOrigin-Name: 5ddeeb477148295b66fdd78d102827386852fed3
This commit is contained in:
drh 2001-01-04 14:27:07 +00:00
parent 4b2d64a9c9
commit 660f68d6a2
4 changed files with 17 additions and 10 deletions

View File

@ -1,5 +1,5 @@
C :-)\s(CVS\s173)
D 2001-01-04T14:20:19
C :-)\s(CVS\s174)
D 2001-01-04T14:27:08
F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
F Makefile.in 0b1fdafa55e1bf4d3a4f5213544130e66ef32052
F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@ -19,7 +19,7 @@ F src/main.c 52355458131977c1ac40a006ce2fe2035f39069c
F src/parse.y 25ee4d8efccc4b247c32fe4ab194e3dd8fd5a4ee
F src/printf.c 1efb6b3e7f28a93be57132de3f8f400d2ac1460e
F src/select.c c1de8ac34131324fa05664b06b0ae1ee9c02905d
F src/shell.c 2188df591ee3f927926c3ed6ea580afbc075ed4a
F src/shell.c 441e20913cde0bb71281f4027623c623530241cd
F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
F src/sqlite.h.in fd86903777f1ee7bd0465243224a0fd2100eedc8
F src/sqliteInt.h ed06214fc7054e43182ac351ebde913ede708639
@ -66,7 +66,7 @@ F www/arch.fig 4f246003b7da23bd63b8b0af0618afb4ee3055c8
F www/arch.png 8dae0766d42ed3de9ed013c1341a5792bcf633e6
F www/arch.tcl a40380c1fe0080c43e6cc5c20ed70731511b06be
F www/c_interface.tcl 11be2d5826eb7d6efd629751d3b483c1ed78ba14
F www/changes.tcl 3f3bec840da66e09b1d5fb6bc8cb147d42ad3dd9
F www/changes.tcl cb276a239c98524731e2780c70deb01b2e7e4bcc
F www/crosscompile.tcl bee79c34f6c3f162ec1c6f5294e79f73651d27ee
F www/fileformat.tcl cfb7fba80b7275555281ba2f256c00734bcdd1c9
F www/index.tcl b19418d506f90968deef972bf1b427d98bdf13e0
@ -76,7 +76,7 @@ F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
F www/sqlite.tcl cb0d23d8f061a80543928755ec7775da6e4f362f
F www/tclsqlite.tcl 06f81c401f79a04f2c5ebfb97e7c176225c0aef2
F www/vdbe.tcl 0c8aaa529dd216ccbf7daaabd80985e413d5f9ad
P 64900e42cdb92b44e0fb3a17f0b94fc62ce733d5
R 2eedb8bda15944e62f7849d4e33eb1da
P e54b0c5ea845111d09529b57b2372ea2e797651a
R bf70551a041afaf128f504c8472d7ba7
U drh
Z 0e21f52b278a1c09e1c89c23c6e8d92c
Z a57420901be93f1de72fd52a3f4e2890

View File

@ -1 +1 @@
e54b0c5ea845111d09529b57b2372ea2e797651a
5ddeeb477148295b66fdd78d102827386852fed3

View File

@ -24,7 +24,7 @@
** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases.
**
** $Id: shell.c,v 1.28 2001/01/04 14:20:18 drh Exp $
** $Id: shell.c,v 1.29 2001/01/04 14:27:08 drh Exp $
*/
#include <stdlib.h>
#include <string.h>
@ -688,6 +688,7 @@ int main(int argc, char **argv){
char *zErrMsg = 0;
char *argv0 = argv[0];
struct callback_data data;
int echo = 0;
memset(&data, 0, sizeof(data));
data.mode = MODE_List;
@ -721,6 +722,10 @@ int main(int argc, char **argv){
data.showHeader = 0;
argc--;
argv++;
}else if( strcmp(argv[1],"-echo")==0 ){
echo = 1;
argc--;
argv++;
}else{
fprintf(stderr,"%s: unknown option: %s\n", argv0, argv[1]);
return 1;
@ -763,6 +768,7 @@ int main(int argc, char **argv){
);
}
while( (zLine = one_input_line(zSql, istty))!=0 ){
if( echo ) printf("%s\n", zLine);
if( zLine && zLine[0]=='.' ){
do_meta_command(zLine, db, &data);
free(zLine);
@ -792,7 +798,7 @@ int main(int argc, char **argv){
data.cnt = 0;
if( sqlite_exec(db, zSql, callback, &data, &zErrMsg)!=0
&& zErrMsg!=0 ){
if( !istty ) printf("%s\n",zSql);
if( !istty && !echo ) printf("%s\n",zSql);
printf("SQL error: %s\n", zErrMsg);
free(zErrMsg);
zErrMsg = 0;

View File

@ -20,6 +20,7 @@ proc chng {date desc} {
chng {2001 Jan 4 (1.0.18)} {
<li>Print the offending SQL statement when an error occurs.</li>
<li>Do not require commas between constraints in CREATE TABLE statements.</li>
<li>Added the "-echo" option to the shell.</li>
<li>Changes to comments.</li>
}