Remove the <ON CONFLICT> clause from BEGIN (CVS 1501)
FossilOrigin-Name: 9029274b6129140064bd7ac34df7eaba00d28efb
diff --git a/src/build.c b/src/build.c
index 6aeb8cb..52e7827 100644
--- 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 @@
/*
** Begin a transaction
*/
-void sqlite3BeginTransaction(Parse *pParse, int onError){
+void sqlite3BeginTransaction(Parse *pParse){
sqlite *db;
Vdbe *v;
@@ -2183,8 +2183,6 @@
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 d798102..7b71705 100644
--- 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 @@
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 @@
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 @@
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 af8e74b..9909206 100644
--- 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 @@
/* 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 b22e477..6e92a96 100644
--- 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 @@
///////////////////// 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 9abf2d3..105ac4a 100644
--- 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 @@
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 @@
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*);