Fix sqlite3_vtab_on_conflict() to return the correct values for

ABORT, FAIL, and IGNORE.

FossilOrigin-Name: f0617d619dc6654f6d27543999c0aad724a0d967

diff --git a/manifest b/manifest
index 0226ba2e1c94e49c0606a7aced893b344fb6f6fd..e38d1ab9ba43d9d036e40b086d9829fa734e1a6e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\smemory\susage\stracking\sthat\swas\sintroduced\sby\ncheck-in\s[4e33a0eaf83922].
-D 2011-05-05T17:00:51.731
+C Fix\ssqlite3_vtab_on_conflict()\sto\sreturn\sthe\scorrect\svalues\sfor\nABORT,\sFAIL,\sand\sIGNORE.
+D 2011-05-05T17:41:58.205
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -244,7 +244,7 @@ F src/vdbeaux.c 25aa5ba7d46b4fe7c8f33dc132d474242d5f9726
 F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
 F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
 F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
-F src/vtab.c 1491acb3e0a67eafe69134fb65bfa0b7b7e82342
+F src/vtab.c 5e17098829cb1533ae85aa46de98aa175f65eb83
 F src/wal.c 7334009b396285b658a95a3b6bc6d2b016a1f794
 F src/wal.h 7a5fbb00114b7f2cd40c7e1003d4c41ce9d26840
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
@@ -933,7 +933,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 930be6a1bdec8c150caafd790973f7a401fc1970
-R 74676c63d123716a920c0fc74bf1b85a
+P 8ba456ae0b3d0c0b6f72f98bd0bc28f72dfa4ff5
+R e350890a304deaff131b57483c8e478b
 U drh
-Z e5c86bfd12ceffed2348ff2cb6b52064
+Z 6b45c0a2e4c7eb15d8acfe532af4cf91

diff --git a/manifest.uuid b/manifest.uuid
index 351a91a73f9bc2e6952372c62f2de81901d7a14c..89a83c1a8bd1d211bc215f46430e83671a50cbe3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ba456ae0b3d0c0b6f72f98bd0bc28f72dfa4ff5
\ No newline at end of file
+f0617d619dc6654f6d27543999c0aad724a0d967
\ No newline at end of file

diff --git a/src/vtab.c b/src/vtab.c
index cac9c96064b4dc4dd972ee18572cba58c76cd115..ce48c932f971f4dd7509a444d2ab1c224168ba22 100644 (file)
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -1001,7 +1001,7 @@ void sqlite3VtabMakeWritable(Parse *pParse, Table *pTab){
 */
 int sqlite3_vtab_on_conflict(sqlite3 *db){
   static const unsigned char aMap[] = { 
-    SQLITE_ROLLBACK, SQLITE_IGNORE, SQLITE_ABORT, SQLITE_FAIL, SQLITE_REPLACE 
+    SQLITE_ROLLBACK, SQLITE_ABORT, SQLITE_FAIL, SQLITE_IGNORE, SQLITE_REPLACE 
   };
   assert( OE_Rollback==1 && OE_Abort==2 && OE_Fail==3 );
   assert( OE_Ignore==4 && OE_Replace==5 );