From: drh <>
Date: Thu, 27 Apr 2023 15:11:26 +0000 (+0000)
Subject: Allow the labels on JSON objects to be unquoted identifier names.
X-Git-Tag: version-3.42.0~73^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef3a162be6508eae2d09315f6e82d30543367e6d;p=thirdparty%2Fsqlite.git

Allow the labels on JSON objects to be unquoted identifier names.

FossilOrigin-Name: fb428db3f64f148ab9a3478fdcc8b3733e58102b3c8895a482e2551d974d5661
---

diff --git a/manifest b/manifest
index 25d0e8f823..ff21e8d8d7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimization\sin\sthe\sJSON\sparser.
-D 2023-04-27T14:38:51.628
+C Allow\sthe\slabels\son\sJSON\sobjects\sto\sbe\sunquoted\sidentifier\snames.
+D 2023-04-27T15:11:26.153
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -592,7 +592,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h b638809e083b601b618df877b2e89cb87c2a47a01f4def10be4c4ebb54664ac7
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c a8de1db43335fc4946370a7a7e47d89975ad678ddb15078a150e993ba2fb37d4
-F src/json.c d65da6a334ff2f18cea8fa618bf64e085cf3517bdb9a5e570cb1e8531040d976
+F src/json.c 22e67e7ae7d1bd46df5616452a7b14587799df6dfff0c47bd09c3926c89ead99
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136
 F src/main.c 09bc5191f75dc48fc4dfddda143cb864c0c3dbc3297eb9a9c8e01fea58ff847d
@@ -2063,8 +2063,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 93f3ab26b57c0469862a56e97d4b3c796b27f9f582046fcff1f2aa8d8910c550
-R 66ad085cb2272ce979fd2644e3aac860
+P 5a88ba743f55d45b1c0ce0090bb3b396bcf7fcf7b3bcb989aaf30b8bb772599e
+R 7efb5a3476c2275fadcb3d73f88a7a54
 U drh
-Z 7c28704af9aa014ef0ec768389ba7618
+Z 22784998a1ee89abb38fb8b4e89c3f5d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 6d73e72cdd..ec0911a184 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a88ba743f55d45b1c0ce0090bb3b396bcf7fcf7b3bcb989aaf30b8bb772599e
\ No newline at end of file
+fb428db3f64f148ab9a3478fdcc8b3733e58102b3c8895a482e2551d974d5661
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 3828ca6bc3..178267bdd1 100644
--- a/src/json.c
+++ b/src/json.c
@@ -1059,13 +1059,25 @@ json_parse_restart:
       if( ++pParse->iDepth > JSON_MAX_DEPTH ) return -1;
       x = jsonParseValue(pParse, j);
       if( x<=0 ){
-        pParse->iDepth--;
         if( x==(-2) ){
           j = pParse->iErr;
           if( pParse->nNode!=(u32)iThis+1 ) pParse->has5 = 1;
+          pParse->iDepth--;
           break;
         }
-        return -1;
+        j += json5Whitespace(&z[j]);
+        if( sqlite3Isalpha(z[j]) || z[j]=='_' || z[j]=='$' ){
+          int k;
+          for(k=j+1; sqlite3Isalnum(z[k]) || z[k]=='_' || z[k]=='$'; k++){}
+          jsonParseAddNode(pParse, JSON_STRING, k-j, &z[j]);
+          if( !pParse->oom ){
+            pParse->aNode[pParse->nNode-1].jnFlags = JNODE_RAW;
+          }
+          pParse->has5 = 1;
+          x = k;
+        }else{
+          return -1;
+        }
       }
       if( pParse->oom ) return -1;
       pNode = &pParse->aNode[pParse->nNode-1];