Tighten the conditions under which applyNumericAffinity() be called and add

assert() statements to prove that it is never called otherwise.

FossilOrigin-Name: e996ca32cb643c558b616c0dd872f3351b6aa3ef

diff --git a/manifest b/manifest
index 3bf4c484b9568c3ede72331ee43d00833e71584e..e2e61762cfa87ed024fa9354b0e9099775a3c0fd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\saffinity\son\sinserts\sinto\sthe\sANALYZE\stables.\s\sChange\sthe\saffinity\ncharacters\sto\sbe\supper\scase,\sto\smake\sthe\sP5\sparameter\sof\scomparison\soperators\neasier\sto\sread.
-D 2014-09-19T20:13:25.422
+C Tighten\sthe\sconditions\sunder\swhich\sapplyNumericAffinity()\sbe\scalled\sand\sadd\nassert()\sstatements\sto\sprove\sthat\sit\sis\snever\scalled\sotherwise.
+D 2014-09-19T22:01:54.366
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -288,7 +288,7 @@ F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
 F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
 F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
-F src/vdbe.c c90b7ebe856beb75077cf4486efc1863de219f34
+F src/vdbe.c 16efd1ae26d877827cd6669f5f19afd8d8903d08
 F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
 F src/vdbeInt.h f177bed1ec8d4eb5c7089f012aeb95f374745735
 F src/vdbeapi.c e9e33b59834e3edc8790209765e069874c269d9d
@@ -1198,7 +1198,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3ab20ba14f0204efeec62c7dbb87cb3f60e2497f
-R 6403cad332b96b991c6e79d4338c8e0a
+P 3f3ca76aea38d566a574f4403b375bdac32854ed
+R fc5d306f71c9e96ead7521f7177e02ff
 U drh
-Z a6ee4447c2926dae75a9d9931c4a5376
+Z cb569a0dfcbf7ed8e3897eb9a80bb15e

diff --git a/manifest.uuid b/manifest.uuid
index 5b0f66cb3cd7c3f4019f53d51a76fad5df937497..3fc1bf721362595e5d5c82cd1b24e1f48b255574 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3f3ca76aea38d566a574f4403b375bdac32854ed
\ No newline at end of file
+e996ca32cb643c558b616c0dd872f3351b6aa3ef
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 9b679c534b173b63f007e854ab6eca53e0469d9a..136b7abae16b791123298b6a1254accec17ffff0 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -242,8 +242,7 @@ static void applyNumericAffinity(Mem *pRec, int bTryForInt){
   double rValue;
   i64 iValue;
   u8 enc = pRec->enc;
-  if( (pRec->flags&MEM_Str)==0 ) return;
-  if( (pRec->flags&(MEM_Int|MEM_Real))!=0 ) return;
+  assert( (pRec->flags & (MEM_Str|MEM_Int|MEM_Real))==MEM_Str );
   if( sqlite3AtoF(pRec->z, &rValue, pRec->n, enc)==0 ) return;
   if( 0==sqlite3Atoi64(pRec->z, &iValue, pRec->n, enc) ){
     pRec->u.i = iValue;
@@ -283,7 +282,7 @@ static void applyAffinity(
              || affinity==SQLITE_AFF_NUMERIC );
     if( (pRec->flags & MEM_Int)==0 ){
       if( (pRec->flags & MEM_Real)==0 ){
-        applyNumericAffinity(pRec,1);
+        if( pRec->flags & MEM_Str ) applyNumericAffinity(pRec,1);
       }else{
         sqlite3VdbeIntegerAffinity(pRec);
       }
@@ -3558,7 +3557,7 @@ case OP_SeekGT: {       /* jump, in3 */
     ** blob, or NULL.  But it needs to be an integer before we can do
     ** the seek, so convert it. */
     pIn3 = &aMem[pOp->p3];
-    if( (pIn3->flags & (MEM_Int|MEM_Real))==0 ){
+    if( (pIn3->flags & (MEM_Int|MEM_Real|MEM_Str))==MEM_Str ){
       applyNumericAffinity(pIn3, 0);
     }
     iKey = sqlite3VdbeIntValue(pIn3);