Add missing serial commas

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index acf625e4ec1725fa2ce476b2e9daac6518785798..1a65ec87bd21c7f4447cbf2e0f82f92c0ee1b209 100644 (file)
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1519,10 +1519,10 @@ parse_hba_line(TokenizedLine *tok_line, int elevel)
            {
                ereport(elevel,
                        (errcode(ERRCODE_CONFIG_FILE_ERROR),
-                        errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter or ldapurl together with ldapprefix"),
+                        errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix"),
                         errcontext("line %d of configuration file \"%s\"",
                                    line_num, HbaFileName)));
-               *err_msg = "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter or ldapurl together with ldapprefix";
+               *err_msg = "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix";
                return NULL;
            }
        }

diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index b95f5a7c40a2cdf64f165dd7e01ef0d053f7f3ee..e358b5ad1339c1de12438ab5d3fdd9a09fb12fb3 100644 (file)
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -4975,7 +4975,7 @@ parse_jsonb_index_flags(Jsonb *jb)
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                     errmsg("flag array element is not a string"),
-                    errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\" and \"all\"")));
+                    errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\"")));
 
        if (v.val.string.len == 3 &&
            pg_strncasecmp(v.val.string.val, "all", 3) == 0)
@@ -4997,7 +4997,7 @@ parse_jsonb_index_flags(Jsonb *jb)
                    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                     errmsg("wrong flag in flag array: \"%s\"",
                            pnstrdup(v.val.string.val, v.val.string.len)),
-                    errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\" and \"all\"")));
+                    errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\"")));
    }
 
    /* expect end of array now */

diff --git a/src/test/regress/expected/json.out b/src/test/regress/expected/json.out
index ed88d92ed9a1b18fae29d0df866322210718bb31..d514c621261f72f65ccb842ac44e1a2b09f4bd1f 100644 (file)
--- a/src/test/regress/expected/json.out
+++ b/src/test/regress/expected/json.out
@@ -2456,7 +2456,7 @@ select json_to_tsvector('null'::json, '"all"');
 
 select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '""');
 ERROR:  wrong flag in flag array: ""
-HINT:  Possible values are: "string", "numeric", "boolean", "key" and "all"
+HINT:  Possible values are: "string", "numeric", "boolean", "key", and "all"
 select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '{}');
 ERROR:  wrong flag type, only arrays and scalars are allowed
 select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '[]');
@@ -2467,10 +2467,10 @@ select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d":
 
 select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, 'null');
 ERROR:  flag array element is not a string
-HINT:  Possible values are: "string", "numeric", "boolean", "key" and "all"
+HINT:  Possible values are: "string", "numeric", "boolean", "key", and "all"
 select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '["all", null]');
 ERROR:  flag array element is not a string
-HINT:  Possible values are: "string", "numeric", "boolean", "key" and "all"
+HINT:  Possible values are: "string", "numeric", "boolean", "key", and "all"
 -- ts_headline for json
 select ts_headline('{"a": "aaa bbb", "b": {"c": "ccc ddd fff", "c1": "ccc1 ddd1"}, "d": ["ggg hhh", "iii jjj"]}'::json, tsquery('bbb & ddd & hhh'));
                                                ts_headline                                               

diff --git a/src/test/regress/expected/jsonb.out b/src/test/regress/expected/jsonb.out
index 3c37a8ed27d5a1aee6e316b0b31181d115db9929..e5c2577dc2fb364fb051df2718e006f028e6b4e6 100644 (file)
--- a/src/test/regress/expected/jsonb.out
+++ b/src/test/regress/expected/jsonb.out
@@ -4254,7 +4254,7 @@ select jsonb_to_tsvector('null'::jsonb, '"all"');
 
 select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '""');
 ERROR:  wrong flag in flag array: ""
-HINT:  Possible values are: "string", "numeric", "boolean", "key" and "all"
+HINT:  Possible values are: "string", "numeric", "boolean", "key", and "all"
 select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '{}');
 ERROR:  wrong flag type, only arrays and scalars are allowed
 select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '[]');
@@ -4265,10 +4265,10 @@ select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d"
 
 select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, 'null');
 ERROR:  flag array element is not a string
-HINT:  Possible values are: "string", "numeric", "boolean", "key" and "all"
+HINT:  Possible values are: "string", "numeric", "boolean", "key", and "all"
 select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["all", null]');
 ERROR:  flag array element is not a string
-HINT:  Possible values are: "string", "numeric", "boolean", "key" and "all"
+HINT:  Possible values are: "string", "numeric", "boolean", "key", and "all"
 -- ts_headline for jsonb
 select ts_headline('{"a": "aaa bbb", "b": {"c": "ccc ddd fff", "c1": "ccc1 ddd1"}, "d": ["ggg hhh", "iii jjj"]}'::jsonb, tsquery('bbb & ddd & hhh'));
                                                    ts_headline