Fix problems in the "json" output column of the json_tree() virtual table

for the case when the input is JSONB.

FossilOrigin-Name: fefa4475c496aab32fe7b9cc203747ce4faf7448da4f29b807e5486c7686238d

diff --git a/manifest b/manifest
index 40a49f1c4883658ba21835f02fdfed34e13ffbec..fd92509288f82cfd58694b087f79bd066c971dca 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\shandling\sof\sOOM\swhile\stranslating\sthe\sJsonNode\srepresenting\sinto\nthe\sBLOB\srepresentation.
-D 2023-10-03T19:37:19.514
+C Fix\sproblems\sin\sthe\s"json"\soutput\scolumn\sof\sthe\sjson_tree()\svirtual\stable\nfor\sthe\scase\swhen\sthe\sinput\sis\sJSONB.
+D 2023-10-03T20:58:39.820
 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 6a6437fce0eb558b05fc30c1d806ee342e99ccb2dcae1f53b038c60572f84383
+F src/json.c 6b11a18b09250869464c7b0e025e76c8697366a2a1e88459ee6ce1e189064332
 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 e6406a9865b75dea2f26d3ee4f4c206958400059c7f92ced88edc8507dd3c82f
-R a18f64bf40d3960df89ef1dde4bf90eb
+P ef5956710bb542d6045c82937d02218a7ed45af94cf3959b0c180268e04d14e1
+R dc84d245e8ee185581c160d484d587e1
 U drh
-Z d1b86d452a43e36a5aedf44b0fbb363f
+Z 9c1148fb20ac73a79d87122df2949595
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index bea2bfc71fea1c0d2913f56a7f4479d769177695..e9a8f2071a335d10944e1dcbca9572921454e9c8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef5956710bb542d6045c82937d02218a7ed45af94cf3959b0c180268e04d14e1
\ No newline at end of file
+fefa4475c496aab32fe7b9cc203747ce4faf7448da4f29b807e5486c7686238d
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index c4d874309f8fbbf6738d8087f0ef0267618bb519..967a3af00624a24470066e5f0dd2521ce9b918f3 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -3514,7 +3514,6 @@ static int jsonParseValueFromBlob(JsonParse *pParse, u32 i){
       break;
     }
   }
-  pParse->aBlob[i] = 0;
   return i+x+sz;
 }
 
@@ -5356,8 +5355,12 @@ static int jsonEachColumn(
       break;
     }
     case JEACH_JSON: {
-      assert( i==JEACH_JSON );
-      sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
+      if( p->sParse.isBinary ){
+        sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob,
+                            SQLITE_STATIC);
+      }else{
+        sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
+      }
       break;
     }
   }