From 25cf4ed1dc4e16da042e73ef5090e54bcf271f45 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 7 Jun 2018 23:37:09 -0400 Subject: [PATCH] Add missing serial commas --- src/backend/libpq/hba.c | 4 ++-- src/backend/utils/adt/jsonfuncs.c | 4 ++-- src/test/regress/expected/json.out | 6 +++--- src/test/regress/expected/jsonb.out | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index acf625e4ec..1a65ec87bd 100644 --- 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 b95f5a7c40..e358b5ad13 100644 --- 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 ed88d92ed9..d514c62126 100644 --- 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 3c37a8ed27..e5c2577dc2 100644 --- 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