Add missing serial commas

diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index 4fd1e6e7abb5fcbf5aceffa292485582b131c28d..7aacb6b2fec7451b4a6a1d87a01d168bf13ec47e 100644 (file)
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -613,7 +613,7 @@ check_simple_rowfilter_expr_walker(Node *node, ParseState *pstate)
                        /* OK, supported */
                        break;
                default:
-                       errdetail_msg = _("Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations and immutable built-in functions.");
+                       errdetail_msg = _("Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions.");
                        break;
        }
 

diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
index ee9b5089b92ea7c3b870b6ccdfc5981d135bcd1f..2544c6b1551cb50eae9a0fe112685dd836b1a7ce 100644 (file)
--- a/src/backend/utils/adt/jsonpath_exec.c
+++ b/src/backend/utils/adt/jsonpath_exec.c
@@ -3134,7 +3134,7 @@ JsonItemFromDatum(Datum val, Oid typid, int32 typmod, JsonbValue *res)
                default:
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                        errmsg("only bool, numeric and text types could be "
+                                        errmsg("only bool, numeric, and text types could be "
                                                        "casted to supported jsonpath types.")));
        }
 }

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 22b5571a704d463af2e8ab357fc8f4c268b60c13..9e0f2620883dc2613d26d69fcc49d37f5de7654b 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4360,7 +4360,7 @@ static struct config_string ConfigureNamesString[] =
                {"log_destination", PGC_SIGHUP, LOGGING_WHERE,
                        gettext_noop("Sets the destination for server log output."),
                        gettext_noop("Valid values are combinations of \"stderr\", "
-                                                "\"syslog\", \"csvlog\", \"jsonlog\" and \"eventlog\", "
+                                                "\"syslog\", \"csvlog\", \"jsonlog\", and \"eventlog\", "
                                                 "depending on the platform."),
                        GUC_LIST_INPUT
                },

diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out
index 4d24d772bde5ffc198262d484ca427c1738576c7..8208f9fa0e07f026ef55b3db0ada7ec80c08ad8f 100644 (file)
--- a/src/test/regress/expected/publication.out
+++ b/src/test/regress/expected/publication.out
@@ -441,7 +441,7 @@ CREATE PUBLICATION testpub6 FOR TABLE testpub_rf_tbl1 WHERE (a IN (SELECT genera
 ERROR:  invalid publication WHERE expression
 LINE 1: ...ICATION testpub6 FOR TABLE testpub_rf_tbl1 WHERE (a IN (SELE...
                                                              ^
-DETAIL:  Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations and immutable built-in functions.
+DETAIL:  Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions.
 -- fail - system columns are not allowed
 CREATE PUBLICATION testpub6 FOR TABLE testpub_rf_tbl1 WHERE ('(0,1)'::tid = ctid);
 ERROR:  invalid publication WHERE expression