:-) (CVS 171)

FossilOrigin-Name: d49e10fb5e29318f1f777664562b68dd054f7535

diff --git a/VERSION b/VERSION
index 8fc77d0fab646b37d04c1f8a97c379d17c48e91a..f8f3c08725d52ee6310ff03bf8655356a3975a59 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.17
+1.0.18

diff --git a/manifest b/manifest
index 9b6bfcd309be054a11da27a311e89d91b8b7ac01..7f0eac1219168e16d4c348f3313fba38cc54677a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Version\s1.0.17\s(CVS\s486)
-D 2000-12-10T18:40:00
+C :-)\s(CVS\s171)
+D 2001-01-04T14:20:18
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 0b1fdafa55e1bf4d3a4f5213544130e66ef32052
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
-F VERSION 2436af0010b224c49639a6ce276551a862a08115
+F VERSION 049adaa0a3c5ffae5eb0267c11c84b9b206a550d
 F configure 3dc1edb9dcf60215e31ff72b447935ab62211442 x
 F configure.in d892ca33db7e88a055519ce2f36dcb11020e8fff
 F doc/lemon.html e233a3e97a779c7a87e1bc4528c664a58e49dd47
@@ -16,10 +16,10 @@ F src/delete.c 4d491eaf61b515516749c7ed68fa3b2ee8a09065
 F src/expr.c 7d7646afd52d1448237e5f517454cfb2d3d394d6
 F src/insert.c f146f149ad2422a1dc3bfa7a1651a25940f98958
 F src/main.c 52355458131977c1ac40a006ce2fe2035f39069c
-F src/parse.y 5d199034de5d29ebedb42c1c51f34db4df40cbe5
+F src/parse.y 25ee4d8efccc4b247c32fe4ab194e3dd8fd5a4ee
 F src/printf.c 1efb6b3e7f28a93be57132de3f8f400d2ac1460e
 F src/select.c c1de8ac34131324fa05664b06b0ae1ee9c02905d
-F src/shell.c 146149928c7dca23ceebd6aa53026e9b02d3b4e4
+F src/shell.c 2188df591ee3f927926c3ed6ea580afbc075ed4a
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in fd86903777f1ee7bd0465243224a0fd2100eedc8
 F src/sqliteInt.h ed06214fc7054e43182ac351ebde913ede708639
@@ -41,7 +41,7 @@ F test/in.test 2c560c0f55fb777029fd9bb5378f2997582aa603
 F test/index.test ee060ef8912be47ba616e50cce7985259a68d58a
 F test/insert.test 66f4c3bd600fec8eb1e733b928cbe6fa885eff0c
 F test/insert2.test 732405e30331635af8d159fccabe835eea5cd0c6
-F test/lock.test f56cf41d29d2c4cbaa6239424b5b0ee844c273a0
+F test/lock.test bf6d3f8a0a91c6673ff5e357b7a1397e241f7f14
 F test/main.test 83cfa58b0b9b69924cc915d5c50b12f0ac9e40e7
 F test/select1.test 68ff778c24fc8982e63dda37acb5b0396913adf7
 F test/select2.test 0c24b9bb8825ebb96e6cc65f1eb61bace0e02aa0
@@ -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 3b0abdf91bef39602876788bbf0e1c4585784363
+F www/changes.tcl 3f3bec840da66e09b1d5fb6bc8cb147d42ad3dd9
 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 b46f9a317b06bd490bda987e11e24f2c27162370
-R c7a71bdb40c0db1def459d2ec0493e1b
+P bee0c818590ccdbb96e0a4cb2998bc077564b2ae
+R 2eedb8bda15944e62f7849d4e33eb1da
 U drh
-Z 76f9c173ea2160a2a9011f55704b6843
+Z 445fe477e7da70b697f187b5bba05eab

diff --git a/manifest.uuid b/manifest.uuid
index 55dad6df92d3323bfb79ce9606acfd042071639a..5ea11eb9dcab7b66b701c42aa335309c4195fbb4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bee0c818590ccdbb96e0a4cb2998bc077564b2ae
\ No newline at end of file
+d49e10fb5e29318f1f777664562b68dd054f7535
\ No newline at end of file

diff --git a/src/parse.y b/src/parse.y
index 80496c40dd2b19f1f3dd142458c9cfaa54a741ee..8e413b7dd72df2b714354a7caa88c2119095385c 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -26,7 +26,7 @@
 ** the parser.  Lemon will also generate a header file containing
 ** numeric codes for all of the tokens.
 **
-** @(#) $Id: parse.y,v 1.25 2000/08/01 09:56:27 drh Exp $
+** @(#) $Id: parse.y,v 1.26 2001/01/04 14:20:18 drh Exp $
 */
 %token_prefix TK_
 %token_type {Token}
@@ -114,12 +114,12 @@ ccons ::= CHECK LP expr RP.
 conslist_opt ::= .
 conslist_opt ::= COMMA conslist.
 conslist ::= conslist COMMA tcons.
+conslist ::= conslist tcons.
 conslist ::= tcons.
-tcons ::= CONSTRAINT id tcons2.
-tcons ::= tcons2.
-tcons2 ::= PRIMARY KEY LP idxlist(X) RP. {sqliteCreateIndex(pParse,0,0,X,0,0);}
-tcons2 ::= UNIQUE LP idlist RP.
-tcons2 ::= CHECK expr.
+tcons ::= CONSTRAINT id.
+tcons ::= PRIMARY KEY LP idxlist(X) RP. {sqliteCreateIndex(pParse,0,0,X,0,0);}
+tcons ::= UNIQUE LP idlist RP.
+tcons ::= CHECK expr.
 idlist ::= idlist COMMA id.
 idlist ::= id.
 

diff --git a/src/shell.c b/src/shell.c
index 0bb5ed8087160c673e00907137ad00960fbc3436..656cf0420870069e1bea67de8d87c067743275c1 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -24,7 +24,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.27 2000/10/16 22:06:42 drh Exp $
+** $Id: shell.c,v 1.28 2001/01/04 14:20:18 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -769,9 +769,13 @@ int main(int argc, char **argv){
         continue;
       }
       if( zSql==0 ){
-        nSql = strlen(zLine);
-        zSql = malloc( nSql+1 );
-        strcpy(zSql, zLine);
+        int i;
+        for(i=0; zLine[i] && isspace(zLine[i]); i++){}
+        if( zLine[i]!=0 ){
+          nSql = strlen(zLine);
+          zSql = malloc( nSql+1 );
+          strcpy(zSql, zLine);
+        }
       }else{
         int len = strlen(zLine);
         zSql = realloc( zSql, nSql + len + 2 );
@@ -784,10 +788,11 @@ int main(int argc, char **argv){
         nSql += len;
       }
       free(zLine);
-      if( sqlite_complete(zSql) ){
+      if( zSql && sqlite_complete(zSql) ){
         data.cnt = 0;
         if( sqlite_exec(db, zSql, callback, &data, &zErrMsg)!=0 
              && zErrMsg!=0 ){
+          if( !istty ) printf("%s\n",zSql);
           printf("SQL error: %s\n", zErrMsg);
           free(zErrMsg);
           zErrMsg = 0;

diff --git a/test/lock.test b/test/lock.test
index 7b1c9a7375aefdcb9ddee9356a11e27776373e68..814b6b9a21060d64e361e9496c8c3cdd46d7d35f 100644 (file)
--- a/test/lock.test
+++ b/test/lock.test
@@ -23,7 +23,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: lock.test,v 1.4 2000/10/19 14:10:09 drh Exp $
+# $Id: lock.test,v 1.5 2001/01/04 14:20:18 drh Exp $
 
 if {$dbprefix=="gdbm:"} {
 
@@ -72,7 +72,7 @@ do_test lock-1.3 {
   puts $f "SELECT f2 FROM big WHERE f1=11;"
   close $f
   exec ./sqlite testdb <update.sql
-} "SQL error: table big is locked\n22"
+} "UPDATE big SET f2='xyz' WHERE f1=11;\nSQL error: table big is locked\n22"
 
 do_test lock-1.4 {
   # Try to update the database using a timeout
@@ -83,7 +83,7 @@ do_test lock-1.4 {
   puts $f "SELECT f2 FROM big WHERE f1=11;"
   close $f
   exec ./sqlite testdb <update.sql
-} "SQL error: table big is locked\n22"
+} "UPDATE big SET f2='xyz' WHERE f1=11;\nSQL error: table big is locked\n22"
 
 do_test lock-1.5 {
   # Try to update the database using a timeout

diff --git a/www/changes.tcl b/www/changes.tcl
index 1fd8a2852b44ecc305f623d2154682a723987286..6d00961187d8cd0e418e021e21625041c2ed05f8 100644 (file)
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -17,6 +17,12 @@ proc chng {date desc} {
   puts "<DD><P><UL>$desc</UL></P></DD>"
 }
 
+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>Changes to comments.</li>
+}
+
 chng {2000 Dec 10 (1.0.17)} {
 <li>Rewrote <b>sqlite_complete()</b> to make it faster.</li>
 <li>Minor tweaks to other code to make it run a little faster.</li>