aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshaneh <shaneh@noemail.net>2011-03-12 04:58:55 +0000
committershaneh <shaneh@noemail.net>2011-03-12 04:58:55 +0000
commit11c58f7d8e3b17c674acbfc2ce5b51c0e71121e2 (patch)
treeceb3c1508f3cc1743f12ba01b18060dfb5b472d5 /src
parentca6b9d5bbed35d6cf743d8d63b14412391983ec0 (diff)
downloadsqlite-11c58f7d8e3b17c674acbfc2ce5b51c0e71121e2.tar.gz
sqlite-11c58f7d8e3b17c674acbfc2ce5b51c0e71121e2.zip
More tests for SQLITE_OMIT_UNIQUE_ENFORCEMENT and minor change to implementation.
FossilOrigin-Name: b86999436ec2414c990ba720441fe316f647eef6
Diffstat (limited to 'src')
-rw-r--r--src/ctime.c3
-rw-r--r--src/insert.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ctime.c b/src/ctime.c
index a128f61a6..a04c567b4 100644
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -302,6 +302,9 @@ static const char * const azCompileOpt[] = {
#ifdef SQLITE_OMIT_TRUNCATE_OPTIMIZATION
"OMIT_TRUNCATE_OPTIMIZATION",
#endif
+#ifdef SQLITE_OMIT_UNIQUE_ENFORCEMENT
+ "OMIT_UNIQUE_ENFORCEMENT",
+#endif
#ifdef SQLITE_OMIT_UTF16
"OMIT_UTF16",
#endif
diff --git a/src/insert.c b/src/insert.c
index 5a86484b2..a4efcf2bf 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -1331,7 +1331,6 @@ void sqlite3GenerateConstraintChecks(
sqlite3ExprCacheAffinityChange(pParse, regIdx, pIdx->nColumn+1);
#ifdef SQLITE_OMIT_UNIQUE_ENFORCEMENT
- pIdx->onError = OE_None;
sqlite3ReleaseTempRange(pParse, regIdx, pIdx->nColumn+1);
continue; /* Treat pIdx as if it is not a UNIQUE index */
#else