From: drh <drh@noemail.net>
Date: Mon, 25 Aug 2014 22:37:19 +0000 (+0000)
Subject: Add an assert() and five testcase() macros to the OP_Cast opcode implementation
X-Git-Tag: version-3.8.7~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05bbb2e824df2af559aaf301a4a44f16c080ffc8;p=thirdparty%2Fsqlite.git

Add an assert() and five testcase() macros to the OP_Cast opcode implementation
to help verify that it is fully tested.

FossilOrigin-Name: af364cce9da0961593ef876b646197f82df08ad5
---

diff --git a/manifest b/manifest
index 192b84c230..a75c4cd6f7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\schanges\sto\sthe\sCAST\slogic\sto\smake\sit\smore\stestable.
-D 2014-08-25T21:11:01.892
+C Add\san\sassert()\sand\sfive\stestcase()\smacros\sto\sthe\sOP_Cast\sopcode\simplementation\nto\shelp\sverify\sthat\sit\sis\sfully\stested.
+D 2014-08-25T22:37:19.150
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -284,7 +284,7 @@ F src/update.c ea336ce7b8b3fc5e316ba8f082e6445babf81059
 F src/utf.c 77abb5e6d27f3d236e50f7c8fff1d00e15262359
 F src/util.c 068dcd26354a3898ccc64ad5c4bdb95a7a15d33a
 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
-F src/vdbe.c 2b3420d22410089b95a1555872dbc35183927a25
+F src/vdbe.c 2f8fbc520cac2f5bacc43de2aeed6a4880c9cb57
 F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 F src/vdbeInt.h df58400454823954cfb241e5858f07f37fc1fd78
 F src/vdbeapi.c cda974083d7597f807640d344ffcf76d872201ce
@@ -1188,7 +1188,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 42505e5a810832442699ca54a46637c50e7f9e71
-R 64d7800c0b3c56b546428f1dfa98a8bd
+P 1ad70ec550c004160d9c0c57e6c416812cdead5e
+R b751a4133861a7b502aa405ba96eea49
 U drh
-Z 2062d1773620f0a49c6fdbe873cdd5f6
+Z 0bd8a75e39f468a6e4b9b4599a579487
diff --git a/manifest.uuid b/manifest.uuid
index e6aa85bdb1..c36f309914 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1ad70ec550c004160d9c0c57e6c416812cdead5e
\ No newline at end of file
+af364cce9da0961593ef876b646197f82df08ad5
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index ec2b64f770..5d440d825b 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1783,6 +1783,12 @@ case OP_RealAffinity: {                  /* in1 */
 ** A NULL value is not changed by this routine.  It remains NULL.
 */
 case OP_Cast: {                  /* in1 */
+  assert( pOp->p2>=SQLITE_AFF_TEXT && pOp->p2<=SQLITE_AFF_REAL );
+  testcase( pOp->p2==SQLITE_AFF_TEXT );
+  testcase( pOp->p2==SQLITE_AFF_NONE );
+  testcase( pOp->p2==SQLITE_AFF_NUMERIC );
+  testcase( pOp->p2==SQLITE_AFF_INTEGER );
+  testcase( pOp->p2==SQLITE_AFF_REAL );
   pIn1 = &aMem[pOp->p1];
   memAboutToChange(p, pIn1);
   rc = ExpandBlob(pIn1);