Skip to content

Commit d38228f

Browse files
peterepetere
committed
Add missing serial commas
Also update one place where the wal_level "logical" was not added to an error message.
1 parent a16bac3 commit d38228f

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

‎src/backend/access/transam/xlog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9663,7 +9663,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
96639663
ereport(ERROR,
96649664
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
96659665
errmsg("WAL level not sufficient for making an online backup"),
9666-
errhint("wal_level must be set to \"archive\", \"hot_standby\" or \"logical\" at server start.")));
9666+
errhint("wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start.")));
96679667

96689668
if (strlen(backupidstr) > MAXPGPATH)
96699669
ereport(ERROR,
@@ -9999,7 +9999,7 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
99999999
ereport(ERROR,
1000010000
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1000110001
errmsg("WAL level not sufficient for making an online backup"),
10002-
errhint("wal_level must be set to \"archive\", \"hot_standby\" or \"logical\" at server start.")));
10002+
errhint("wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start.")));
1000310003

1000410004
/*
1000510005
* OK to update backup counters and forcePageWrites

‎src/backend/access/transam/xlogfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ pg_create_restore_point(PG_FUNCTION_ARGS)
144144
ereport(ERROR,
145145
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
146146
errmsg("WAL level not sufficient for creating a restore point"),
147-
errhint("wal_level must be set to \"archive\" or \"hot_standby\" at server start.")));
147+
errhint("wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start.")));
148148

149149
restore_name_str = text_to_cstring(restore_name);
150150

‎src/backend/postmaster/postmaster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,10 +825,10 @@ PostmasterMain(int argc, char *argv[])
825825
}
826826
if (XLogArchiveMode && wal_level == WAL_LEVEL_MINIMAL)
827827
ereport(ERROR,
828-
(errmsg("WAL archival (archive_mode=on) requires wal_level \"archive\", \"hot_standby\" or \"logical\"")));
828+
(errmsg("WAL archival (archive_mode=on) requires wal_level \"archive\", \"hot_standby\", or \"logical\"")));
829829
if (max_wal_senders > 0 && wal_level == WAL_LEVEL_MINIMAL)
830830
ereport(ERROR,
831-
(errmsg("WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\" or \"logical\"")));
831+
(errmsg("WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\", or \"logical\"")));
832832

833833
/*
834834
* Other one-time internal sanity checks can go here, if they are fast.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
13471347
tcategory == JSONTYPE_CAST))
13481348
ereport(ERROR,
13491349
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1350-
errmsg("key value must be scalar, not array, composite or json")));
1350+
errmsg("key value must be scalar, not array, composite, or json")));
13511351

13521352
switch (tcategory)
13531353
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,11 +1152,11 @@ SELECT json_build_object(1,2);
11521152
SELECT json_build_object(null,2);
11531153
ERROR: arg 1: key cannot be null
11541154
SELECT json_build_object(r,2) FROM (SELECT 1 AS a, 2 AS b) r;
1155-
ERROR: key value must be scalar, not array, composite or json
1155+
ERROR: key value must be scalar, not array, composite, or json
11561156
SELECT json_build_object(json '{"a":1,"b":2}', 3);
1157-
ERROR: key value must be scalar, not array, composite or json
1157+
ERROR: key value must be scalar, not array, composite, or json
11581158
SELECT json_build_object('{1,2,3}'::int[], 3);
1159-
ERROR: key value must be scalar, not array, composite or json
1159+
ERROR: key value must be scalar, not array, composite, or json
11601160
CREATE TEMP TABLE foo (serial_num int, name text, type text);
11611161
INSERT INTO foo VALUES (847001,'t15','GE1043');
11621162
INSERT INTO foo VALUES (847002,'t16','GE1043');

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,11 +1148,11 @@ SELECT json_build_object(1,2);
11481148
SELECT json_build_object(null,2);
11491149
ERROR: arg 1: key cannot be null
11501150
SELECT json_build_object(r,2) FROM (SELECT 1 AS a, 2 AS b) r;
1151-
ERROR: key value must be scalar, not array, composite or json
1151+
ERROR: key value must be scalar, not array, composite, or json
11521152
SELECT json_build_object(json '{"a":1,"b":2}', 3);
1153-
ERROR: key value must be scalar, not array, composite or json
1153+
ERROR: key value must be scalar, not array, composite, or json
11541154
SELECT json_build_object('{1,2,3}'::int[], 3);
1155-
ERROR: key value must be scalar, not array, composite or json
1155+
ERROR: key value must be scalar, not array, composite, or json
11561156
CREATE TEMP TABLE foo (serial_num int, name text, type text);
11571157
INSERT INTO foo VALUES (847001,'t15','GE1043');
11581158
INSERT INTO foo VALUES (847002,'t16','GE1043');

0 commit comments

Comments
 (0)