From: drh <>
Date: Fri, 7 Jan 2022 17:14:35 +0000 (+0000)
Subject: Change the -> operator to use json_extract().  The ->> operator continues
X-Git-Tag: version-3.38.0~119^2~10^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9956c18a814de7928821fb446249c692c9e64df4;p=thirdparty%2Fsqlite.git

Change the -> operator to use json_extract().  The ->> operator continues
to use json_nextract().

FossilOrigin-Name: b4c8a62381755b9f1447e10ab95df7209eebda91f9a4583ef1c093a13f6b4725
---

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 2cb9d700b0..e35d4ed576 100644
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -2691,7 +2691,7 @@ int sqlite3Json1Init(sqlite3 *db){
     { "json_array_length",    2, 0,   jsonArrayLengthFunc   },
     { "json_extract",        -1, 0,   jsonExtractFunc       },
     { "json_nextract",       -1, 1,   jsonExtractFunc       },
-    { "->",                   2, 3,   jsonExtractFunc       },
+    { "->",                   2, 2,   jsonExtractFunc       },
     { "->>",                  2, 3,   jsonExtractFunc       },
     { "json_insert",         -1, 0,   jsonSetFunc           },
     { "json_ntype",           1, 1,   jsonTypeFunc          },
diff --git a/manifest b/manifest
index a1aa869c97..647b8c22a9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\sjson_nextract()\sfunction\sthat\sworks\slike\sjson_extract()\sexcept\sthat\sit\nreturns\sNULL\sinstead\sof\sraising\san\serror\sif\sthe\sfirst\sargument\sis\snot\nwell-formed\sJSON.\s\sOr\sif\sthe\sfirst\sargument\sis\snot\swell-formed\sJSON\sand\nthe\ssecond\sargument\sis\s'$',\sthen\sreturn\sthe\sfirst\sargument\squoted.\s\sThe\n"->"\sand\s"->>"\soperators\sare\sconverted\sto\suse\sjson_nextract().
-D 2022-01-07T17:08:48.125
+C Change\sthe\s->\soperator\sto\suse\sjson_extract().\s\sThe\s->>\soperator\scontinues\nto\suse\sjson_nextract().
+D 2022-01-07T17:14:35.839
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -306,7 +306,7 @@ F ext/misc/fileio.c 4e7f7cd30de8df4820c552f14af3c9ca451c5ffe1f2e7bef34d598a12ebf
 F ext/misc/fossildelta.c 1240b2d3e52eab1d50c160c7fe1902a9bd210e052dc209200a750bbf885402d5
 F ext/misc/fuzzer.c eae560134f66333e9e1ca4c8ffea75df42056e2ce8456734565dbe1c2a92bf3d
 F ext/misc/ieee754.c 91a5594071143a4ab79c638fe9f059af1db09932faf2e704c3e29216a7d4f511
-F ext/misc/json1.c f2dc0952d66ebb6c9913e41170f574a4fb4a46d80d4c30ec2b7bc7635d565aae
+F ext/misc/json1.c bec23aa378f56320246ce0bed2d841bef9d73a467f0f7a188eed1f753c61d113
 F ext/misc/memstat.c 3017a0832c645c0f8c773435620d663855f04690172316bd127270d1a7523d4d
 F ext/misc/memtrace.c 7c0d115d2ef716ad0ba632c91e05bd119cb16c1aedf3bec9f06196ead2d5537b
 F ext/misc/memvfs.c 7dffa8cc89c7f2d73da4bd4ccea1bcbd2bd283e3bb4cea398df7c372a197291b
@@ -1147,7 +1147,7 @@ F test/jrnlmode.test 9b5bc01dac22223cb60ec2d5f97acf568d73820794386de5634dcadbea9
 F test/jrnlmode2.test 8759a1d4657c064637f8b079592651530db738419e1d649c6df7048cd724363d
 F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa
 F test/json101.test bb71538005f2d9e18620bdd3b76839a93ca0be61903eb8d751a64e78cf99b8fb
-F test/json102.test 40a408ffbb9294bffc9a62ea32f3ecdc2b9b40df16c69b73dc18f1684540512c
+F test/json102.test 94a91c6ba5df84397d887af8e7278d3e8344486e9fe6fba2916473d2b89819e1
 F test/json103.test aff6b7a4c17d5a20b487a7bc1a274bfdc63b829413bdfb83bedac42ec7f67e3b
 F test/json104.test 2cb7ff2cca2c8214d3e5260eeb9ce45faec0926f68b3e40c1aaa6ca247284144
 F test/json105.test 45f7d6a9a54c85f8a9589b68d3e7a1f42d02f2359911a8cdbad1f9988f571173
@@ -1937,8 +1937,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 ed9956f5ddca68141eded81d5362847db603257329801622c4eb3b0732112f14
-R f26fe71ed976f3035850cd240318b4a2
+P dc00f5286d26524b149de071490320afaa203fec5777b3eb813f07963614861a
+R c2278f0d888348e91e31b99a70b490f1
 U drh
-Z 13ae4c74ef71f6a4a05f3faff51e35b4
+Z e2f5d3c5e50a6c66708d727e107dbfb6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d63d456dde..cb3b4bb5de 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dc00f5286d26524b149de071490320afaa203fec5777b3eb813f07963614861a
\ No newline at end of file
+b4c8a62381755b9f1447e10ab95df7209eebda91f9a4583ef1c093a13f6b4725
\ No newline at end of file
diff --git a/test/json102.test b/test/json102.test
index fbd9711c5d..521373a833 100644
--- a/test/json102.test
+++ b/test/json102.test
@@ -98,7 +98,10 @@ do_catchsql_test json102-267 {
 do_catchsql_test json102-268 {
   SELECT json_nextract('[1,2,3', '$');
 } {0 {{"[1,2,3"}}}
-do_catchsql_test json102-269 {
+do_catchsql_test json102-269a {
+  SELECT '[1,2,3' -> '$';
+} {1 {malformed JSON}}
+do_catchsql_test json102-269b {
   SELECT '[1,2,3' ->> '$';
 } {0 {{"[1,2,3"}}}