Any non-zero value is considered TRUE in a WHERE clause. Ticket #1211. (CVS 2496)

FossilOrigin-Name: 0f7af623791d8d2ed35c3978ab12316912d9b6f8

diff --git a/manifest b/manifest
index 8145ffdb3260152a92aee4e6a1646ba3b44a32eb..5f1f268f18199b6756577b04b5cdbe2c01a0ba35 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sambiguous\scolumn\sname\serrors\swhen\sthe\scolumn\sname\sis\sin\sthe\sUSING\sclause\nof\sa\sjoin.\s\sTicket\s#743.\s(CVS\s2495)
-D 2005-06-06T17:11:46
+C Any\snon-zero\svalue\sis\sconsidered\sTRUE\sin\sa\sWHERE\sclause.\s\sTicket\s#1211.\s(CVS\s2496)
+D 2005-06-06T17:27:19
 F Makefile.in 8129e7f261d405db783676f9ca31e0841768c652
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -77,7 +77,7 @@ F src/update.c 04ea9dd784ccfeaf38a681b3edfe3b1c4edfdda7
 F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c
 F src/util.c 96008b52604d08b9cc57ed37350149d6ac8a1bf3
 F src/vacuum.c f4eb8facbfede77cac4d8c205a76a1a9b9b0d21d
-F src/vdbe.c 15b12cdaeb5096257143a00f466a00eed6137d2e
+F src/vdbe.c e9bf69b2ba382ba23b48f98778f46d3261ae0e2c
 F src/vdbe.h 75e466d84d362b0c4498978a9d6b1e6bd32ecf3b
 F src/vdbeInt.h 4afaae2f4adcab54ad2a40dabb2e689fba7b1561
 F src/vdbeapi.c c66b88fce58f72eee44ec8c348a2561e031d2417
@@ -218,7 +218,7 @@ F test/vacuum.test 5d4857ae2afc9c20d0edb8acc58bdc8d630126a9
 F test/vacuum2.test 5d77e98c458bcdbeecc6327de5107179ba1aa095
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/view.test e24553116e482a94e9cd22a4eea4909b1c6ed1c6
-F test/where.test ffb790dfda75d977bae7a1f5830351623f76861b
+F test/where.test 9de2426d0b8296b3aa7801cef5f81daf51f8e516
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/lemon.c c88936c67f6411608db8fa4254d254f509fa40f6
 F tool/lempar.c f0c30abcae762a7d1eb37cd88b2232ab8dd625fb
@@ -281,7 +281,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P 265fb6079c0a4b7a93f063939436db494ff1d56c
-R cca026e07dbc9f19c88e6b197e703c3a
+P 6a51bdeeff8312fa54fa2b1200f823428f35d605
+R 8b6a445b2a4d8771567561d39f6e0c93
 U drh
-Z b6b1f25cc7643f9245d6474cb22ef036
+Z 104f033e128c21dde4a074197c3d9fda

diff --git a/manifest.uuid b/manifest.uuid
index a87690df74b926e4486eaa67d040e55c244948cd..9c93bf6ee05825ecb14d1b1a39c954f20bdccafa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a51bdeeff8312fa54fa2b1200f823428f35d605
\ No newline at end of file
+0f7af623791d8d2ed35c3978ab12316912d9b6f8
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index b69d4f7d4f0bddef608352152056ea55e1ab3c8c..dcc8492b640786363c2d08951abba5e0286caf67 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.466 2005/05/26 14:41:47 danielk1977 Exp $
+** $Id: vdbe.c,v 1.467 2005/06/06 17:27:19 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1639,7 +1639,11 @@ case OP_IfNot: {            /* no-push */
   if( pTos->flags & MEM_Null ){
     c = pOp->p1;
   }else{
+#ifdef SQLITE_OMIT_FLOATING_POINT
     c = sqlite3VdbeIntValue(pTos);
+#else
+    c = sqlite3VdbeRealValue(pTos)!=0.0;
+#endif
     if( pOp->opcode==OP_IfNot ) c = !c;
   }
   Release(pTos);

diff --git a/test/where.test b/test/where.test
index a5dc3e07799f5318f92bfd640f42fcb98ae32b37..2986468bfa9333eb5bbfc8cd3d74f2f35bf6cc84 100644 (file)
--- a/test/where.test
+++ b/test/where.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the use of indices in WHERE clases.
 #
-# $Id: where.test,v 1.28 2005/01/21 03:12:16 danielk1977 Exp $
+# $Id: where.test,v 1.29 2005/06/06 17:27:19 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -300,6 +300,16 @@ do_test where-4.4 {
     SELECT 99 WHERE 1
   }
 } {99}
+do_test where-4.5 {
+  execsql {
+    SELECT 99 WHERE 0.1
+  }
+} {99}
+do_test where-4.6 {
+  execsql {
+    SELECT 99 WHERE 0.0
+  }
+} {}
 
 # Verify that IN operators in a WHERE clause are handled correctly.
 # Omit these tests if the build is not capable of sub-queries.