mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-18 18:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add missing errcode() in a few ereport calls.

Browse Source 
This will allow to specifying SQLSTATE error code for the errors in the
missing places.

Reported-by: Sawada Masahiko
Author: Sawada Masahiko
Backpatch-through: 9.5
Discussion: https://postgr.es/m/CA+fd4k6N8EjNvZpM8nme+y+05mz-SM8Z_BgkixzkA34R+ej0Kw@mail.gmail.com
This commit is contained in:
Amit Kapila 2020-03-18 09:27:14 +05:30
parent fdeeb524b4
commit b4f140869f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/adminpack/adminpack.c
View File

@ -184,7 +184,7 @@ pg_file_write_internal(text *file, text *data, bool replace)
if (stat(filename, &fst) >= 0) if (stat(filename, &fst) >= 0)
ereport(ERROR, ereport(ERROR,
(ERRCODE_DUPLICATE_FILE, (errcode(ERRCODE_DUPLICATE_FILE),
errmsg("file \"%s\" exists", filename))); errmsg("file \"%s\" exists", filename)));
f = AllocateFile(filename, "wb"); f = AllocateFile(filename, "wb");
@ -340,7 +340,7 @@ pg_file_rename_internal(text *file1, text *file2, text *file3)
if (rc >= 0 || errno != ENOENT) if (rc >= 0 || errno != ENOENT)
{ {
ereport(ERROR, ereport(ERROR,
(ERRCODE_DUPLICATE_FILE, (errcode(ERRCODE_DUPLICATE_FILE),
errmsg("cannot rename to target file \"%s\"", errmsg("cannot rename to target file \"%s\"",
fn3 ? fn3 : fn2))); fn3 ? fn3 : fn2)));
} }
@ -371,7 +371,7 @@ pg_file_rename_internal(text *file1, text *file2, text *file3)
else else
{ {
ereport(ERROR, ereport(ERROR,
(ERRCODE_UNDEFINED_FILE, (errcode(ERRCODE_UNDEFINED_FILE),
errmsg("renaming \"%s\" to \"%s\" was reverted", errmsg("renaming \"%s\" to \"%s\" was reverted",
fn2, fn3))); fn2, fn3)));
} }

2
src/backend/storage/page/bufpage.c
View File

@ -141,7 +141,7 @@ PageIsVerified(Page page, BlockNumber blkno)
if (checksum_failure) if (checksum_failure)
{ {
ereport(WARNING, ereport(WARNING,
(ERRCODE_DATA_CORRUPTED, (errcode(ERRCODE_DATA_CORRUPTED),
errmsg("page verification failed, calculated checksum %u but expected %u", errmsg("page verification failed, calculated checksum %u but expected %u",
checksum, p->pd_checksum))); checksum, p->pd_checksum)));