Allow json_replace() to accept JSONB arguments as the new value.

FossilOrigin-Name: 95eb7b37fab29931924311f541d52173ef77a448efc8771b1a1783ccd786d23d

diff --git a/manifest b/manifest
index b0b1b78488ffb494ea70cedee60b1f90591a4d1a..d67b7d412c3e2c30ce864404f7adba8876fe86f9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\serror\shandling\sfor\sBLOB\sinputs\son\sJSON.
-D 2023-10-02T13:20:43.907
+C Allow\sjson_replace()\sto\saccept\sJSONB\sarguments\sas\sthe\snew\svalue.
+D 2023-10-02T13:35:06.348
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -670,7 +670,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 057ce1f7bcf30abb8e0418e8b84892e6cda66e0fcac45465574ea3f2e37d6f85
+F src/json.c 643f1553f9a704ea558937b16831d26f9db90dd97e05d77cfef984f84af37564
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@ -1303,7 +1303,7 @@ F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd286
 F test/json/json-q1-b.txt 606818a5fba6d9e418c9f4ea7d8418af026775042dad81439b72447a147a462c
 F test/json/json-q1.txt 65f9d1cdcc4cffa9823fb73ed936aae5658700cd001fde448f68bfb91c807307
 F test/json/json-speed-check.sh b060a9a6c696c0a807d8929400fa11bd7113edc58b0d66b9795f424f8d0db326 x
-F test/json101.test da33cc6d114e82228fc56b6b2700b2fc2c352636aeca59cb157fc6237df688af
+F test/json101.test 54b27bd681ce3fe33629b58fecdba2502d0ce8d445f69a155dbd9861a868ea27
 F test/json102.test 4c69694773a470f1fda34e5f4ba24920b35184fb66050b450fc2ef9ab5ad310b
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
@@ -2123,8 +2123,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 c352201b8c299c330d9abbff6dbcbcbcf00ada53183d3cd91020ec772e066357
-R f0da6e230789d1a4973c52d698202614
+P 14f20ecbfab44934e86f1ac7a3f745b989aa8190c6df119ff5aa8100fa248d93
+R cc5fa69b041d057bb643a7cdf2281f1c
 U drh
-Z 0e4cae102419e8824f19fd85f33d7b9c
+Z 2b0bdbc85e19cadd323c6d81b0285ad4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 348760d2b211bd83223dc4e1c078a20d103cd279..7c8b3403e2876a294cb54c31f455491f98f641f4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14f20ecbfab44934e86f1ac7a3f745b989aa8190c6df119ff5aa8100fa248d93
\ No newline at end of file
+95eb7b37fab29931924311f541d52173ef77a448efc8771b1a1783ccd786d23d
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 1c7693df7ac03c7dbf6b9e143d5805e12b54abdf..c7bf260c9c897375939bc83e87df877525a2dc9d 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -4620,7 +4620,10 @@ static void jsonReplaceNode(
         k = jsonParseAddNode(p, JSON_STRING, n, zCopy);
         assert( k>0 || p->oom );
         if( p->oom==0 ) p->aNode[k].jnFlags |= JNODE_RAW;
-      }else{
+        break;
+      }
+    replace_with_json:
+      {
         JsonParse *pPatch = jsonParseCached(pCtx, pValue, pCtx, 1);
         if( pPatch==0 ){
           p->oom = 1;
@@ -4637,9 +4640,13 @@ static void jsonReplaceNode(
       break;
     }
     default: {
-      jsonParseAddNode(p, JSON_NULL, 0, 0);
-      sqlite3_result_error(pCtx, "JSON cannot hold BLOB values", -1);
-      p->nErr++;
+      if( jsonFuncArgMightBeBinary(pValue) ){
+        goto replace_with_json;
+      }else{
+        jsonParseAddNode(p, JSON_NULL, 0, 0);
+        sqlite3_result_error(pCtx, "JSON cannot hold BLOB values", -1);
+        p->nErr++;
+      }
       break;
     }
   }

diff --git a/test/json101.test b/test/json101.test
index 5bf66356018262400445c0137e0396f702b41c13..a6fec19507c1e9cd04cb42cd1f7cd0f22e4b543c 100644 (file)
--- a/test/json101.test
+++ b/test/json101.test
@@ -99,9 +99,15 @@ do_execsql_test json101-2.5 {
 do_execsql_test json101-3.1 {
   SELECT json_replace('{"a":1,"b":2}','$.a','[3,4,5]');
 } {{{"a":"[3,4,5]","b":2}}}
+do_execsql_test json101-3.1b {
+  SELECT json(jsonb_replace('{"a":1,"b":2}','$.a','[3,4,5]'));
+} {{{"a":"[3,4,5]","b":2}}}
 do_execsql_test json101-3.2 {
   SELECT json_replace('{"a":1,"b":2}','$.a',json('[3,4,5]'));
 } {{{"a":[3,4,5],"b":2}}}
+do_execsql_test json101-3.2b {
+  SELECT json_replace('{"a":1,"b":2}','$.a',jsonb('[3,4,5]'));
+} {{{"a":[3,4,5],"b":2}}}
 do_execsql_test json101-3.3 {
   SELECT json_type(json_set('{"a":1,"b":2}','$.b','{"x":3,"y":4}'),'$.b');
 } {text}