Fix abbreviated paths for objects such that they work even if the object

key begins with '$'.

FossilOrigin-Name: 1b991c78141a9915ae9350ecb347a758e50d7d25c8a0f4cc098ae10d47c27043

diff --git a/manifest b/manifest
index 5733fbf0e5d40b6712604833f471bfdc547fd438..28fca241a0d4b26a400ef2633d093e291e934cf6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sjson_patch()\swhen\sone\sside\sor\sthe\sother\sis\sJSON5.\ndbsqlfuzz\sbc10593a4ba8e7a7862593532285be31f00f8e41
-D 2023-04-30T23:52:55.182
+C Fix\sabbreviated\spaths\sfor\sobjects\ssuch\sthat\sthey\swork\seven\sif\sthe\sobject\nkey\sbegins\swith\s'$'.
+D 2023-05-01T03:56:48.067
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -595,7 +595,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 359e99789cbc5db24e14b70e8f615155f5ae0138528eb863bdc114e6c6205c32
+F src/json.c dd76caa9c9f1b417f7d7cdee06baabcbfc4c5ee18a578150d8f19c28260abeac
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136
 F src/main.c 09bc5191f75dc48fc4dfddda143cb864c0c3dbc3297eb9a9c8e01fea58ff847d
@@ -2068,8 +2068,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 9be2c87518b33713210e3e2fa56924888e19415c71329141d18150b275f6f25e
-R 7a6b3c9a24ecf3fbc1a69d64509d805d
+P e18c0899cc774f6f20d2a73381fa3ab3af9355cf4d108c7612db259eadbb8b96
+R d7c6513749c47dbdaa7fb128b7fd565e
 U drh
-Z 5033e057782cc2feec974bc4cc7a7826
+Z 1d9a6af1cfa9e670ad28e827814897c7
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3e1e31f59e2e85ae27447a94bb98241282244f6f..4bf24a906a1d4994761929c47db364d17f9017d6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e18c0899cc774f6f20d2a73381fa3ab3af9355cf4d108c7612db259eadbb8b96
\ No newline at end of file
+1b991c78141a9915ae9350ecb347a758e50d7d25c8a0f4cc098ae10d47c27043
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 7e112c30dc6eddcd70c0957bdf8de271abe7bf4a..aae48c291a50dddf14564f1c7fcd846f789ace5c 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -2164,7 +2164,7 @@ static void jsonExtractFunc(
     zPath = (const char*)sqlite3_value_text(argv[1]);
     if( zPath==0 ) return;
     if( flags & JSON_ABPATH ){
-      if( zPath[0]!='$' ){
+      if( zPath[0]!='$' || (zPath[1]!='.' && zPath[1]!='[' && zPath[1]!=0) ){
         /* The -> and ->> operators accept abbreviated PATH arguments.  This
         ** is mostly for compatibility with PostgreSQL, but also for
         ** convenience.