Add missing serial commas

petere · petere · commit 38abc39c81f9 · 2022-04-09T16:15:01.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ check_simple_rowfilter_expr_walker(Node node, ParseState pstate)`
`613`	`613`	`/* OK, supported */`
`614`	`614`	`break;`
`615`	`615`	`default:`
`616`		`- errdetail_msg = _("Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations and immutable built-in functions.");`
	`616`	`+ errdetail_msg = _("Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions.");`
`617`	`617`	`break;`
`618`	`618`	`}`
`619`	`619`
Original file line number	Diff line number	Diff line change
`@@ -3134,7 +3134,7 @@ JsonItemFromDatum(Datum val, Oid typid, int32 typmod, JsonbValue *res)`
`3134`	`3134`	`default:`
`3135`	`3135`	`ereport(ERROR,`
`3136`	`3136`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`3137`		`- errmsg("only bool, numeric and text types could be "`
	`3137`	`+ errmsg("only bool, numeric, and text types could be "`
`3138`	`3138`	`"casted to supported jsonpath types.")));`
`3139`	`3139`	`}`
`3140`	`3140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ CREATE PUBLICATION testpub6 FOR TABLE testpub_rf_tbl1 WHERE (a IN (SELECT genera`
`441`	`441`	`ERROR: invalid publication WHERE expression`
`442`	`442`	`LINE 1: ...ICATION testpub6 FOR TABLE testpub_rf_tbl1 WHERE (a IN (SELE...`
`443`	`443`	`^`
`444`		`-DETAIL: Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations and immutable built-in functions.`
	`444`	`+DETAIL: Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions.`
`445`	`445`	`-- fail - system columns are not allowed`
`446`	`446`	`CREATE PUBLICATION testpub6 FOR TABLE testpub_rf_tbl1 WHERE ('(0,1)'::tid = ctid);`
`447`	`447`	`ERROR: invalid publication WHERE expression`