database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-13 14:22:43 +03:00
Code Activity

Unify some more messages

Browse Source 
No backpatch here because of message wording changes.

Author: Álvaro Herrera <alvherre@kurilemu.de>
Reviewed-by: Nathan Bossart <nathandbossart@gmail.com>
Discussion: https://postgr.es/m/202512081537.ahw5gwoencou@alvherre.pgsql
This commit is contained in:
Álvaro Herrera
2025-12-08 19:23:38 +01:00
parent 65d6acbc56
commit d0d0ba6cf6
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/commands/matview.c
View File

@@ -210,8 +210,8 @@ RefreshMatViewByOid(Oid matviewOid, bool is_create, bool skipData,
if (concurrent && skipData) if (concurrent && skipData)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("%s and %s options cannot be used together", errmsg("%s options %s and %s cannot be used together",
"CONCURRENTLY", "WITH NO DATA"))); "REFRESH", "CONCURRENTLY", "WITH NO DATA")));
/* /*
* Check that everything is correct for a refresh. Problems at this point * Check that everything is correct for a refresh. Problems at this point

3
src/backend/postmaster/checkpointer.c
View File

@@ -1019,7 +1019,8 @@ ExecCheckpoint(ParseState *pstate, CheckPointStmt *stmt)
else if (strcmp(mode, "fast") != 0) else if (strcmp(mode, "fast") != 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("unrecognized MODE option \"%s\"", mode), errmsg("unrecognized value for %s option \"%s\": \"%s\"",
"CHECKPOINT", "mode", mode),
parser_errposition(pstate, opt->location))); parser_errposition(pstate, opt->location)));
} }
else if (strcmp(opt->defname, "flush_unlogged") == 0) else if (strcmp(opt->defname, "flush_unlogged") == 0)

2
src/test/regress/expected/matview.out
View File

@@ -294,7 +294,7 @@ DROP MATERIALIZED VIEW IF EXISTS no_such_mv;
NOTICE: materialized view "no_such_mv" does not exist, skipping NOTICE: materialized view "no_such_mv" does not exist, skipping
-- make sure invalid combination of options is prohibited -- make sure invalid combination of options is prohibited
REFRESH MATERIALIZED VIEW CONCURRENTLY mvtest_tvmm WITH NO DATA; REFRESH MATERIALIZED VIEW CONCURRENTLY mvtest_tvmm WITH NO DATA;
ERROR: CONCURRENTLY and WITH NO DATA options cannot be used together ERROR: REFRESH options CONCURRENTLY and WITH NO DATA cannot be used together
-- no tuple locks on materialized views -- no tuple locks on materialized views
SELECT * FROM mvtest_tvvm FOR SHARE; SELECT * FROM mvtest_tvvm FOR SHARE;
ERROR: cannot lock rows in materialized view "mvtest_tvvm" ERROR: cannot lock rows in materialized view "mvtest_tvvm"

2
src/test/regress/expected/stats.out
View File

@@ -965,7 +965,7 @@ ERROR: unrecognized CHECKPOINT option "wrong"
LINE 1: CHECKPOINT (WRONG); LINE 1: CHECKPOINT (WRONG);
^ ^
CHECKPOINT (MODE WRONG); CHECKPOINT (MODE WRONG);
ERROR: unrecognized MODE option "wrong" ERROR: unrecognized value for CHECKPOINT option "mode": "wrong"
LINE 1: CHECKPOINT (MODE WRONG); LINE 1: CHECKPOINT (MODE WRONG);
^ ^
CHECKPOINT (MODE FAST, FLUSH_UNLOGGED FALSE); CHECKPOINT (MODE FAST, FLUSH_UNLOGGED FALSE);