From: mistachkin <mistachkin@noemail.net>
Date: Sat, 31 Aug 2013 21:41:09 +0000 (+0000)
Subject: Handle BLOBs specially, treating them as binary, in the tointeger() and toreal()... 
X-Git-Tag: version-3.8.1~11^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05b1ba1e3fe57eba290419729d6e4eaa4fa6ac32;p=thirdparty%2Fsqlite.git

Handle BLOBs specially, treating them as binary, in the tointeger() and toreal() SQL functions.

FossilOrigin-Name: c4c53acb985a248c89db2d75025d941e3a4899bc
---

diff --git a/manifest b/manifest
index 09f33e19c2..e7f15964da 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sseveral\storeal()\stests\sthat\srequire\shigh\sfloating\spoint\sprecision\swhen\sit\sis\sunavailable.
-D 2013-08-29T02:27:39.369
+C Handle\sBLOBs\sspecially,\streating\sthem\sas\sbinary,\sin\sthe\stointeger()\sand\storeal()\sSQL\sfunctions.
+D 2013-08-31T21:41:09.620
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -175,7 +175,7 @@ F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
 F src/expr.c 4d89bd03a04fcdb5ff71d86b4e0cc7d3230797b8
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
-F src/func.c 5c85fed36b47a484e8b85c6528348f83ec5f8855
+F src/func.c ed294cd9437881cb7e2fbece2ea3389fc80c9fc7
 F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759
 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
 F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
@@ -1109,7 +1109,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 047bd1c24553b00ccf12d7745bb4c46820b91f5e
-R 23d92ec42ac516cd6bc59a2369e868fb
+P b724219b008d9851de18bd4158375100d781c5a3
+R eb3d216eeef911fedebe51f6e14ce498
 U mistachkin
-Z 305c9d921855a6e7bed35ab5c2575022
+Z 1633034cbe064c087ca5481033ebadfd
diff --git a/manifest.uuid b/manifest.uuid
index abd3892813..4503ca3dd4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b724219b008d9851de18bd4158375100d781c5a3
\ No newline at end of file
+c4c53acb985a248c89db2d75025d941e3a4899bc
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index fb999c9f98..31b96d4a9c 100644
--- a/src/func.c
+++ b/src/func.c
@@ -990,7 +990,18 @@ static void tointegerFunc(
       sqlite3_result_int64(context, sqlite3_value_int64(argv[0]));
       break;
     }
-    case SQLITE_BLOB:
+    case SQLITE_BLOB: {
+      const unsigned char *zBlob = sqlite3_value_blob(argv[0]);
+      if( zBlob ){
+        int nBlob = sqlite3_value_bytes(argv[0]);
+        if( nBlob==sizeof(i64) ){
+          i64 iVal;
+          memcpy(&iVal, zBlob, sizeof(i64));
+          sqlite3_result_int64(context, iVal);
+        }
+      }
+      break;
+    }
     case SQLITE_TEXT: {
       const unsigned char *zStr = sqlite3_value_text(argv[0]);
       if( zStr ){
@@ -1038,7 +1049,18 @@ static void torealFunc(
       }
       break;
     }
-    case SQLITE_BLOB:
+    case SQLITE_BLOB: {
+      const unsigned char *zBlob = sqlite3_value_blob(argv[0]);
+      if( zBlob ){
+        int nBlob = sqlite3_value_bytes(argv[0]);
+        if( nBlob==sizeof(double) ){
+          double rVal;
+          memcpy(&rVal, zBlob, sizeof(double));
+          sqlite3_result_double(context, rVal);
+        }
+      }
+      break;
+    }
     case SQLITE_TEXT: {
       const unsigned char *zStr = sqlite3_value_text(argv[0]);
       if( zStr ){