Remove the <ON CONFLICT> clause from BEGIN (CVS 1501)

FossilOrigin-Name: 9029274b6129140064bd7ac34df7eaba00d28efb

diff --git a/manifest b/manifest
index c61402af929864a1cd38efc9f536317eab92479e..9dd0e5372378336dc7c928857bbfc47bf863470a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sOP_Begin,\sOP_Commit\sand\sOP_Rollback\swith\sOP_AutoCommit.\s(CVS\s1500)
-D 2004-05-31T08:26:49
+C Remove\sthe\s<ON\sCONFLICT>\sclause\sfrom\sBEGIN\s(CVS\s1501)
+D 2004-05-31T08:55:34
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -26,7 +26,7 @@ F src/attach.c c315c58cb16fd6e913b3bfa6412aedecb4567fa5
 F src/auth.c 5c2f0bea4729c98c2be3b69d6b466fc51448fe79
 F src/btree.c 07d0d93ba0e6f54a0f67e665d264b0bc6ab70edb
 F src/btree.h 61d670f418fa6bd88b6d2731f05fcf8b19d3ec45
-F src/build.c df54499bdf0eced593e5074fae25f6d73ebb1411
+F src/build.c 774193e2fb0d1e6492735bcc909d525898c61204
 F src/date.c 0eb922af5c5f5e2455f8dc2f98023ed3e04a857e
 F src/delete.c 72f8febf6170cda830f509c8f9dffbed3df3596c
 F src/encode.c a876af473d1d636faa3dca51c7571f2e007eea37
@@ -34,9 +34,9 @@ F src/expr.c 5145de7d25a4b960a4afdb754a9e88b60cce0405
 F src/func.c 1fe0763675eb38b6e3992d3edfbec2271798b658
 F src/hash.c 440c2f8cb373ee1b4e13a0988489c7cd95d55b6f
 F src/hash.h 762d95f1e567664d1eafc1687de755626be962fb
-F src/insert.c 0c7966dba4cd5698e393e824f162d520e96b1978
+F src/insert.c 4268d9e3959cc845ea243fb4ec7507269404dad9
 F src/legacy.c ad23746f15f67e34577621b1875f639c94839e1f
-F src/main.c 4f1dd19db1a37c8617142ef053ed4398d9069daf
+F src/main.c 9bb9578c15db0205616fcf474885b83aba53d910
 F src/md5.c d2c738fedfb27f73cefcf2b0ac1f9f21894b073e
 F src/os.h ab42f4a7c4c716f26b988e759b6e12085a3bfc67
 F src/os_common.h 744286a27de55c52f1b18921e8d17abbf7fafc0f
@@ -48,14 +48,14 @@ F src/os_win.c 92b51a38437b98d8aa3ac05b57c71e1d1092e5be
 F src/os_win.h 5d41af24caaef6c13a2d8e2399caa1c57d45c84d
 F src/pager.c 048872f1ccd27e4c17d77098eb6e86990a7a9b88
 F src/pager.h 78a00ac280899bcba1a89dc51585dcae6b7b3253
-F src/parse.y facaa7d07885fb9d53ec8fd676705715d3942b0f
+F src/parse.y 27c1ce09f9d309be91f9e537df2fb00892990af4
 F src/pragma.c 7f432dee3c94460638df1e5fffeb59a560943d13
 F src/printf.c ef750e8e2398ca7e8b58be991075f08c6a7f0e53
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 0297717eb7331604687c2e29c147d3a311359df1
 F src/shell.c ed4d237b3e52a0a42512bfcc53530e46de20c28f
 F src/sqlite.h.in edc6408c7f53c2104f781a76b926036e17018ec9
-F src/sqliteInt.h 576c2d7828e538873c40da7b728c912c2b5a94d1
+F src/sqliteInt.h 4a153e6c57eda3dfbfe190ac66986bc765a2c351
 F src/table.c af14284fa36c8d41f6829e3f2819dce07d3e2de2
 F src/tclsqlite.c b314f12760547e4ef090e055f1298f70627450d3
 F src/test1.c 32934478366531503d634968db414df17cb38238
@@ -77,7 +77,7 @@ F src/vdbeaux.c 9cad713e47e6e684852dfc12ef6e326fb4a2ca76
 F src/vdbemem.c 627d714c347f6af8092cc48ae1c06fd774a1ad9c
 F src/where.c 444a7c3a8b1eb7bba072e489af628555d21d92a4
 F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
-F test/attach.test 379d5b1c6b907c682db293811fd8210715c42721
+F test/attach.test cbc9c5286e614171a68da3f0b05ccba313fd4c5d
 F test/attach2.test 617583b73005638100721b4178c28d0b9df67494
 F test/attach3.test d384ac2e59f305743f73aec4b3d97b36fa5c6975
 F test/auth.test 95809b8f6a9bec18b94d28cafd03fe27d2f8a9e9
@@ -92,7 +92,7 @@ F test/btree5.test 8e5ff32c02e685d36516c6499add9375fe1377f2
 F test/btree6.test a5ede6bfbbb2ec8b27e62813612c0f28e8f3e027
 F test/capi2.test 8fb64e8ab7f78b8254cd4d04bb96822167f731b2
 F test/capi3.test b6fe8a66d2ffe28d4faaaec154a143131e8ff631
-F test/conflict.test 2cdd9a746831a18f425fabd075750dce6182951a
+F test/conflict.test 45ce1e44ea748944aed233df8c278a9e1c4c87cc
 F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
 F test/date.test aed5030482ebc02bd8d386c6c86a29f694ab068d
 F test/delete.test ddb1d4e172a01c0165804f82f81df556fb48a856
@@ -204,7 +204,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P e6685af815c4c0c7f09bb097a59a121862b865cf
-R c1fe4dc87ffc77104224a068a0aafa41
+P b8ed812c92f2dbb4431d45aeb41646ceb53e0cbc
+R 0a7b9b75e1ce69dd86720403c073375e
 U danielk1977
-Z 668b27f088f428197bca6da249bb0086
+Z 97096496cbbd5e8936b9c4165e249994

diff --git a/manifest.uuid b/manifest.uuid
index 481619f14178676b98d383ae44dcd1f803f0b867..b652e81cffa25e167441cd2901ba37472b911dbe 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b8ed812c92f2dbb4431d45aeb41646ceb53e0cbc
\ No newline at end of file
+9029274b6129140064bd7ac34df7eaba00d28efb
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 6aeb8cbd829a6e9652d9d4b49b1ea8467a5c3243..52e7827774c18f4a3b246b2c28132bf71461b818 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -23,7 +23,7 @@
 **     ROLLBACK
 **     PRAGMA
 **
-** $Id: build.c,v 1.201 2004/05/31 08:26:49 danielk1977 Exp $
+** $Id: build.c,v 1.202 2004/05/31 08:55:34 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2172,7 +2172,7 @@ void sqlite3SrcListDelete(SrcList *pList){
 /*
 ** Begin a transaction
 */
-void sqlite3BeginTransaction(Parse *pParse, int onError){
+void sqlite3BeginTransaction(Parse *pParse){
   sqlite *db;
   Vdbe *v;
 
@@ -2183,8 +2183,6 @@ void sqlite3BeginTransaction(Parse *pParse, int onError){
   v = sqlite3GetVdbe(pParse);
   if( !v ) return;
   sqlite3VdbeAddOp(v, OP_AutoCommit, 0, 0);
-
-  /* FIX ME: Need to deal with onError */
 }
 
 /*

diff --git a/src/insert.c b/src/insert.c
index d798102f4ec5b9311e55f5a8bdc1b84644275e65..7b71705fdf2d04c799b876c3463cbf7f313fad51 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle INSERT statements in SQLite.
 **
-** $Id: insert.c,v 1.108 2004/05/29 11:24:50 danielk1977 Exp $
+** $Id: insert.c,v 1.109 2004/05/31 08:55:34 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -747,8 +747,6 @@ void sqlite3GenerateConstraintChecks(
     if( onError==OE_None ) continue;
     if( overrideError!=OE_Default ){
       onError = overrideError;
-    }else if( pParse->db->onError!=OE_Default ){
-      onError = pParse->db->onError;
     }else if( onError==OE_Default ){
       onError = OE_Abort;
     }
@@ -795,8 +793,6 @@ void sqlite3GenerateConstraintChecks(
     onError = pTab->keyConf;
     if( overrideError!=OE_Default ){
       onError = overrideError;
-    }else if( pParse->db->onError!=OE_Default ){
-      onError = pParse->db->onError;
     }else if( onError==OE_Default ){
       onError = OE_Abort;
     }
@@ -872,8 +868,6 @@ void sqlite3GenerateConstraintChecks(
     if( onError==OE_None ) continue;  /* pIdx is not a UNIQUE index */
     if( overrideError!=OE_Default ){
       onError = overrideError;
-    }else if( pParse->db->onError!=OE_Default ){
-      onError = pParse->db->onError;
     }else if( onError==OE_Default ){
       onError = OE_Abort;
     }

diff --git a/src/main.c b/src/main.c
index af8e74b80f1ae191660e0cf8cbc0a75aa5e91bfe..99092060647dff2e53a844600cdfff5352ed2093 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.197 2004/05/31 08:26:49 danielk1977 Exp $
+** $Id: main.c,v 1.198 2004/05/31 08:55:34 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1014,7 +1014,6 @@ static int openDatabase(
   /* Allocate the sqlite data structure */
   db = sqliteMalloc( sizeof(sqlite) );
   if( db==0 ) goto opendb_out;
-  db->onError = OE_Default;
   db->priorNewRowid = 0;
   db->magic = SQLITE_MAGIC_BUSY;
   db->nDb = 2;

diff --git a/src/parse.y b/src/parse.y
index b22e4772a3302fc6544ba4cd6b5c70b880f7024c..6e92a96fffbdffd86c2203b8d0b99211af4795ad 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -14,7 +14,7 @@
 ** the parser.  Lemon will also generate a header file containing
 ** numeric codes for all of the tokens.
 **
-** @(#) $Id: parse.y,v 1.124 2004/05/29 10:23:20 danielk1977 Exp $
+** @(#) $Id: parse.y,v 1.125 2004/05/31 08:55:34 danielk1977 Exp $
 */
 %token_prefix TK_
 %token_type {Token}
@@ -76,7 +76,7 @@ explain ::= .           { sqlite3BeginParse(pParse, 0); }
 ///////////////////// Begin and end transactions. ////////////////////////////
 //
 
-cmd ::= BEGIN trans_opt onconf(R).  {sqlite3BeginTransaction(pParse,R);}
+cmd ::= BEGIN trans_opt.  {sqlite3BeginTransaction(pParse);}
 trans_opt ::= .
 trans_opt ::= TRANSACTION.
 trans_opt ::= TRANSACTION nm.

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 9abf2d30199b6edf210f6844c572082bcfe59358..105ac4a68ae3f62e97dfdb16f4f58dee4639ff2f 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.262 2004/05/31 08:26:49 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.263 2004/05/31 08:55:34 danielk1977 Exp $
 */
 #include "config.h"
 #include "sqlite.h"
@@ -366,7 +366,6 @@ struct sqlite {
   u8 safety_level;              /* How aggressive at synching data to disk */
   u8 want_to_close;             /* Close after all VDBEs are deallocated */
   u8 temp_store;                /* 1=file, 2=memory, 0=compile-time default */
-  u8 onError;                   /* Default conflict algorithm */
   int next_cookie;              /* Next value of aDb[0].schema_cookie */
   int cache_size;               /* Number of pages to use in the cache */
   int nTable;                   /* Number of tables in the database */
@@ -1263,7 +1262,7 @@ Vdbe *sqlite3GetVdbe(Parse*);
 void sqlite3Randomness(int, void*);
 void sqlite3RollbackAll(sqlite*);
 void sqlite3CodeVerifySchema(Parse*, int);
-void sqlite3BeginTransaction(Parse*, int);
+void sqlite3BeginTransaction(Parse*);
 void sqlite3CommitTransaction(Parse*);
 void sqlite3RollbackTransaction(Parse*);
 int sqlite3ExprIsConstant(Expr*);

diff --git a/test/attach.test b/test/attach.test
index b5c84efba6b8c7f4392bd405b51522c9fb0f9954..3a556b0cd4cf233ae11475ca0f8c04aede7d1879 100644 (file)
--- a/test/attach.test
+++ b/test/attach.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: attach.test,v 1.19 2004/05/31 08:26:49 danielk1977 Exp $
+# $Id: attach.test,v 1.20 2004/05/31 08:55:34 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -444,13 +444,11 @@ do_test attach-4.8 {
   execsql {
     ATTACH DATABASE 'test2.db' AS db2;
     INSERT INTO db2.t3 VALUES(13,14);
-pragma vdbe_trace = on;
     SELECT * FROM db2.t4 UNION ALL SELECT * FROM main.t4;
   }
 } {db2.6 db2.13 main.11}
 do_test attach-4.9 {
   execsql {
-pragma vdbe_trace = off;
     INSERT INTO main.t3 VALUES(15,16);
     SELECT * FROM db2.t4 UNION ALL SELECT * FROM main.t4;
   }

diff --git a/test/conflict.test b/test/conflict.test
index c2c3ec41defe0584724ab4587838b8f1bea26eed..89ba507e55b7169ce849215119945edb450ae24a 100644 (file)
--- a/test/conflict.test
+++ b/test/conflict.test
@@ -13,7 +13,7 @@
 # This file implements tests for the conflict resolution extension
 # to SQLite.
 #
-# $Id: conflict.test,v 1.20 2004/05/31 08:26:49 danielk1977 Exp $
+# $Id: conflict.test,v 1.21 2004/05/31 08:55:34 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -45,17 +45,6 @@ foreach {i conf cmd t0 t1 t2} {
   5 {}       {INSERT OR FAIL}        1 {}  1
   6 {}       {INSERT OR ABORT}       1 {}  1
   7 {}       {INSERT OR ROLLBACK}    1 {}  {}
-  8 IGNORE   INSERT                  0 3   1
-  9 IGNORE   {INSERT OR IGNORE}      0 3   1
- 10 IGNORE   {INSERT OR REPLACE}     0 4   1
- 11 IGNORE   REPLACE                 0 4   1
- 12 IGNORE   {INSERT OR FAIL}        1 {}  1
- 13 IGNORE   {INSERT OR ABORT}       1 {}  1
- 14 IGNORE   {INSERT OR ROLLBACK}    1 {}  {}
- 15 REPLACE  INSERT                  0 4   1
- 16 FAIL     INSERT                  1 {}  1
- 17 ABORT    INSERT                  1 {}  1
- 18 ROLLBACK INSERT                  1 {}  {}
 } {
   if { $conf=={} } {
 
@@ -107,17 +96,6 @@ foreach {i conf cmd t0 t1 t2} {
   5 {}       {INSERT OR FAIL}        1 {}  1
   6 {}       {INSERT OR ABORT}       1 {}  1
   7 {}       {INSERT OR ROLLBACK}    1 {}  {}
-  8 IGNORE   INSERT                  0 3   1
-  9 IGNORE   {INSERT OR IGNORE}      0 3   1
- 10 IGNORE   {INSERT OR REPLACE}     0 4   1
- 11 IGNORE   REPLACE                 0 4   1
- 12 IGNORE   {INSERT OR FAIL}        1 {}  1
- 13 IGNORE   {INSERT OR ABORT}       1 {}  1
- 14 IGNORE   {INSERT OR ROLLBACK}    1 {}  {}
- 15 REPLACE  INSERT                  0 4   1
- 16 FAIL     INSERT                  1 {}  1
- 17 ABORT    INSERT                  1 {}  1
- 18 ROLLBACK INSERT                  1 {}  {}
 } {
   do_test conflict-2.$i {
     if {$conf!=""} {set conf "ON CONFLICT $conf"}
@@ -165,17 +143,6 @@ foreach {i conf cmd t0 t1 t2} {
   5 {}       {INSERT OR FAIL}        1 {}  1
   6 {}       {INSERT OR ABORT}       1 {}  1
   7 {}       {INSERT OR ROLLBACK}    1 {}  {}
-  8 IGNORE   INSERT                  0 3   1
-  9 IGNORE   {INSERT OR IGNORE}      0 3   1
- 10 IGNORE   {INSERT OR REPLACE}     0 4   1
- 11 IGNORE   REPLACE                 0 4   1
- 12 IGNORE   {INSERT OR FAIL}        1 {}  1
- 13 IGNORE   {INSERT OR ABORT}       1 {}  1
- 14 IGNORE   {INSERT OR ROLLBACK}    1 {}  {}
- 15 REPLACE  INSERT                  0 4   1
- 16 FAIL     INSERT                  1 {}  1
- 17 ABORT    INSERT                  1 {}  1
- 18 ROLLBACK INSERT                  1 {}  {}
 } {
   do_test conflict-3.$i {
     if {$conf!=""} {set conf "ON CONFLICT $conf"}
@@ -224,15 +191,6 @@ foreach {i conf1 conf2 cmd t0 t1 t2} {
   9 FAIL     {}       {INSERT OR IGNORE}      0 3   1
  10 ABORT    {}       {INSERT OR REPLACE}     0 4   1
  11 ROLLBACK {}       {INSERT OR IGNORE }     0 3   1
- 12 REPLACE  IGNORE   INSERT                  0 3   1
- 13 IGNORE   REPLACE  INSERT                  0 4   1
- 14 FAIL     IGNORE   INSERT                  0 3   1
- 15 ABORT    REPLACE  INSERT                  0 4   1
- 16 ROLLBACK IGNORE   INSERT                  0 3   1
- 12 IGNORE   REPLACE  INSERT                  0 4   1
- 13 IGNORE   FAIL     INSERT                  1 {}  1
- 14 IGNORE   ABORT    INSERT                  1 {}  1
- 15 IGNORE   ROLLBACK INSERT                  1 {}  {}
 } {
   do_test conflict-4.$i {
     if {$conf1!=""} {set conf1 "ON CONFLICT $conf1"}
@@ -288,13 +246,6 @@ foreach {i conf1 conf2 cmd t0 t1 t2} {
  14 {}       {}       {INSERT OR FAIL}        1 {}  1
  15 {}       {}       {INSERT OR ABORT}       1 {}  1
  16 {}       {}       {INSERT OR ROLLBACK}    1 {}  {}
- 17 {}       IGNORE   INSERT                  0 {}  1
- 18 {}       REPLACE  INSERT                  0 5   1
- 19 {}       FAIL     INSERT                  1 {}  1
- 20 {}       ABORT    INSERT                  1 {}  1
- 21 {}       ROLLBACK INSERT                  1 {}  {}
- 22 REPLACE  FAIL     INSERT                  1 {}  1
- 23 IGNORE   ROLLBACK INSERT                  1 {}  {}
 } {
   if {$t0} {set t1 {t1.c may not be NULL}}
   do_test conflict-5.$i {
@@ -356,16 +307,6 @@ foreach {i conf1 conf2 cmd t0 t1 t2} {
  14 {}       {}       {UPDATE OR FAIL}        1 {6 7 3 4}  1
  15 {}       {}       {UPDATE OR ABORT}       1 {1 2 3 4}  1
  16 {}       {}       {UPDATE OR ROLLBACK}    1 {1 2 3 4}  0
- 17 {}       IGNORE   UPDATE                  0 {6 7 3 9}  1
- 18 {}       REPLACE  UPDATE                  0 {7 6 9}    1
- 19 {}       FAIL     UPDATE                  1 {6 7 3 4}  1
- 20 {}       ABORT    UPDATE                  1 {1 2 3 4}  1
- 21 {}       ROLLBACK UPDATE                  1 {1 2 3 4}  0
- 22 REPLACE  IGNORE   UPDATE                  0 {6 7 3 9}  1
- 23 IGNORE   REPLACE  UPDATE                  0 {7 6 9}    1
- 24 REPLACE  FAIL     UPDATE                  1 {6 7 3 4}  1
- 25 IGNORE   ABORT    UPDATE                  1 {1 2 3 4}  1
- 26 REPLACE  ROLLBACK UPDATE                  1 {1 2 3 4}  0
 } {
   if {$t0} {set t1 {column a is not unique}}
   do_test conflict-6.$i {
@@ -674,9 +615,9 @@ do_test conflict-9.26 {
 do_test conflict-10.1 {
   catchsql {
     DELETE FROM t1;
-    BEGIN ON CONFLICT ROLLBACK;
-    INSERT INTO t1 VALUES(1,2);
-    INSERT INTO t1 VALUES(1,3);
+    BEGIN;
+    INSERT OR ROLLBACK INTO t1 VALUES(1,2);
+    INSERT OR ROLLBACK INTO t1 VALUES(1,3);
     COMMIT;
   }
   execsql {SELECT * FROM t1}
@@ -685,9 +626,9 @@ do_test conflict-10.2 {
   catchsql {
     CREATE TABLE t4(x);
     CREATE UNIQUE INDEX t4x ON t4(x);
-    BEGIN ON CONFLICT ROLLBACK;
-    INSERT INTO t4 VALUES(1);
-    INSERT INTO t4 VALUES(1);
+    BEGIN;
+    INSERT OR ROLLBACK INTO t4 VALUES(1);
+    INSERT OR ROLLBACK INTO t4 VALUES(1);
     COMMIT;
   }
   execsql {SELECT * FROM t4}