Allow strings that look like integers to be inserted into IPK columns in a

UTF-16 database. (CVS 1771)

FossilOrigin-Name: e5e39764038311cbb3555b5bd41de2563a89113e

diff --git a/manifest b/manifest
index 8d35391dabc61cd27e86281cf17d6d1f487e6423..3639c7de9df07edaa1d998d8fc9a6242314d4417 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sfixes\sfor\sUTF-16\sdatabases.\s(CVS\s1770)
-D 2004-06-30T02:35:51
+C Allow\sstrings\sthat\slook\slike\sintegers\sto\sbe\sinserted\sinto\sIPK\scolumns\sin\sa\nUTF-16\sdatabase.\s(CVS\s1771)
+D 2004-06-30T02:43:38
 F Makefile.in cb7a9889c38723f72b2506c4236ff30a05ff172b
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -73,7 +73,7 @@ F src/update.c b66b1896c9da54678ba3eff2bf0b4d291a95986a
 F src/utf.c f03535db72bfa09e24202ccdd245f21d2fc65f0a
 F src/util.c 94796d2b31600beee7de426c3946022ef3508d46
 F src/vacuum.c 353c7f69dbeb6738434d81798465cc0698844640
-F src/vdbe.c b1a0357089b2118c9509703ec6208cb75fb08413
+F src/vdbe.c 32039b08701f1c19fcd9b684366cefaa8fabaa72
 F src/vdbe.h 75b241c02431b9c0f16eaa9cdbb34146c6287f52
 F src/vdbeInt.h d83fd7389838453d8392915c21f432014afc99cf
 F src/vdbeapi.c ba3722f45db3d3c3509bf5d24f4f868f4c64449d
@@ -232,7 +232,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 563ba3ac02f64da27ab17f3edbe8e56bfd0293fb
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P b9d5858ca171e11afaeb9712efa0fc1a0e79102b
-R 1713a91d92d6107dcb2c5c63e12187e6
+P 6c5c11e07e157c15cf99078fce2a1bc478e287ce
+R 14246f7d7f22b609d5a0a3a797ff4d4e
 U danielk1977
-Z 23a2baa08de6f312dfc7ecc222823a86
+Z adc7c0dacafe07864f76f8b32f42db60

diff --git a/manifest.uuid b/manifest.uuid
index d8114505e5597c1387e9ea74ec1c9d0fae2d04d4..d2ef6e66e590eebbd969f7db7a25ee09f07fd463 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c5c11e07e157c15cf99078fce2a1bc478e287ce
\ No newline at end of file
+e5e39764038311cbb3555b5bd41de2563a89113e
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 004e07d06612d1ab77b8d4caea54fd738c446be1..442e396ae517e53ad164ef00d31cd6482d7eef4d 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.395 2004/06/30 02:35:51 danielk1977 Exp $
+** $Id: vdbe.c,v 1.396 2004/06/30 02:43:38 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1416,7 +1416,7 @@ case OP_MustBeInt: {
     }
     if( !sqlite3atoi64(pTos->z, &v) ){
       double r;
-      if( !sqlite3IsNumber(pTos->z, 0, db->enc) ){
+      if( !sqlite3IsNumber(pTos->z, 0, SQLITE_UTF8) ){
         goto mismatch;
       }
       Realify(pTos);