Handle the path argument to json_tree() and json_each().

FossilOrigin-Name: fded888469565b2a4687185a926bd23fccfbf167c8bebe6c10696fc7f972f41e

diff --git a/manifest b/manifest
index 55cf674438a71bfa43507384cee3fd9b4bc228d9..b7f38de8534313a29990a588168e00965406bd0c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Continuing\swork\son\sjson_tree()\sagainst\sa\sJSONB.
-D 2023-11-24T21:57:38.322
+C Handle\sthe\spath\sargument\sto\sjson_tree()\sand\sjson_each().
+D 2023-11-25T13:40:19.363
 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 699b3fa340c24a10874988b9cbf4a1635b4231569dfaef9e4fd8fb96195406aa
+F src/json.c ff48d52463493f5f40d6e1e14ac3dc9277c40290df140a52bd17e7a562f766ea
 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 f8cab41b3bc65af6ff34b481db693d640ea025d09463d50b8e56d855e2abc913
-R 12dbc87edffde88122e858181ec1f996
+P 3df891cb11feee65e239ee2506eda34a9688341f05210d7c2e25a05338cb71ad
+R 86973d4c807995bd645f2f5dbc7eac48
 U drh
-Z f88095c49473dd89bb79ab974b58607c
+Z e2d0e1a86b5ddc3117954e8a28079ed7
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a401927f748d47122365bceb1b8634bae06d9136..555d0938d3da92d086e39dd6fb17108fd0fb9674 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3df891cb11feee65e239ee2506eda34a9688341f05210d7c2e25a05338cb71ad
\ No newline at end of file
+fded888469565b2a4687185a926bd23fccfbf167c8bebe6c10696fc7f972f41e
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 5823eadc88dd03eec466cbe752bbf75b37da47e0..503fff93682b435d82029eae620c8acb44506ff3 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -353,6 +353,7 @@ struct JsonParse {
   u8 eEdit;          /* Edit operation to apply */
   int delta;         /* Size change due to the edit */
   u32 nIns;          /* Number of bytes to insert */
+  u32 iLabel;        /* Location of label if search landed on an object value */
   u8 *aIns;          /* Content to be inserted */
 };
 
@@ -3904,6 +3905,7 @@ static u32 jsonLookupBlobStep(
         memcpy(&pParse->aBlob[iRoot], pParse->aIns, pParse->nIns);
       }
     }
+    pParse->iLabel = iLabel;
     return iRoot;
   }
   if( zPath[0]=='.' ){
@@ -6015,10 +6017,10 @@ static int jsonEachColumn(
         break;
       }
       case JEACH_ATOM: {
-        u32 i;
-        if( p->eType>=JSON_ARRAY ) break;
-        i = jsonSkipLabel(p);
-        jsonReturnFromBlob(&p->sParse, i, ctx, 1);
+        u32 i = jsonSkipLabel(p);
+        if( (p->sParse.aBlob[i] & 0x0f)<JSONB_ARRAY ){
+          jsonReturnFromBlob(&p->sParse, i, ctx, 1);
+        }
         break;
       }
       case JEACH_ID: {
@@ -6204,13 +6206,50 @@ static int jsonEachFilter(
     if( p->sParse.aBlob==0 ){
       return SQLITE_NOMEM;
     }
-    i = p->i = 0;
-    p->iEnd = 0;
-    p->eType = 0;
+    if( idxNum==3 ){
+      zRoot = (const char*)sqlite3_value_text(argv[1]);
+      if( zRoot==0 ) return SQLITE_OK;
+      n = sqlite3_value_bytes(argv[1]);
+      p->zRoot = sqlite3_malloc64( n+1 );
+      if( p->zRoot==0 ) return SQLITE_NOMEM;
+      memcpy(p->zRoot, zRoot, (size_t)n+1);
+      if( zRoot[0]!='$' ){
+        sqlite3_free(cur->pVtab->zErrMsg);
+        cur->pVtab->zErrMsg = jsonPathSyntaxError(zRoot, 0);
+        jsonEachCursorReset(p);
+        return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
+      }
+      if( zRoot[1]==0 ){
+        i = p->i = 0;
+        p->eType = 0;
+      }else{
+        i = jsonLookupBlobStep(&p->sParse, 0, p->zRoot+1, 0);
+        if( JSON_BLOB_ISERROR(i) ){
+          p->i = 0;
+          p->eType = 0;
+          p->iEnd = 0;
+          return SQLITE_OK;
+        }
+        if( p->sParse.iLabel ){
+          p->i = p->sParse.iLabel;
+          p->eType = JSONB_OBJECT;
+        }else{
+          p->i = i;
+          p->eType = JSONB_ARRAY;
+        }
+      }
+    }else{
+      i = p->i = 0;
+      p->eType = 0;
+    }
     p->nParent = 0;
     p->sParse.isBinary = 1;
     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->eType = p->sParse.aBlob[i] & 0x0f;
+    }
     return SQLITE_OK;
   }else{
     z = (const char*)sqlite3_value_text(argv[0]);