mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Assorted message improvements

Browse Source
This commit is contained in:
Peter Eisentraut 2014-08-29 00:01:34 -04:00
parent 14b7c8f2d0
commit 65c9dc231a
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/commands/view.c
View File

@ -52,7 +52,7 @@ validateWithCheckOption(char *value)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("invalid value for \"check_option\" option"),
errdetail("Valid values are \"local\", and \"cascaded\".")));
errdetail("Valid values are \"local\" and \"cascaded\".")));
}
}

2
src/backend/port/sysv_shmem.c
View File

@ -391,7 +391,7 @@ CreateAnonymousSegment(Size *size)
(mmap_errno == ENOMEM) ?
errhint("This error usually means that PostgreSQL's request "
"for a shared memory segment exceeded available memory, "
"swap space or huge pages. To reduce the request size "
"swap space, or huge pages. To reduce the request size "
"(currently %zu bytes), reduce PostgreSQL's shared "
"memory usage, perhaps by reducing shared_buffers or "
"max_connections.",

4
src/backend/rewrite/rewriteHandler.c
View File

@ -2088,10 +2088,10 @@ view_query_is_auto_updatable(Query *viewquery, bool check_cols)
* unique row in the underlying base relation.
*/
if (viewquery->hasAggs)
return gettext_noop("Views that return aggregate functions are not automatically updatable");
return gettext_noop("Views that return aggregate functions are not automatically updatable.");
if (viewquery->hasWindowFuncs)
return gettext_noop("Views that return window functions are not automatically updatable");
return gettext_noop("Views that return window functions are not automatically updatable.");
if (expression_returns_set((Node *) viewquery->targetList))
return gettext_noop("Views that return set-returning functions are not automatically updatable.");

2
src/backend/utils/misc/guc.c
View File

@ -6834,7 +6834,7 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt)
if (rename(AutoConfTmpFileName, AutoConfFileName) < 0)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not rename file \"%s\" to \"%s\" : %m",
errmsg("could not rename file \"%s\" to \"%s\": %m",
AutoConfTmpFileName, AutoConfFileName)));
}
PG_CATCH();

2
src/bin/pg_ctl/nls.mk
View File

@ -1,4 +1,4 @@
# src/bin/pg_ctl/nls.mk
CATALOG_NAME = pg_ctl
AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru sv zh_CN zh_TW
GETTEXT_FILES = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c
GETTEXT_FILES = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c

2
src/bin/psql/command.c
View File

@ -270,7 +270,7 @@ exec_command(const char *cmd,
pw = getpwuid(user_id);
if (!pw)
{
psql_error("could not get home directory for user id %ld: %s\n",
psql_error("could not get home directory for user ID %ld: %s\n",
(long) user_id,
errno ? strerror(errno) : _("user does not exist"));
exit(EXIT_FAILURE);

4
src/bin/psql/copy.c
View File

@ -343,8 +343,8 @@ do_copy(const char *args)
/* make sure the specified file is not a directory */
if ((result = fstat(fileno(copystream), &st)) < 0)
psql_error("could not stat file: %s\n",
strerror(errno));
psql_error("could not stat file \"%s\": %s\n",
options->file, strerror(errno));
if (result == 0 && S_ISDIR(st.st_mode))
psql_error("%s: cannot copy from/to a directory\n",

6
src/test/regress/expected/updatable_views.out
View File

@ -151,11 +151,11 @@ DETAIL: Views containing HAVING are not automatically updatable.
HINT: To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule.
DELETE FROM ro_view4;
ERROR: cannot delete from view "ro_view4"
DETAIL: Views that return aggregate functions are not automatically updatable
DETAIL: Views that return aggregate functions are not automatically updatable.
HINT: To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule.
DELETE FROM ro_view5;
ERROR: cannot delete from view "ro_view5"
DETAIL: Views that return window functions are not automatically updatable
DETAIL: Views that return window functions are not automatically updatable.
HINT: To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule.
DELETE FROM ro_view6;
ERROR: cannot delete from view "ro_view6"
@ -1497,7 +1497,7 @@ SELECT * FROM base_tbl;
ALTER VIEW rw_view1 SET (check_option=here); -- invalid
ERROR: invalid value for "check_option" option
DETAIL: Valid values are "local", and "cascaded".
DETAIL: Valid values are "local" and "cascaded".
ALTER VIEW rw_view1 SET (check_option=local);
INSERT INTO rw_view2 VALUES (-20); -- should fail
ERROR: new row violates WITH CHECK OPTION for view "rw_view1"