Commit7beda87

committed

Fix grammar in error message

While at it, make ellipses formatting consistent when describing SQL statements.Ekaterina Kiryanova and Alexander LakhinReviewed by myself and Álvaro HerreraDiscussion:https://www.postgresql.org/message-id/eed5cec0-a542-53da-6a5e-7789c6ed9817%40postgrespro.ruBackpatch only the grammar fix to v15

1 parent16492df commit7beda87Copy full SHA for 7beda87

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1187,7 +1187,7 @@ AlterSubscription(ParseState pstate, AlterSubscriptionStmt stmt,`
`1187`	`1187`	`ereport(ERROR,`
`1188`	`1188`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`1189`	`1189`	`errmsg("ALTER SUBSCRIPTION with refresh and copy_data is not allowed when two_phase is enabled"),`
`1190`		`-errhint("Use ALTER SUBSCRIPTION ...SET PUBLICATION with refresh = false, or with copy_data = false"`
	`1190`	`+errhint("Use ALTER SUBSCRIPTION ...SET PUBLICATION with refresh = false, or with copy_data = false"`
`1191`	`1191`	`", or use DROP/CREATE SUBSCRIPTION.")));`
`1192`	`1192`
`1193`	`1193`	`PreventInTransactionBlock(isTopLevel,"ALTER SUBSCRIPTION with refresh");`
`@@ -1239,7 +1239,7 @@ AlterSubscription(ParseState pstate, AlterSubscriptionStmt stmt,`
`1239`	`1239`	`ereport(ERROR,`
`1240`	`1240`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`1241`	`1241`	`errmsg("ALTER SUBSCRIPTION with refresh and copy_data is not allowed when two_phase is enabled"),`
`1242`		`-errhint("Use ALTER SUBSCRIPTION ...SET PUBLICATION with refresh = false, or with copy_data = false"`
	`1242`	`+errhint("Use ALTER SUBSCRIPTION ...SET PUBLICATION with refresh = false, or with copy_data = false"`
`1243`	`1243`	`", or use DROP/CREATE SUBSCRIPTION.")));`
`1244`	`1244`
`1245`	`1245`	`PreventInTransactionBlock(isTopLevel,"ALTER SUBSCRIPTION with refresh");`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ SanityCheckBackgroundWorker(BackgroundWorker *worker, int elevel)`
`663`	`663`	`{`
`664`	`664`	`ereport(elevel,`
`665`	`665`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`666`		`-errmsg("background worker \"%s\": backgroundworker without shared memory access are not supported",`
	`666`	`+errmsg("background worker \"%s\": backgroundworkers without shared memory access are not supported",`
`667`	`667`	`worker->bgw_name)));`
`668`	`668`	`return false;`
`669`	`669`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,7 @@ rewriteRuleAction(Query *parsetree,`
`578`	`578`	`if (sub_action->hasModifyingCTE&&rule_action!=sub_action)`
`579`	`579`	`ereport(ERROR,`
`580`	`580`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`581`		`-errmsg("INSERT...SELECT rule actions are not supported for queries having data-modifying statements in WITH")));`
	`581`	`+errmsg("INSERT...SELECT rule actions are not supported for queries having data-modifying statements in WITH")));`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`/*`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2515,14 +2515,14 @@ SELECT * FROM bug6051_2;`
`2515`	`2515`	`3`
`2516`	`2516`	`(3 rows)`
`2517`	`2517`
`2518`		`--- check INSERT...SELECT rule actions are disallowed on commands`
	`2518`	`+-- check INSERT...SELECT rule actions are disallowed on commands`
`2519`	`2519`	`-- that have modifyingCTEs`
`2520`	`2520`	`CREATE OR REPLACE RULE bug6051_ins AS ON INSERT TO bug6051 DO INSTEAD`
`2521`	`2521`	`INSERT INTO bug6051_2`
`2522`	`2522`	`SELECT NEW.i;`
`2523`	`2523`	`WITH t1 AS ( DELETE FROM bug6051 RETURNING * )`
`2524`	`2524`	`INSERT INTO bug6051 SELECT * FROM t1;`
`2525`		`-ERROR: INSERT...SELECT rule actions are not supported for queries having data-modifying statements in WITH`
	`2525`	`+ERROR: INSERT...SELECT rule actions are not supported for queries having data-modifying statements in WITH`
`2526`	`2526`	`-- silly example to verify that hasModifyingCTE flag is propagated`
`2527`	`2527`	`CREATE TEMP TABLE bug6051_3 AS`
`2528`	`2528`	`SELECT a FROM generate_series(11,13) AS a;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1169,7 +1169,7 @@ INSERT INTO bug6051 SELECT * FROM t1;`
`1169`	`1169`	`SELECT*FROM bug6051;`
`1170`	`1170`	`SELECT*FROM bug6051_2;`
`1171`	`1171`
`1172`		`--- check INSERT...SELECT rule actions are disallowed on commands`
	`1172`	`+-- check INSERT...SELECT rule actions are disallowed on commands`
`1173`	`1173`	`-- that have modifyingCTEs`
`1174`	`1174`	`CREATE OR REPLACERULEbug6051_insASON INSERT TO bug6051 DO INSTEAD`
`1175`	`1175`	`INSERT INTO bug6051_2`

Comments

(0)