Some UPDATE statements now working in WITHOUT ROWID tables.

FossilOrigin-Name: 5c0eaea6a26b5c3310d96b3c896ac3068a3ebad1

diff --git a/manifest b/manifest
index 0b07380ab1a8e4aa955c1ec32168aca0d0c181c4..e53e39436b7b5ed5fe9127b43cee74a2d2fe6916 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\scouple\sof\sbug\sfixes.
-D 2013-11-01T01:45:46.564
+C Some\sUPDATE\sstatements\snow\sworking\sin\sWITHOUT\sROWID\stables.
+D 2013-11-01T12:42:21.731
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -182,7 +182,7 @@ F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
 F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
-F src/insert.c 64eb6bf8eda1bbe003cc38394d721b4810f65182
+F src/insert.c c04429bde588ba7f5e90dc14bbe31d25334c1b75
 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
@@ -275,7 +275,7 @@ F src/test_vfstrace.c 34b544e80ba7fb77be15395a609c669df2e660a2
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/tokenize.c 70061085a51f2f4fc15ece94f32c03bcb78e63b2
 F src/trigger.c 53d6b5d50b3b23d4fcd0a36504feb5cff9aed716
-F src/update.c 5afafb5300b3ec2daf5d4876a13aa4e2e0e549df
+F src/update.c fe12f3cd782804d8df8aa327900584d664bf902e
 F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
 F src/util.c 2fa6c821d28bbdbeec1b2a7b091a281c9ef8f918
 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
@@ -1128,7 +1128,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 9b6d9e106aaa3c2efb33d234d26cf08cd3c967b9
-R f3ca5351286775b4f44eb98d83099390
+P cdf00248cf8f7e3c2a3f2f5514273fbacc6fc8d9
+R 0a34f0b854a101e697f3642e97bf3e47
 U drh
-Z 17787b80a80a97fab0e34e1d67511743
+Z cabf904a24b1591bbac5208c61b221d3

diff --git a/manifest.uuid b/manifest.uuid
index 20d3969f2a34ad4586ffbd040140bf5916749923..f79905bbe4d0767e94da1617bf9b04e097b47c64 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cdf00248cf8f7e3c2a3f2f5514273fbacc6fc8d9
\ No newline at end of file
+5c0eaea6a26b5c3310d96b3c896ac3068a3ebad1
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index 199db1e845d2da2d09c0ab6013aa5e39dc92703a..d003c7abea9e20e0f2a063b8f1a8fb86676bedbd 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -1474,10 +1474,11 @@ void sqlite3GenerateConstraintChecks(
       ** is different from old-rowid */
       sqlite3VdbeAddOp3(v, OP_Eq, regR, addrUniqueOk, regOldData);
     }else{
+      int x;
       /* Extract the PRIMARY KEY from the end of the index entry and
       ** store it in register regR..regR+nPk-1 */
       for(i=0; i<pPk->nKeyCol; i++){
-        int x = sqlite3ColumnOfIndex(pIdx, pPk->aiColumn[i]);
+        x = sqlite3ColumnOfIndex(pIdx, pPk->aiColumn[i]);
         sqlite3VdbeAddOp3(v, OP_Column, iThisCur, x, regR+i);
         VdbeComment((v, "%s.%s", pTab->zName,
                      pTab->aCol[pPk->aiColumn[i]].zName));
@@ -1489,11 +1490,12 @@ void sqlite3GenerateConstraintChecks(
         if( isUpdate ){
           int addrPkConflict = sqlite3VdbeCurrentAddr(v)+pPk->nKeyCol;
           for(i=0; i<pPk->nKeyCol-1; i++){
-            sqlite3VdbeAddOp3(v, OP_Ne, regOldData+pPk->aiColumn[i]+1,
-                              addrPkConflict, regIdx+i);
+            x = pPk->aiColumn[i];
+            sqlite3VdbeAddOp3(v, OP_Ne, regOldData+1+x,
+                              addrPkConflict, regIdx+x);
           }
-          sqlite3VdbeAddOp3(v, OP_Eq, regOldData+pPk->aiColumn[i]+1,
-                            addrUniqueOk, regIdx+i);
+          x = pPk->aiColumn[i];
+          sqlite3VdbeAddOp3(v, OP_Eq, regOldData+1+x, addrUniqueOk, regIdx+x);
         }
       }else{
         /* For a UNIQUE index on a WITHOUT ROWID table, conflict only if the

diff --git a/src/update.c b/src/update.c
index c06fcd2a077cf061720872eac8c0029282674d42..b88d5a8f984472ebec97b4799a308eeaac7f3780 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -536,7 +536,7 @@ void sqlite3Update(
 
     /* Delete the index entries associated with the current record.  */
     if( pPk ){
-      j1 = sqlite3VdbeAddOp3(v, OP_NotFound, iDataCur, 0, regOldRowid);
+      j1 = sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, 0, regKey, 0);
     }else{
       j1 = sqlite3VdbeAddOp3(v, OP_NotExists, iDataCur, 0, regOldRowid);
     }