Fix bug reported on the mailing list for WHERE clauses like (rowid<'2'). (CVS 2357)

FossilOrigin-Name: b323f0f2832ac5d225d880db6f56314d2f766a25

diff --git a/manifest b/manifest
index be1539c33de48b885f6cc67637ab51acb07d8a0b..4e260d1a2672373106198d484ed2aea41ddb69c2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.1.3\s(CVS\s2356)
-D 2005-02-20T02:25:57
+C Fix\sbug\sreported\son\sthe\smailing\slist\sfor\sWHERE\sclauses\slike\s(rowid<'2').\s(CVS\s2357)
+D 2005-02-22T09:47:18
 F Makefile.in 76443a83549d1539105e12d13bd0054a05ab2214
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -81,7 +81,7 @@ F src/vdbeInt.h e80721cd8ff611789e20743eec43363a9fb5a48e
 F src/vdbeapi.c 467caa6e6fb9247528b1c7ab9132ae1b4748e8ac
 F src/vdbeaux.c 8d8cc8992cb78cab35e034fa81ad0c1a771c39f1
 F src/vdbemem.c 62fe89471b656a922e9879be005abf690509ead3
-F src/where.c c4b6a799ed9cc99c63d298c8741956156eeb05eb
+F src/where.c 80a2a9d24f868fc5744ba2838701c46934c7e09f
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
 F test/alter.test 3a20ce14c3989f7e2e75da50797065c2e56f838b
@@ -138,7 +138,7 @@ F test/insert.test f39cb2306199c6f9d8959b843c9199d799217055
 F test/insert2.test 065f179a21b42f9746b97571b8ad10b092e90913
 F test/insert3.test c67f0240b1c17e71fa2ed8bb6de064928f549f95
 F test/interrupt.test 5b4d8389e6cf2d01b94f87cfd02d9df1073bfb2d
-F test/intpkey.test b57cf5236fde1bd8cbc1388fa0c91908f6fd9194
+F test/intpkey.test ce2a5d91120a831fc076fbf98fce132e192bad69
 F test/ioerr.test 7eff0a5cb552a6532ccc5c62bb4911127f2c9562
 F test/join.test e08471279574487cac0d17fa1ea66aca15c4de7f
 F test/join2.test f2171c265e57ee298a27e57e7051d22962f9f324
@@ -274,7 +274,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P 5b66631fd4820e721fd506b233ca9259360139be
-R 66e9f65bf977012e90f1427d0383db2c
-U drh
-Z e7ab23384e92e44875cf0c8d8b19036b
+P 36dbf5e929ede7768e8b63219e54548384a8fab5
+R 17de5ae7bd4c63838d9f895c13f76a43
+U danielk1977
+Z 99d54793828c857958404eec4961af97

diff --git a/manifest.uuid b/manifest.uuid
index 2a3b95fa485edb78fccd2397e1835588e6ed9813..ef430d06dac7734a1e4ae7adadf23ce479c320ba 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-36dbf5e929ede7768e8b63219e54548384a8fab5
\ No newline at end of file
+b323f0f2832ac5d225d880db6f56314d2f766a25
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index ddd3e6248fa8b178b7fa887deba4bf0ea6edd6b2..79c43656e2668dd803709d912e295d73a91d50d0 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.134 2005/02/02 01:10:45 danielk1977 Exp $
+** $Id: where.c,v 1.135 2005/02/22 09:47:18 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -1123,7 +1123,7 @@ WhereInfo *sqlite3WhereBegin(
       if( testOp!=OP_Noop ){
         sqlite3VdbeAddOp(v, OP_Recno, iCur, 0);
         sqlite3VdbeAddOp(v, OP_MemLoad, pLevel->iMem, 0);
-        sqlite3VdbeAddOp(v, testOp, 0, brk);
+        sqlite3VdbeAddOp(v, testOp, (int)(('n'<<8)&0x0000FF00), brk);
       }
     }else if( pIdx==0 ){
       /* Case 4:  There is no usable index.  We must do a complete

diff --git a/test/intpkey.test b/test/intpkey.test
index cab7e84b98c757e32ca6f4bdbf3bf057dee88b4a..0a56752af326f88504b348a0f39046199d3f1599 100644 (file)
--- a/test/intpkey.test
+++ b/test/intpkey.test
@@ -13,7 +13,7 @@
 # This file implements tests for the special processing associated
 # with INTEGER PRIMARY KEY columns.
 #
-# $Id: intpkey.test,v 1.20 2004/11/03 13:59:06 drh Exp $
+# $Id: intpkey.test,v 1.21 2005/02/22 09:47:19 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -519,5 +519,43 @@ do_test intpkey-13.5 {
   }
 } {0 {}}
 
+# Compare an INTEGER PRIMARY KEY against a TEXT expression. The INTEGER
+# affinity should be applied to the text value before the comparison
+# takes place.
+#
+do_test intpkey-14.1 {
+  execsql {
+    CREATE TABLE t3(a INTEGER PRIMARY KEY, b INTEGER, c TEXT);
+    INSERT INTO t3 VALUES(1, 1, 'one');
+    INSERT INTO t3 VALUES(2, 2, '2');
+    INSERT INTO t3 VALUES(3, 3, 3);
+  }
+} {}
+do_test intpkey-14.2 {
+  execsql {
+    SELECT * FROM t3 WHERE a>2;
+  }
+} {3 3 3}
+do_test intpkey-14.3 {
+  execsql {
+    SELECT * FROM t3 WHERE a>'2';
+  }
+} {3 3 3}
+do_test intpkey-14.4 {
+  execsql {
+    SELECT * FROM t3 WHERE a<'2';
+  }
+} {1 1 one}
+do_test intpkey-14.5 {
+  execsql {
+    SELECT * FROM t3 WHERE a<c;
+  }
+} {1 1 one}
+do_test intpkey-14.6 {
+  execsql {
+    SELECT * FROM t3 WHERE a=c;
+  }
+} {2 2 2 3 3 3}
 
 finish_test
+