From: drh <>
Date: Wed, 15 Nov 2023 20:32:06 +0000 (+0000)
Subject: Both json_remove() jsonb_remove() work on pure JSONB as long as the input
X-Git-Tag: version-3.45.0~116^2~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11e8242e2eec9172d2c47157900638f568813736;p=thirdparty%2Fsqlite.git

Both json_remove() jsonb_remove() work on pure JSONB as long as the input
is JSONB.

FossilOrigin-Name: 68d551730be0a3ea9579646ed4836c73554c83ca7f2303b69a18843f1750f1a7
---

diff --git a/manifest b/manifest
index a211f0b659..9b3331efef 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Some\ssimple\stest\scases\sfor\sJSONB\sdirect\sremove.
-D 2023-11-15T19:21:09.380
+C Both\sjson_remove()\sjsonb_remove()\swork\son\spure\sJSONB\sas\slong\sas\sthe\sinput\nis\sJSONB.
+D 2023-11-15T20:32:06.379
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -685,7 +685,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 a647820e1e82fd516df80328ef3372209006bf99b7008d156411c8cd0d4d9fc4
+F src/json.c 949c4a36244d402d1e5f9c1815d9ce2cf8e94cf27ce7419e2d1b9dd5a97a2baa
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -1329,7 +1329,7 @@ F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba01143
 F test/json105.test 11670a4387f4308ae0318cadcbd6a918ea7edcd19fbafde020720a073952675d
 F test/json501.test c419deb835b70c1a2c8532936927bcc1146730328edd2052276715bfd209724d
 F test/json502.test 98c38e3c4573841028a1381dfb81d4c3f9b105d39668167da10d055e503f6d0b
-F test/jsonb01.test 830e87e012518aa0bf4358ed794fe40cbf0743247d5ade273223064547cb1ceb
+F test/jsonb01.test cace70765b36a36aec9a85a41ea65667d3bbf647d4400ddc3ac76f8fe7d94f90
 F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
 F test/kvtest.c 6e0228409ea7ca0497dad503fbd109badb5e59545d131014b6aaac68b56f484a
 F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
@@ -2142,8 +2142,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 5207679e929786e577a0553d0d84dda5125456dcde80c0f3156f14f4d8c804cb
-R 76eca9722da06337c910d0b8ea9ca3cc
+P 8cb4d2cbfc1b5f3c612d85138e66da8735d6589c7538fdf494a761c9b8104f18
+R 17bf060181dd906a53600b2c931378c9
 U drh
-Z 9b402027f08ff9f924d703e81b5baa92
+Z a169b712ea2dc449ca00887f2092a50b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1e29b18d5e..94af86d981 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8cb4d2cbfc1b5f3c612d85138e66da8735d6589c7538fdf494a761c9b8104f18
\ No newline at end of file
+68d551730be0a3ea9579646ed4836c73554c83ca7f2303b69a18843f1750f1a7
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index fa7913d944..89109e0039 100644
--- a/src/json.c
+++ b/src/json.c
@@ -4265,7 +4265,9 @@ static void jsonRemoveFromBlob(
   int i;
   u32 rc;
   const char *zPath = 0;
+  int flgs;
   JsonParse px;
+
   memset(&px, 0, sizeof(px));
   px.nBlob = sqlite3_value_bytes(argv[0]);
   px.aBlob = (u8*)sqlite3_value_blob(argv[0]);
@@ -4283,8 +4285,17 @@ static void jsonRemoveFromBlob(
     if( rc==JSON_BLOB_NOTFOUND ) continue;
     if( JSON_BLOB_ISERROR(rc) ) goto jsonRemoveFromBlob_patherror;
   }
-  sqlite3_result_blob(ctx, px.aBlob, px.nBlob,
-                      px.nBlobAlloc>0 ? SQLITE_DYNAMIC : SQLITE_TRANSIENT);
+  flgs = SQLITE_PTR_TO_INT(sqlite3_user_data(ctx));
+  if( flgs & JSON_BLOB ){
+    sqlite3_result_blob(ctx, px.aBlob, px.nBlob,
+                        px.nBlobAlloc>0 ? SQLITE_DYNAMIC : SQLITE_TRANSIENT);
+  }else{
+    JsonString s;
+    jsonStringInit(&s, ctx);
+    jsonXlateBlobToText(&px, 0, &s);
+    jsonReturnString(&s);
+    if( px.nBlobAlloc ) sqlite3_free(px.aBlob);
+  }
   return;
 
 jsonRemoveFromBlob_patherror:
@@ -4834,9 +4845,7 @@ static void jsonRemoveFunc(
   u32 i;
 
   if( argc<1 ) return;
-  if( jsonFuncArgMightBeBinary(argv[0])
-   && (SQLITE_PTR_TO_INT(sqlite3_user_data(ctx))&JSON_BLOB)!=0
-  ){
+  if( jsonFuncArgMightBeBinary(argv[0]) ){
     jsonRemoveFromBlob(ctx, argc, argv);
     return;
   }
diff --git a/test/jsonb01.test b/test/jsonb01.test
index a01a96f558..d1b53ae6cc 100644
--- a/test/jsonb01.test
+++ b/test/jsonb01.test
@@ -38,9 +38,12 @@ foreach {id path res} {
  17 {$.c[#-5]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,3,4]}}}
  18 {$.c[#-6]}  {{{"a":5,"b":{"x":10,"y":11},"c":[1,2,3,4]}}}
 } {
-  do_execsql_test jsonb01-1.2.$id {
+  do_execsql_test jsonb01-1.2.$id.1 {
     SELECT json(jsonb_remove(x,$path)) FROM t1;
   } $res
+  do_execsql_test jsonb01-1.2.$id.2 {
+    SELECT json_remove(x,$path) FROM t1;
+  } $res
 }
 
 finish_test