From: drh <>
Date: Mon, 18 Dec 2023 18:31:27 +0000 (+0000)
Subject: Fix JSON to JSONB translation so that it deals correctly with Infinity
X-Git-Tag: version-3.45.0~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc76750f616a8ceadc9988de67e065b6e274547a;p=thirdparty%2Fsqlite.git

Fix JSON to JSONB translation so that it deals correctly with Infinity
and NaN.

FossilOrigin-Name: 178cb84f36bdb45ba17511900d6d8ea8dfa14912fc5bf7094a20348174a36c95
---

diff --git a/manifest b/manifest
index 3d39d056ef..3b2af6b615 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\sinsert/delete\ssize\sdelta\son\sJSONB\sobjects\sin\sthe\sJSON\scache\nare\salways\sset\sto\szero.
-D 2023-12-18T15:53:48.421
+C Fix\sJSON\sto\sJSONB\stranslation\sso\sthat\sit\sdeals\scorrectly\swith\sInfinity\nand\sNaN.
+D 2023-12-18T18:31:27.729
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -696,7 +696,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
-F src/json.c 953ac749c4d348ddbcbb2851a66188d6ff9928ddc1daa7a56f8555fc1cecb806
+F src/json.c f405fac347de6f1fb5fa1eb92616499dd333992f4db524e7bef4604899bf20ba
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c ce714ee501122c76eb2e69b292bebe443aba611fc3b88e6786eb910285515fe4
@@ -1339,7 +1339,7 @@ F test/json102.test 557a46e16df1aa9bdbc4076a71a45814ea0e7503d6621d87d42a8c04cbc2
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
 F test/json105.test 043838b56e68f3252a0dcf5be1689016f6f3f05056f8dcfcdc9d074f4d932988
-F test/json106.test 71008c4341539445e85a6124dc77a2938c9a9b175af30826a50975e8fe79a8dc
+F test/json106.test 461e02e1f0cd2d5be1954c8888d2e771c2adf46df4c075b6c5da1bde66eed010
 F test/json501.test ab168a12eb6eb14d479f8c1cdae3ac062fd5a4679f17f976e96f1af518408330
 F test/json502.test 84634d3dbb521d2814e43624025b760c6198456c8197bbec6c977c0236648f5b
 F test/jsonb01.test cace70765b36a36aec9a85a41ea65667d3bbf647d4400ddc3ac76f8fe7d94f90
@@ -2155,8 +2155,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f1c040606bfe784804134d8f3ca130908fad5212b47e3c32792baab977470943
-R 01dea41071f1e54cd13e89135ed2f4ac
+P 4b4581668a908473dbf1322a3e98bc7cca122998c44518ea183af7f0d1ba9f95
+R 9c86ed12e78ae744d874c37c356e4dab
 U drh
-Z 65bb882629df28755f3c8ef3dc1544eb
+Z ffac4918f7e206860fa3115d6182bb2e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3f29a4333a..52924a1d55 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4b4581668a908473dbf1322a3e98bc7cca122998c44518ea183af7f0d1ba9f95
\ No newline at end of file
+178cb84f36bdb45ba17511900d6d8ea8dfa14912fc5bf7094a20348174a36c95
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 2756590eb7..b4b9d8f81e 100644
--- a/src/json.c
+++ b/src/json.c
@@ -3041,13 +3041,29 @@ static int jsonFunctionArgToBlob(
       }
       break;
     }
-    case SQLITE_FLOAT:
+    case SQLITE_FLOAT: {
+      double r = sqlite3_value_double(pArg);
+      if( sqlite3IsNaN(r) ){
+        jsonBlobAppendNode(pParse, JSONB_NULL, 0, 0);
+      }else{
+        int n = sqlite3_value_bytes(pArg);
+        const char *z = (const char*)sqlite3_value_text(pArg);
+        if( z==0 ) return 1;
+        if( z[0]=='I' ){
+          jsonBlobAppendNode(pParse, JSONB_FLOAT, 5, "9e999");
+        }else if( z[0]=='-' && z[1]=='I' ){
+          jsonBlobAppendNode(pParse, JSONB_FLOAT, 6, "-9e999");
+        }else{
+          jsonBlobAppendNode(pParse, JSONB_FLOAT, n, z);
+        }
+      }
+      break;
+    }
     case SQLITE_INTEGER: {
       int n = sqlite3_value_bytes(pArg);
       const char *z = (const char*)sqlite3_value_text(pArg);
-      int e = eType==SQLITE_INTEGER ? JSONB_INT : JSONB_FLOAT;
       if( z==0 ) return 1;
-      jsonBlobAppendNode(pParse, e, n, z);
+      jsonBlobAppendNode(pParse, JSONB_INT, n, z);
       break;
     }
   }
diff --git a/test/json106.test b/test/json106.test
index e5a1ac5bc4..ba70d8af5f 100644
--- a/test/json106.test
+++ b/test/json106.test
@@ -18,6 +18,7 @@ set testprefix json106
 load_static_extension db randomjson
 db eval {
   CREATE TEMP TABLE t1(j0,j5);
+  CREATE TEMP TABLE kv(n,key,val);
 }
 unset -nocomplain ii
 for {set ii 1} {$ii<=5000} {incr ii} {
@@ -38,6 +39,25 @@ for {set ii 1} {$ii<=5000} {incr ii} {
      WHERE rt.type NOT IN ('object','array')
        AND rt.atom IS NOT (j0 ->> rt.fullkey);
   } 0
+  do_execsql_test $ii.4 {
+    DELETE FROM kv;
+    INSERT INTO kv
+      SELECT rt.rowid, rt.fullkey, rt.atom
+        FROM t1, json_tree(j0) AS rt
+       WHERE rt.type NOT IN ('object','array');
+  }
+  do_execsql_test $ii.5 {
+    SELECT count(*)
+      FROM t1, kv
+     WHERE key NOT LIKE '%]'
+       AND json_remove(j5,key)->>key IS NOT NULL
+  } 0
+  do_execsql_test $ii.6 {
+    SELECT count(*)
+      FROM t1, kv
+     WHERE key NOT LIKE '%]'
+       AND json_insert(json_remove(j5,key),key,val)->>key IS NOT val
+  } 0
 }