]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Do correct comparisons between object labels in JSON even when the two labels
authordrh <>
Wed, 6 Dec 2023 17:50:16 +0000 (17:50 +0000)
committerdrh <>
Wed, 6 Dec 2023 17:50:16 +0000 (17:50 +0000)
contain different JSON escapes.

FossilOrigin-Name: bda2e30cc22e180b19a7a05824dd345880eb402ae5450b2d2dd954946c3ae135

1  2 
manifest
manifest.uuid
src/json.c

diff --cc manifest
index e532282489ec1b0bcb0733aba99be13ebadf6701,48427cf150474f48a0846fe9fbae560d41c18e26..a803cb2a641eea6b1697b5284873bd63169bb6b7
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Correctly\shandle\s8-byte\ssizes\sin\sthe\sJSONB\sformat.\n[forum:/forumpost/283daf08e91183fc|Forum\spost\s283daf08e91183fc].
- D 2023-12-06T17:39:31.569
 -C Fix\sthe\sroutine\sthat\sdetermines\sthe\sjson_tree.path\svalue\sfor\sthe\sfirst\srow\nso\sthat\sit\scorrectly\stakes\sinto\saccount\sescape\ssequences\sin\sthe\spath\nargument.
 -D 2023-12-06T16:57:18.873
++C Do\scorrect\scomparisons\sbetween\sobject\slabels\sin\sJSON\seven\swhen\sthe\stwo\slabels\ncontain\sdifferent\sJSON\sescapes.
++D 2023-12-06T17:50:16.616
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -696,7 -690,7 +696,7 @@@ F src/hash.h 3340ab6e1d13e725571d7cee6d
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
- F src/json.c 07247c969e80e0a70241235ea4d00bb823830ce6a48f101fbcb1c72e8abf6f91
 -F src/json.c 89ce1dbcd8373a33adb82652842956c8a5d2b5c48d6f2c197d47bcee5fdedfd3
++F src/json.c c2e0fea06f40fb0319ed132fc181a25623585c943e08c690b522f216886ba316
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
  F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@@ -2153,8 -2147,8 +2153,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 63cb05a862532d2d56e9e81fe32ced09bf58f03146587a118f11c2a84e195e69
- R 3207d50f882d9851bd1114b702910d8f
 -P c6f2aa38e95b7888650cfa7bb773b18a28e01d883033ac77be6d504ffe417d18
 -R 31c04da1922b93d8052617096f6b59a6
++P 73d390f39c0bbbc017e01544e4d43c76761f2599bd57f900131c706270dfd202 b9243ee8a37c62eb8848e765bd4af83bc1b3d3eb24fb4268a1357ad1f8b2e1fb
++R fd697485adcd3130674f1a92f5c02f3d
++T +closed b9243ee8a37c62eb8848e765bd4af83bc1b3d3eb24fb4268a1357ad1f8b2e1fb
  U drh
- Z 9fdc41964fbd72df8cb3bfd54d04d4f1
 -Z a482eb5d0e0092ccc9abb42b468f8c79
++Z 9804c6a78387d2d6c50275c2413cc6ef
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index fdb030fa0a376cd19459b33d4fa39deba8805d78,3fd26623b410105598ec9a3d30e1419885b1f9fb..bba984a9243022caf1a008e0910040c78f1c0b11
@@@ -1,1 -1,1 +1,1 @@@
- 73d390f39c0bbbc017e01544e4d43c76761f2599bd57f900131c706270dfd202
 -b9243ee8a37c62eb8848e765bd4af83bc1b3d3eb24fb4268a1357ad1f8b2e1fb
++bda2e30cc22e180b19a7a05824dd345880eb402ae5450b2d2dd954946c3ae135
diff --cc src/json.c
Simple merge