Add missing serial commas

Also update one place where the wal_level "logical" was not added to an
error message.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index b0a2d9ec5d43ee6d530ba0fed37b9d44e4bc390a..c804a04cb660ee71e8668d399f2d2c5dbb4ed219 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9639,7 +9639,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
                ereport(ERROR,
                                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
                          errmsg("WAL level not sufficient for making an online backup"),
-                                errhint("wal_level must be set to \"archive\", \"hot_standby\" or \"logical\" at server start.")));
+                                errhint("wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start.")));
 
        if (strlen(backupidstr) > MAXPGPATH)
                ereport(ERROR,
@@ -9975,7 +9975,7 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
                ereport(ERROR,
                                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
                          errmsg("WAL level not sufficient for making an online backup"),
-                                errhint("wal_level must be set to \"archive\", \"hot_standby\" or \"logical\" at server start.")));
+                                errhint("wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start.")));
 
        /*
         * OK to update backup counters and forcePageWrites

diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 8a87581e79c6128e4f7a1a5260b3b9dfcc1bddcd..f186468dd2c2dd260bc4831bddb7e27f62fae1a5 100644 (file)
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -144,7 +144,7 @@ pg_create_restore_point(PG_FUNCTION_ARGS)
                ereport(ERROR,
                                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
                         errmsg("WAL level not sufficient for creating a restore point"),
-                                errhint("wal_level must be set to \"archive\" or \"hot_standby\" at server start.")));
+                                errhint("wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start.")));
 
        restore_name_str = text_to_cstring(restore_name);
 

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index a5d5c2dbcb62b1b5eb858d49fa4700d13e752fc3..9548caa0aebad0a8f67eb391b0485d77263ccefe 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -829,10 +829,10 @@ PostmasterMain(int argc, char *argv[])
        }
        if (XLogArchiveMode && wal_level == WAL_LEVEL_MINIMAL)
                ereport(ERROR,
-                               (errmsg("WAL archival (archive_mode=on) requires wal_level \"archive\", \"hot_standby\" or \"logical\"")));
+                               (errmsg("WAL archival (archive_mode=on) requires wal_level \"archive\", \"hot_standby\", or \"logical\"")));
        if (max_wal_senders > 0 && wal_level == WAL_LEVEL_MINIMAL)
                ereport(ERROR,
-                               (errmsg("WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\" or \"logical\"")));
+                               (errmsg("WAL streaming (max_wal_senders > 0) requires wal_level \"archive\", \"hot_standby\", or \"logical\"")));
 
        /*
         * Other one-time internal sanity checks can go here, if they are fast.

diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index a64e3c7a613d13af3a744552c243ce40ca658d65..11c9135b4825c8fa3d7ab27147f942fc32bb88a4 100644 (file)
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -1347,7 +1347,7 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
                 tcategory == JSONTYPE_CAST))
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                 errmsg("key value must be scalar, not array, composite or json")));
+                 errmsg("key value must be scalar, not array, composite, or json")));
 
        switch (tcategory)
        {

diff --git a/src/test/regress/expected/json.out b/src/test/regress/expected/json.out
index 99036a23ca865d20539aeb9db88636a17a00d645..cd6ea5b12d542cf697a33e7fe3dc0a35c2f5fafd 100644 (file)
--- a/src/test/regress/expected/json.out
+++ b/src/test/regress/expected/json.out
@@ -1152,11 +1152,11 @@ SELECT json_build_object(1,2);
 SELECT json_build_object(null,2);
 ERROR:  arg 1: key cannot be null
 SELECT json_build_object(r,2) FROM (SELECT 1 AS a, 2 AS b) r;
-ERROR:  key value must be scalar, not array, composite or json
+ERROR:  key value must be scalar, not array, composite, or json
 SELECT json_build_object(json '{"a":1,"b":2}', 3);
-ERROR:  key value must be scalar, not array, composite or json
+ERROR:  key value must be scalar, not array, composite, or json
 SELECT json_build_object('{1,2,3}'::int[], 3);
-ERROR:  key value must be scalar, not array, composite or json
+ERROR:  key value must be scalar, not array, composite, or json
 CREATE TEMP TABLE foo (serial_num int, name text, type text);
 INSERT INTO foo VALUES (847001,'t15','GE1043');
 INSERT INTO foo VALUES (847002,'t16','GE1043');

diff --git a/src/test/regress/expected/json_1.out b/src/test/regress/expected/json_1.out
index e74aabec8a1d3016d7fd483d9bbed30f7ed5deb9..51657a8d70fb7a49c07f403bf045610b82427325 100644 (file)
--- a/src/test/regress/expected/json_1.out
+++ b/src/test/regress/expected/json_1.out
@@ -1148,11 +1148,11 @@ SELECT json_build_object(1,2);
 SELECT json_build_object(null,2);
 ERROR:  arg 1: key cannot be null
 SELECT json_build_object(r,2) FROM (SELECT 1 AS a, 2 AS b) r;
-ERROR:  key value must be scalar, not array, composite or json
+ERROR:  key value must be scalar, not array, composite, or json
 SELECT json_build_object(json '{"a":1,"b":2}', 3);
-ERROR:  key value must be scalar, not array, composite or json
+ERROR:  key value must be scalar, not array, composite, or json
 SELECT json_build_object('{1,2,3}'::int[], 3);
-ERROR:  key value must be scalar, not array, composite or json
+ERROR:  key value must be scalar, not array, composite, or json
 CREATE TEMP TABLE foo (serial_num int, name text, type text);
 INSERT INTO foo VALUES (847001,'t15','GE1043');
 INSERT INTO foo VALUES (847002,'t16','GE1043');