Almost working. Path is still not exactly right when Root is defined on

json_tree().

FossilOrigin-Name: 92258246916a9c0d72785964513113848a850dec78bdade8b3f274e410df4e7e

diff --git a/manifest b/manifest
index af86c512c2a24e8abb2b7bae2a350c3a5a2d9be3..8851c060f1a2c1c6081759626ede9c0e64eaf054 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Generate\sthe\sfullkey\sand\spath\scolumns\sof\sjson_tree().
-D 2023-11-25T18:11:11.468
+C Almost\sworking.\s\sPath\sis\sstill\snot\sexactly\sright\swhen\sRoot\sis\sdefined\son\njson_tree().
+D 2023-11-25T19:28:44.393
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -688,7 +688,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 9a5ff28f7b55e83b92eeab9285eb4b0132f11526620565e2d5b81fb84d4e8611
+F src/json.c 617eaedbe44c139f0144f04ecbfa240721462f45d76e715eaacc99e172bf43b0
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2145,8 +2145,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 fded888469565b2a4687185a926bd23fccfbf167c8bebe6c10696fc7f972f41e
-R 90c664426338898baffedf8dcba41bea
+P ffaa468ab8871906121df9ee5ef3dc00129a0086ed9c18831ecda69bf7f71455
+R b82a578143acb9c5e1a084b85e2e99b7
 U drh
-Z e9b6e925dfee6d388855b55f2b458a4c
+Z 1f6ed13fcc3b9ce0d1d8c376c125c482
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index acd1f46af163c7fa70c7be0fe18de8f2ba5fad50..78ef7d1413fbdc9f7b86e95593456e7de1159f3c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffaa468ab8871906121df9ee5ef3dc00129a0086ed9c18831ecda69bf7f71455
\ No newline at end of file
+92258246916a9c0d72785964513113848a850dec78bdade8b3f274e410df4e7e
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index c8269436eb7c8c83ea6b4cd9b0761697c1bb2e0d..2de4c61a12bb705d017c3f29a3b92faaa4bf8457 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -6249,8 +6249,16 @@ static int jsonEachFilter(
     n = jsonbPayloadSize(&p->sParse, i, &sz);
     p->iEnd = i+n+sz;
     if( (p->sParse.aBlob[i] & 0x0f)>=JSONB_ARRAY && !p->bRecursive ){
-      p->i += n;
+      p->i = i + n;
       p->eType = p->sParse.aBlob[i] & 0x0f;
+      p->aParent = sqlite3DbMallocZero(p->db, sizeof(JsonParent));
+      if( p->aParent==0 ) return SQLITE_NOMEM;
+      p->nParent = 1;
+      p->nParentAlloc = 1;
+      p->aParent[0].iKey = 0;
+      p->aParent[0].iEnd = p->iEnd;
+      p->aParent[0].iHead = p->i;
+      p->aParent[0].iValue = i;
     }
     return SQLITE_OK;
   }else{