Implicit string->numeric conversion should go to an integer value when

possible.  Ticket #3257. (CVS 5502)

FossilOrigin-Name: da0e4bff30a77f72ae283406b547401c2ebb42c5

diff --git a/manifest b/manifest
index 15b41185aaebb4315db7a1b50d7f1b4868809773..0614359670504eda770cef8105e2e6d372924067 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\severything\sis\sdeallocated\sbefore\scalling\ssqlite3_shutdown().\nTicket\s#3259.\s(CVS\s5501)
-D 2008-07-30T13:15:46
+C Implicit\sstring->numeric\sconversion\sshould\sgo\sto\san\sinteger\svalue\swhen\npossible.\s\sTicket\s#3257.\s(CVS\s5502)
+D 2008-07-30T13:27:11
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -183,7 +183,7 @@ F src/update.c 79b77a3cc8ed5f8903a7f37055fcedd69388dcae
 F src/utf.c a7004436a6ef2aee012ace93de274dd0f3c7624e
 F src/util.c afe659ccc05d1f8af9e8631dabfec3ee3a7144af
 F src/vacuum.c ef342828002debc97514617af3424aea8ef8522c
-F src/vdbe.c 4a5b78debc983d26954d1283f92810d161a7292a
+F src/vdbe.c caa169475973e56a87eb90477928d84f3daa14b8
 F src/vdbe.h c46155c221418bea29ee3a749d5950fcf85a70e2
 F src/vdbeInt.h ab27f964458fd070c6660f80694ab85d56d5f4c5
 F src/vdbeapi.c 25dd01c8b12978c14ec30e9a50666b23da767b27
@@ -281,7 +281,7 @@ F test/eval.test 020a21a236667bd4c56205d999c9992f1d944cac
 F test/exclusive.test 5390ddf1f90a6d055111c0ebe6311045dd3035e1
 F test/exclusive2.test d13bf66753dca46e61241d35d36ab7c868b0d313
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
-F test/expr.test a34267926f2f4b3a8ae6b7c8614fd8fb2fe251af
+F test/expr.test a47d304a90c75def083cce3b1cd6c282842e6bbe
 F test/filectrl.test 524853082d5d7fb442599730ec3a0f3f84a3a936
 F test/filefmt.test 053b622009fbbb74dd37921ffad374d852c13cd8
 F test/fkey1.test dcb4f28eb22d5141f15161d6bdca9a4f58c95729
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P aee63308312bcebb79e15cfdf942ee23694444b0
-R 3465f2c7e121c53fca69b8f5aa86f11d
+P 4a6ee88697ddc28e0c7df1954d1526de18191827
+R 1fc491d5b31cb2a2cf0986670de436ee
 U drh
-Z dce61b95175b8585a01982cf2130d459
+Z 6e72d4e65f10edd96172495856b81fe0

diff --git a/manifest.uuid b/manifest.uuid
index b44a3f00a128051edb3f7e5dfc074e994702850f..2035441ac03558d411a0d10c222c5cc2b6ea2101 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a6ee88697ddc28e0c7df1954d1526de18191827
\ No newline at end of file
+da0e4bff30a77f72ae283406b547401c2ebb42c5
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index db8e4f0c3c9ba3e941d0f95e7e2e1f7c7d72a7df..744bc755912b526ec54d622fbfd3ae4e09a5b315 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.768 2008/07/30 13:14:55 drh Exp $
+** $Id: vdbe.c,v 1.769 2008/07/30 13:27:11 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1179,6 +1179,8 @@ case OP_Multiply:              /* same as TK_STAR, in1, in2, out3 */
 case OP_Divide:                /* same as TK_SLASH, in1, in2, out3 */
 case OP_Remainder: {           /* same as TK_REM, in1, in2, out3 */
   int flags;
+  applyNumericAffinity(pIn1);
+  applyNumericAffinity(pIn2);
   flags = pIn1->flags | pIn2->flags;
   if( (flags & MEM_Null)!=0 ) goto arithmetic_result_is_null;
   if( (pIn1->flags & pIn2->flags & MEM_Int)==MEM_Int ){

diff --git a/test/expr.test b/test/expr.test
index 4e54f4d1cc8e7e7f8b69a35668e723c23425b5e5..205af0d7591430590369fac2b2b167fd8926136e 100644 (file)
--- a/test/expr.test
+++ b/test/expr.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing expressions.
 #
-# $Id: expr.test,v 1.63 2008/07/15 00:27:35 drh Exp $
+# $Id: expr.test,v 1.64 2008/07/30 13:27:11 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -703,4 +703,45 @@ do_test expr-13.1 {
   }
 } {1.23456789012346e+19}
 
+# Implicit String->Integer conversion is used when possible.
+#
+do_test expr-13.2 {
+  execsql {
+    SELECT 0+'9223372036854775807'
+  }
+} {9223372036854775807}
+do_test expr-13.3 {
+  execsql {
+    SELECT '9223372036854775807'+0
+  }
+} {9223372036854775807}
+
+# If the value is too large, use String->Float conversion.
+#
+do_test expr-13.4 {
+  execsql {
+    SELECT 0+'9223372036854775808'
+  }
+} {9.22337203685478e+18}
+do_test expr-13.5 {
+  execsql {
+    SELECT '9223372036854775808'+0
+  }
+} {9.22337203685478e+18}
+
+# Use String->float conversion if the value is explicitly a floating
+# point value.
+#
+do_test expr-13.6 {
+  execsql {
+    SELECT 0+'9223372036854775807.0'
+  }
+} {9.22337203685478e+18}
+do_test expr-13.7 {
+  execsql {
+    SELECT '9223372036854775807.0'+0
+  }
+} {9.22337203685478e+18}
+
+
 finish_test