Change the name of the new function to "json_merge_patch()".

FossilOrigin-Name: 53bf70f37bbca319ea35f70849e2a34ae628a504486158fdad5c4bb7431c68e0

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 0db946fdc6a65279a669aa597e7014b25852ae45..c037525c45da2a52a4a2a299b2f338172704f420 100644 (file)
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -2257,7 +2257,7 @@ int sqlite3Json1Init(sqlite3 *db){
     { "json_array_length",    2, 0,   jsonArrayLengthFunc   },
     { "json_extract",        -1, 0,   jsonExtractFunc       },
     { "json_insert",         -1, 0,   jsonSetFunc           },
-    { "json_mergepatch",      2, 0,   jsonMergePatchFunc    },
+    { "json_merge_patch",     2, 0,   jsonMergePatchFunc    },
     { "json_object",         -1, 0,   jsonObjectFunc        },
     { "json_quote",           1, 0,   jsonQuoteFunc         },
     { "json_remove",         -1, 0,   jsonRemoveFunc        },

diff --git a/manifest b/manifest
index cceedf00d153b9b461959ca27b4cdf52acb913fe..8c6f009d429862e2043de03adaa82ef0312b5e3a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\simplementation\sof\sthe\sjson_mergepatch(A,B)\sSQL\sfunction.
-D 2017-03-22T21:24:31.714
+C Change\sthe\sname\sof\sthe\snew\sfunction\sto\s"json_merge_patch()".
+D 2017-03-22T21:45:20.759
 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 ca27a98c0a7a90fcbaccd3157204e19afc7eec0ba3f4c08ed06bb638b773f523
+F ext/misc/json1.c be1032c54498ae8d884b7c430da876a0f895dfc734ac3255336014ce79e3f219
 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 83fd7a15eadb0cde34a37200842318d1cd98abe908e2847fb93d337d969815cc
+F test/json104.test 66d3dfc9f76e413c7c957d897325b17b9d1bbdf471225310dbf47279e36f1937
 F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
 F test/kvtest.c b9a9822dda05a1aa481215a52e2fc93cd8b22ee5
 F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
@@ -1568,10 +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 055b36f1c1593bb123f7319a07c476143d71af052b5b8d34afcd0d500f197882
-R 1d5a57aea0e07c508840a776caf26b14
-T *branch * json_mergepatch
-T *sym-json_mergepatch *
-T -sym-trunk *
+P a267444039af519f088dd8f8ee33f686cc3071c087677075af2364ebc2587514
+R f0982f12ae9e098efe5bc17c4edc8338
 U drh
-Z 2961dcef6bde9e861663934a25c90d24
+Z 17fdf70c56513cf2488f301085ed16e1

diff --git a/manifest.uuid b/manifest.uuid
index 980cac0acf4921798e530a2cad3179a1902269a2..ea9e24d51dfbaad8fc88a9175fab364634b6c977 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a267444039af519f088dd8f8ee33f686cc3071c087677075af2364ebc2587514
\ No newline at end of file
+53bf70f37bbca319ea35f70849e2a34ae628a504486158fdad5c4bb7431c68e0
\ No newline at end of file

diff --git a/test/json104.test b/test/json104.test
index fc2e0e38b464eba52678e86768f23ec15a3df632..be041c5da8b90db1d6461eca01982c383334981c 100644 (file)
--- a/test/json104.test
+++ b/test/json104.test
@@ -21,27 +21,24 @@ ifcapable !json1 {
 
 # This is the example from pages 2 and 3 of RFC-7396
 do_execsql_test json104-100 {
-  SELECT json_mergepatch(
-    json('{
+  SELECT json_merge_patch('{
        "a": "b",
        "c": {
          "d": "e",
          "f": "g"
        }
-     }'),
-    json('{
+     }','{
        "a":"z",
        "c": {
          "f": null
        }
-     }'));
+     }');
 } {{{"a":"z","c":{"d":"e"}}}}
 
 
 # This is the example from pages 4 and 5 of RFC-7396 
 do_execsql_test json104-110 {
-  SELECT json_mergepatch(
-    json('{
+  SELECT json_merge_patch('{
        "title": "Goodbye!",
        "author" : {
          "givenName" : "John",
@@ -49,15 +46,14 @@ do_execsql_test json104-110 {
        },
        "tags":[ "example", "sample" ],
        "content": "This will be unchanged"
-     }'),
-    json('{
+     }','{
        "title": "Hello!",
        "phoneNumber": "+01-123-456-7890",
        "author": {
          "familyName": null
        },
        "tags": [ "example" ]
-     }'));
+     }');
 } {{{"title":"Hello!","author":{"givenName":"John"},"tags":["example"],"content":"This will be unchanged",phoneNumber:"+01-123-456-7890"}}}
 
 finish_test