Improved Synopsis on register comparison operators. Fix a bug on the

constraint check generator.

FossilOrigin-Name: a7a18b65fa34dfdf6117fa21db3e576f96876617

diff --git a/manifest b/manifest
index 28fc6fbbf61b3987cd79daa811a48125ac6b0c1f..603ef68ad6dc9f4a9434aef2e0eb2db45ff91650 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Many\snew\stest\scases\sadded,\sthat\smostly\swork.\s\sCurrently\s18\serrors\sin\s\nwithout_rowid3.test.\s\sAlso\sthere\sis\sa\shack\smarked\sby\sa\s/*FIXME*/\scomment\s\non\sat\sfkey.c:547\sthat\sneeds\sfixing.
-D 2013-11-02T22:09:48.508
+C Improved\sSynopsis\son\sregister\scomparison\soperators.\s\sFix\sa\sbug\son\sthe\nconstraint\scheck\sgenerator.
+D 2013-11-02T22:29:34.665
 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 57fe5ae140e09ca6220758c79298ba9ef87ae606
+F src/insert.c 62c2997b6884e2f7ba8daa486f663ae885c4b479
 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
@@ -279,7 +279,7 @@ F src/update.c 94d63d3e06b09df3618655a841dc95d5b9466dc6
 F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269
 F src/util.c 2fa6c821d28bbdbeec1b2a7b091a281c9ef8f918
 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
-F src/vdbe.c 9f3dc84302556f7731e53d64b5e6723b1e568b8d
+F src/vdbe.c 3492f312ed979b146296289ecbd8851a7891a830
 F src/vdbe.h c18a2dd91c838601b867a214e43c5f66d5d001ba
 F src/vdbeInt.h f2fa3ceccceeb757773921fb08af7c6e9f3caa1c
 F src/vdbeapi.c 93a22a9ba2abe292d5c2cf304d7eb2e894dde0ed
@@ -1130,7 +1130,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 4ee4d3106308508a58b80e54e0afb4afb42f510b
-R ff4bdc6a5b118bf4488ef2d4ca905162
+P 39e32187b66405e00dbd44685f6cdd269c90f5e5
+R 58e9f12157086c3e22220529477830cd
 U drh
-Z a4403bd962894f91a2a08b106e00735c
+Z 72d46f91118ca7659eef125e3fbe4980

diff --git a/manifest.uuid b/manifest.uuid
index 8a35c1307158afc23cc0f4bb1c5d8e9cdb00a5e4..58d0d3a8af748b7c8584af4a5466d8a7f5e649a2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-39e32187b66405e00dbd44685f6cdd269c90f5e5
\ No newline at end of file
+a7a18b65fa34dfdf6117fa21db3e576f96876617
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index a3bafb17b1a8a3fbbe7b6610bcb8b076de22990b..d49c199f4418e75be5b523bf2a84fa53c4c1ab32 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -1517,7 +1517,7 @@ void sqlite3GenerateConstraintChecks(
                               addrPkConflict, regIdx+x);
           }
           x = pPk->aiColumn[i];
-          sqlite3VdbeAddOp3(v, OP_Eq, regOldData+1+x, addrUniqueOk, regIdx+x);
+          sqlite3VdbeAddOp3(v, OP_Eq, regOldData+1+x, addrUniqueOk, regIdx+i);
         }
       }else{
         /* For a UNIQUE index on a WITHOUT ROWID table, conflict only if the

diff --git a/src/vdbe.c b/src/vdbe.c
index 68cb0ac9563654b6dbc6338b5d1ee3b95656cbe4..12f36396553c0e86e7d570a3dfbad6c81231fa1c 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1748,7 +1748,7 @@ case OP_ToReal: {                  /* same as TK_TO_REAL, in1 */
 #endif /* !defined(SQLITE_OMIT_CAST) && !defined(SQLITE_OMIT_FLOATING_POINT) */
 
 /* Opcode: Lt P1 P2 P3 P4 P5
-** Synopsis: r[P1] < r[P3]
+** Synopsis: if r[P1]<r[P3] goto P3
 **
 ** Compare the values in register P1 and P3.  If reg(P3)<reg(P1) then
 ** jump to address P2.  
@@ -1783,7 +1783,7 @@ case OP_ToReal: {                  /* same as TK_TO_REAL, in1 */
 ** bit set.
 */
 /* Opcode: Ne P1 P2 P3 P4 P5
-** Synopsis: r[P1] != r[P3]
+** Synopsis: if r[P1]!=r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the operands in registers P1 and P3 are not equal.  See the Lt opcode for
@@ -1796,7 +1796,7 @@ case OP_ToReal: {                  /* same as TK_TO_REAL, in1 */
 ** the SQLITE_NULLEQ flag were omitted from P5.
 */
 /* Opcode: Eq P1 P2 P3 P4 P5
-** Synopsis: r[P1] == r[P3]
+** Synopsis: if r[P1]==r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the operands in registers P1 and P3 are equal.
@@ -1809,21 +1809,21 @@ case OP_ToReal: {                  /* same as TK_TO_REAL, in1 */
 ** the SQLITE_NULLEQ flag were omitted from P5.
 */
 /* Opcode: Le P1 P2 P3 P4 P5
-** Synopsis: r[P1] <= r[P3]
+** Synopsis: if r[P1]<=r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the content of register P3 is less than or equal to the content of
 ** register P1.  See the Lt opcode for additional information.
 */
 /* Opcode: Gt P1 P2 P3 P4 P5
-** Synopsis: r[P1] > r[P3]
+** Synopsis: if r[P1]>r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the content of register P3 is greater than the content of
 ** register P1.  See the Lt opcode for additional information.
 */
 /* Opcode: Ge P1 P2 P3 P4 P5
-** Synopsis: r[P1] >= r[P3]
+** Synopsis: if r[P1]>=r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the content of register P3 is greater than or equal to the content of