From: drh <drh@noemail.net>
Date: Thu, 23 Mar 2017 23:44:55 +0000 (+0000)
Subject: Add the json_patch() SQL function to the JSON1 extension.
X-Git-Tag: version-3.18.0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adc117d40ec566daa54b185066c805563ca53333;p=thirdparty%2Fsqlite.git

Add the json_patch() SQL function to the JSON1 extension.

FossilOrigin-Name: 476088482024e411e2549b1697cdaf0124294c79d43f508c71c4eb66906a56fc
---

adc117d40ec566daa54b185066c805563ca53333
diff --cc manifest
index c5b123ea51,d5d959a6f4..b843ff3c58
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improvement\sto\sthe\samalgamation\sconfigure.ac\sfile\scontributed\sby\nBob\sFriesenhahn.
- D 2017-03-23T19:51:38.579
 -C Change\sthe\sname\sof\sthe\sjson_merge_patch()\sfunction\sto\sjust\sjson_patch().
 -D 2017-03-23T20:33:49.228
++C Add\sthe\sjson_patch()\sSQL\sfunction\sto\sthe\sJSON1\sextension.
++D 2017-03-23T23:44:55.894
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@@ -1567,7 -1568,7 +1568,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e1d06a573ee56bf6a14e4dc8086d6a4df1464f2914834cf4596a0a406688f608
- R 05b216864be03a3eba3ef1e51323e9ca
 -P 4a8e6437dd610c5376a07867a73e5a7e2ea90357a018e1788ecce6f4e10bc939
 -R d0e9240b8b29f168e87723d2f33d4c1f
++P bf28a55d8185e370fea39de297c37387f852f43fac0a316e5900e633f99b367f 04d4100445a3373986ee962618bc03ec304f6ba2f867c8e9eee415daffb593fc
++R 114c4ffb4ff05c31b0d61e7341b119eb
++T +closed 04d4100445a3373986ee962618bc03ec304f6ba2f867c8e9eee415daffb593fc
  U drh
- Z 5c18c26b109b1904b072f9a45f7157f5
 -Z bc4bcd04349b5b8bc6712e6bdee5b622
++Z 015dcf3dd857377b8513b610e324274e
diff --cc manifest.uuid
index d40ca490c9,7097a2526e..4f00615e01
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bf28a55d8185e370fea39de297c37387f852f43fac0a316e5900e633f99b367f
 -04d4100445a3373986ee962618bc03ec304f6ba2f867c8e9eee415daffb593fc
++476088482024e411e2549b1697cdaf0124294c79d43f508c71c4eb66906a56fc