From: drh <drh@noemail.net>
Date: Thu, 23 Mar 2017 20:33:49 +0000 (+0000)
Subject: Change the name of the json_merge_patch() function to just json_patch().
X-Git-Tag: version-3.18.0~11^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fjson_mergepatch;p=thirdparty%2Fsqlite.git

Change the name of the json_merge_patch() function to just json_patch().

FossilOrigin-Name: 04d4100445a3373986ee962618bc03ec304f6ba2f867c8e9eee415daffb593fc
---

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 80b654d68d..acec87c1b8 100644
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1431,7 +1431,7 @@ static JsonNode *jsonMergePatch(
 ** object that is the result of running the RFC 7396 MergePatch() algorithm
 ** on the two arguments.
 */
-static void jsonMergePatchFunc(
+static void jsonPatchFunc(
   sqlite3_context *ctx,
   int argc,
   sqlite3_value **argv
@@ -2260,8 +2260,8 @@ int sqlite3Json1Init(sqlite3 *db){
     { "json_array_length",    2, 0,   jsonArrayLengthFunc   },
     { "json_extract",        -1, 0,   jsonExtractFunc       },
     { "json_insert",         -1, 0,   jsonSetFunc           },
-    { "json_merge_patch",     2, 0,   jsonMergePatchFunc    },
     { "json_object",         -1, 0,   jsonObjectFunc        },
+    { "json_patch",           2, 0,   jsonPatchFunc         },
     { "json_quote",           1, 0,   jsonQuoteFunc         },
     { "json_remove",         -1, 0,   jsonRemoveFunc        },
     { "json_replace",        -1, 0,   jsonReplaceFunc       },
diff --git a/manifest b/manifest
index 0c77a3ba53..d5d959a6f4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sredundant\sedits\sin\sthe\sjson_merge_patch()\sfunction.
-D 2017-03-23T12:56:44.298
+C Change\sthe\sname\sof\sthe\sjson_merge_patch()\sfunction\sto\sjust\sjson_patch().
+D 2017-03-23T20:33:49.228
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@ -218,7 +218,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c dbb168b0a7640a896a565c647dcabb7c7d116c9d2b1a23b963b1d177edc0ddba
+F ext/misc/json1.c c065914b126b5f4696b824286fca153da8035bb8c660a15193ea2711668f1d14
 F ext/misc/memvfs.c e5225bc22e79dde6b28380f3a068ddf600683a33
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
@@ -913,7 +913,7 @@ F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa
 F test/json101.test c0897616f32d95431f37fd291cb78742181980ac
 F test/json102.test bf3fe7a706d30936a76a0f7a0375e1e8e73aff5a
 F test/json103.test c5f6b85e69de05f6b3195f9f9d5ce9cd179099a0
-F test/json104.test 9f8358fd4ec94eca27b31d4ad7f75482edf24c865df378e5129c0b3107c9664e
+F test/json104.test b6808a3efb973235331c274ebe251bfbf75c6fff0ff12956fb9719cc227a9f5b
 F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
 F test/kvtest.c b9a9822dda05a1aa481215a52e2fc93cd8b22ee5
 F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
@@ -1568,7 +1568,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5d2cf5a2f8afd88d041d89b3936042ce5a43629d23c48738cb2791b24da3e6af
-R 76e620c002fc08a86767847f533fe70a
+P 4a8e6437dd610c5376a07867a73e5a7e2ea90357a018e1788ecce6f4e10bc939
+R d0e9240b8b29f168e87723d2f33d4c1f
 U drh
-Z 538e213b7e95dcafcfcd2e7dd4b1a792
+Z bc4bcd04349b5b8bc6712e6bdee5b622
diff --git a/manifest.uuid b/manifest.uuid
index da2d4e0201..7097a2526e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a8e6437dd610c5376a07867a73e5a7e2ea90357a018e1788ecce6f4e10bc939
\ No newline at end of file
+04d4100445a3373986ee962618bc03ec304f6ba2f867c8e9eee415daffb593fc
\ No newline at end of file
diff --git a/test/json104.test b/test/json104.test
index b5a45bc525..ff17147723 100644
--- a/test/json104.test
+++ b/test/json104.test
@@ -8,7 +8,7 @@
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
-# This file implements tests for json_mergepatch(A,B) SQL function.
+# This file implements tests for json_patch(A,B) SQL function.
 #
 
 set testdir [file dirname $argv0]
@@ -21,7 +21,7 @@ ifcapable !json1 {
 
 # This is the example from pages 2 and 3 of RFC-7396
 do_execsql_test json104-100 {
-  SELECT json_merge_patch('{
+  SELECT json_patch('{
        "a": "b",
        "c": {
          "d": "e",
@@ -38,7 +38,7 @@ do_execsql_test json104-100 {
 
 # This is the example from pages 4 and 5 of RFC-7396 
 do_execsql_test json104-110 {
-  SELECT json_merge_patch('{
+  SELECT json_patch('{
        "title": "Goodbye!",
        "author" : {
          "givenName" : "John",
@@ -57,10 +57,10 @@ do_execsql_test json104-110 {
 } {{{"title":"Hello!","author":{"givenName":"John"},"tags":["example"],"content":"This will be unchanged","phoneNumber":"+01-123-456-7890"}}}
 
 do_execsql_test json104-200 {
-  SELECT json_merge_patch('[1,2,3]','{"x":null}');
+  SELECT json_patch('[1,2,3]','{"x":null}');
 } {{{}}}
 do_execsql_test json104-210 {
-  SELECT json_merge_patch('[1,2,3]','{"x":null,"y":1,"z":null}');
+  SELECT json_patch('[1,2,3]','{"x":null,"y":1,"z":null}');
 } {{{"y":1}}}
 
 finish_test