Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit25cf4ed

Browse files
committed
Add missing serial commas
1 parent5efbdd3 commit25cf4ed

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

‎src/backend/libpq/hba.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,10 +1519,10 @@ parse_hba_line(TokenizedLine *tok_line, int elevel)
15191519
{
15201520
ereport(elevel,
15211521
(errcode(ERRCODE_CONFIG_FILE_ERROR),
1522-
errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter or ldapurl together with ldapprefix"),
1522+
errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix"),
15231523
errcontext("line %d of configuration file \"%s\"",
15241524
line_num,HbaFileName)));
1525-
*err_msg="cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter or ldapurl together with ldapprefix";
1525+
*err_msg="cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter, or ldapurl together with ldapprefix";
15261526
returnNULL;
15271527
}
15281528
}

‎src/backend/utils/adt/jsonfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4975,7 +4975,7 @@ parse_jsonb_index_flags(Jsonb *jb)
49754975
ereport(ERROR,
49764976
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
49774977
errmsg("flag array element is not a string"),
4978-
errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\" and \"all\"")));
4978+
errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\"")));
49794979

49804980
if (v.val.string.len==3&&
49814981
pg_strncasecmp(v.val.string.val,"all",3)==0)
@@ -4997,7 +4997,7 @@ parse_jsonb_index_flags(Jsonb *jb)
49974997
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
49984998
errmsg("wrong flag in flag array: \"%s\"",
49994999
pnstrdup(v.val.string.val,v.val.string.len)),
5000-
errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\" and \"all\"")));
5000+
errhint("Possible values are: \"string\", \"numeric\", \"boolean\", \"key\", and \"all\"")));
50015001
}
50025002

50035003
/* expect end of array now */

‎src/test/regress/expected/json.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2456,7 +2456,7 @@ select json_to_tsvector('null'::json, '"all"');
24562456

24572457
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '""');
24582458
ERROR: wrong flag in flag array: ""
2459-
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
2459+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
24602460
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '{}');
24612461
ERROR: wrong flag type, only arrays and scalars are allowed
24622462
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":
24672467

24682468
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, 'null');
24692469
ERROR: flag array element is not a string
2470-
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
2470+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
24712471
select json_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::json, '["all", null]');
24722472
ERROR: flag array element is not a string
2473-
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
2473+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
24742474
-- ts_headline for json
24752475
select ts_headline('{"a": "aaa bbb", "b": {"c": "ccc ddd fff", "c1": "ccc1 ddd1"}, "d": ["ggg hhh", "iii jjj"]}'::json, tsquery('bbb & ddd & hhh'));
24762476
ts_headline

‎src/test/regress/expected/jsonb.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4254,7 +4254,7 @@ select jsonb_to_tsvector('null'::jsonb, '"all"');
42544254

42554255
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '""');
42564256
ERROR: wrong flag in flag array: ""
4257-
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
4257+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
42584258
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '{}');
42594259
ERROR: wrong flag type, only arrays and scalars are allowed
42604260
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"
42654265

42664266
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, 'null');
42674267
ERROR: flag array element is not a string
4268-
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
4268+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
42694269
select jsonb_to_tsvector('english', '{"a": "aaa in bbb", "b": 123, "c": 456, "d": true, "f": false, "g": null}'::jsonb, '["all", null]');
42704270
ERROR: flag array element is not a string
4271-
HINT: Possible values are: "string", "numeric", "boolean", "key" and "all"
4271+
HINT: Possible values are: "string", "numeric", "boolean", "key", and "all"
42724272
-- ts_headline for jsonb
42734273
select ts_headline('{"a": "aaa bbb", "b": {"c": "ccc ddd fff", "c1": "ccc1 ddd1"}, "d": ["ggg hhh", "iii jjj"]}'::jsonb, tsquery('bbb & ddd & hhh'));
42744274
ts_headline

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp