From: drh <>
Date: Fri, 29 Sep 2023 22:37:18 +0000 (+0000)
Subject: Update json_each() and json_tree() so that they work with JSONB inputs.
X-Git-Tag: version-3.45.0~116^2~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5736ba5ac3a2c4e4a9735f5b35ce0f4dc76c5f14;p=thirdparty%2Fsqlite.git

Update json_each() and json_tree() so that they work with JSONB inputs.

FossilOrigin-Name: bb5e50ff56dff95d954aacdd4c5461790f953cef8d7b89da000d8d587fcdf9b8
---

diff --git a/manifest b/manifest
index 97725044f7..96d7117b35 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\su.zJContent\sfield\sof\sJsonNode\sfor\sa\sstring\sor\slabel\sshould\sNOT\sinclude\nthe\squotation\smark\sdelimiters.\s\sEver.\s\sThis\sis\san\sinefficiency\sthat\sreally\nought\sto\sbe\sfixed\son\strunk,\sbut\sthat\scan\swait\suntil\sthis\sbranch\slands.
-D 2023-09-29T19:47:25.994
+C Update\sjson_each()\sand\sjson_tree()\sso\sthat\sthey\swork\swith\sJSONB\sinputs.
+D 2023-09-29T22:37:18.176
 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 2112b76a0d0ed938df844dcac57170ef825c6fb92f0bb1e2c35360d77fa8abbd
+F src/json.c 50fb4f1c25eb749e0186fe68f095325d40ebe59aa3a53063f00f382cfd2c36fd
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@ -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 45dd1760875b1ad899a10189c6f5a0a9a0677903794fb5a06ffacd39952a7882
-R 0ad6f1d70a03e9858beb1d83ab248cfc
+P 96f545f6f839dab4829861361ee3d7a56840217c5f954f334616e77d23c5fe29
+R 9027bab5f11df4bc07814add94e083b5
 U drh
-Z ecabd724f6e30a2efa3505d39eb1f7e4
+Z d0258d856fbcf0571a1fd4c95a27f4d8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index fd367b5df4..a8c16bbd39 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-96f545f6f839dab4829861361ee3d7a56840217c5f954f334616e77d23c5fe29
\ No newline at end of file
+bb5e50ff56dff95d954aacdd4c5461790f953cef8d7b89da000d8d587fcdf9b8
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 9b988c1b66..a790157a50 100644
--- a/src/json.c
+++ b/src/json.c
@@ -5402,12 +5402,19 @@ static int jsonEachFilter(
   const char *z;
   const char *zRoot = 0;
   sqlite3_int64 n;
+  int isBinary;
 
   UNUSED_PARAMETER(idxStr);
   UNUSED_PARAMETER(argc);
   jsonEachCursorReset(p);
   if( idxNum==0 ) return SQLITE_OK;
-  z = (const char*)sqlite3_value_text(argv[0]);
+  if( jsonFuncArgMightBeBinary(argv[0]) ){
+    z = (const char*)sqlite3_value_blob(argv[0]);
+    isBinary = 1;
+  }else{
+    z = (const char*)sqlite3_value_text(argv[0]);
+    isBinary = 0;
+  }
   if( z==0 ) return SQLITE_OK;
   memset(&p->sParse, 0, sizeof(p->sParse));
   p->sParse.nJPRef = 1;
@@ -5417,9 +5424,11 @@ static int jsonEachFilter(
     n = sqlite3_value_bytes(argv[0]);
     p->sParse.zJson = sqlite3RCStrNew( n+1 );
     if( p->sParse.zJson==0 ) return SQLITE_NOMEM;
-    memcpy(p->sParse.zJson, z, (size_t)n+1);
+    memcpy(p->sParse.zJson, z, (size_t)n+(isBinary==0));
+    p->sParse.nJson = n;
   }
   p->sParse.bJsonIsRCStr = 1;
+  p->sParse.isBinary = isBinary;
   p->zJson = p->sParse.zJson;
   if( jsonParse(&p->sParse, 0) ){
     int rc = SQLITE_NOMEM;