Fix for ticket #65: If an integer value is too big to be represented as a

32-bit integer, then treat it as a string. (CVS 611)

FossilOrigin-Name: ad9624798edbd6d0c4652fed3d74fe87498844ff

diff --git a/manifest b/manifest
index fc60bfd35789b6729c717ec33b63c60fb7e8dbbf..797996662b4d3cb445ec7365478e4190d6174e9e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\soptimizations\sfor\sthe\sIN\soperator\sin\sWHERE\sclauses.\s\sThis\sis\sa\spartial\nimplementation\sof\senhancement\s#63.\s\sStill\sneed\sto\sadd\stest\scases.\s(CVS\s610)
-D 2002-06-08T23:25:09
+C Fix\sfor\sticket\s#65:\sIf\san\sinteger\svalue\sis\stoo\sbig\sto\sbe\srepresented\sas\sa\n32-bit\sinteger,\sthen\streat\sit\sas\sa\sstring.\s(CVS\s611)
+D 2002-06-09T01:16:01
 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
 F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -23,7 +23,7 @@ F src/btree.h 8abeabfe6e0b1a990b64fa457592a6482f6674f3
 F src/build.c 36e42718a7a94f554ea39508993378482f5335c7
 F src/delete.c a2b098cbbf518e6b641847e26de85827793bc523
 F src/encode.c 346b12b46148506c32038524b95c4631ab46d760
-F src/expr.c 8ce9c22655735ff62b1e33ab11ad9d44c4ab99c6
+F src/expr.c cd2e3311c84533fad19336d3bbfdc3be3400d377
 F src/func.c 061a520a122da7e4f9dcac15697bb996aac7d5df
 F src/hash.c 6a6236b89c8c060c65dabd300a1c8ce7c10edb72
 F src/hash.h cd0433998bc1a3759d244e1637fe5a3c13b53bf8
@@ -77,7 +77,7 @@ F test/lock.test 3fcfd46a73119f6a18094673328a32c7b3047a8f
 F test/main.test c66b564554b770ee7fdbf6a66c0cd90329bc2c85
 F test/malloc.test 7ba32a9ebd3aeed52ae4aaa6d42ca37e444536fd
 F test/minmax.test 29bc5727c3e4c792d5c4745833dd4b505905819e
-F test/misc1.test 87490d33b36022610d1e56d1bd5c5b1edfebe753
+F test/misc1.test faae0b01cce45a75fe8011b1f462c3ef36fb9bda
 F test/misuse.test a3aa2b18a97e4c409a1fcaff5151a4dd804a0162
 F test/notnull.test b1f3e42fc475b0b5827b27b2e9b562081995ff30
 F test/null.test 5c2b57307e4b6178aae825eb65ddbee01e76b0fd
@@ -136,7 +136,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P d939294994e5f6c7862b66573301e111e56a2681
-R 3ccd9ba147258740a1a4d6ac8604b91f
+P 8481e841ebdeabe07bf780246bda1aa053eb60b7
+R 6174dd4e5dfa7253bbd8e3c34a08582a
 U drh
-Z 0bb147d1fd50388db4609fcd1f1c4973
+Z 84f663882ed0b11c01ed6267485637fc

diff --git a/manifest.uuid b/manifest.uuid
index f32749e1d564dac991ecf2bc2bb804655e8cd336..6a92bc920c889f0fe714283034061a442df6f14d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8481e841ebdeabe07bf780246bda1aa053eb60b7
\ No newline at end of file
+ad9624798edbd6d0c4652fed3d74fe87498844ff
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 51d1951b44087f150bdb83eac128dcdaeb52e526..fdd1ad4281cea5a373e9ce068e344074615cf9d8 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.69 2002/06/02 18:22:06 drh Exp $
+** $Id: expr.c,v 1.70 2002/06/09 01:16:01 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -824,7 +824,17 @@ void sqliteExprCode(Parse *pParse, Expr *pExpr){
       break;
     }
     case TK_INTEGER: {
-      sqliteVdbeAddOp(v, OP_Integer, atoi(pExpr->token.z), 0);
+      int iVal = atoi(pExpr->token.z);
+      char zBuf[30];
+      sprintf(zBuf,"%d",iVal);
+      if( strlen(zBuf)!=pExpr->token.n 
+            || strncmp(pExpr->token.z,zBuf,pExpr->token.n)!=0 ){
+        /* If the integer value cannot be represented exactly in 32 bits,
+        ** then code it as a string instead. */
+        sqliteVdbeAddOp(v, OP_String, 0, 0);
+      }else{
+        sqliteVdbeAddOp(v, OP_Integer, iVal, 0);
+      }
       sqliteVdbeChangeP3(v, -1, pExpr->token.z, pExpr->token.n);
       break;
     }

diff --git a/test/misc1.test b/test/misc1.test
index 224622b721679e6cd5b710c9dc12b7cc6cd89599..2ded00d6d4c8a6c642f5c0b65a6f62bf221a1848 100644 (file)
--- a/test/misc1.test
+++ b/test/misc1.test
@@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc1.test,v 1.7 2002/06/06 23:42:28 drh Exp $
+# $Id: misc1.test,v 1.8 2002/06/09 01:16:01 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -238,5 +238,25 @@ do_test misc1-8.2 {
   }
 } {1 {no such table: t1}}
 
+execsql {
+  DROP TABLE t1;
+  DROP TABLE t2;
+  DROP TABLE t3;
+  DROP TABLE t4;
+}
+
+# If an integer is too big to be represented as a 32-bit machine integer,
+# then treat it as a string.
+#
+do_test misc1-9.1 {
+  catchsql {
+    CREATE TABLE t1(a unique not null, b unique not null);
+    INSERT INTO t1 VALUES('a',12345678901234567890);
+    INSERT INTO t1 VALUES('b',12345678911234567890);
+    INSERT INTO t1 VALUES('c',12345678921234567890);
+    SELECT * FROM t1;
+  }
+} {0 {a 12345678901234567890 b 12345678911234567890 c 12345678921234567890}}
+
 
 finish_test