Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc573e9d

Browse files
committed
Assorted message improvements
1 parentf41381e commitc573e9d

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

‎src/backend/commands/view.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ validateWithCheckOption(char *value)
5252
ereport(ERROR,
5353
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
5454
errmsg("invalid value for \"check_option\" option"),
55-
errdetail("Valid values are \"local\", and \"cascaded\".")));
55+
errdetail("Valid values are \"local\" and \"cascaded\".")));
5656
}
5757
}
5858

‎src/backend/port/sysv_shmem.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ CreateAnonymousSegment(Size *size)
391391
(mmap_errno==ENOMEM) ?
392392
errhint("This error usually means that PostgreSQL's request "
393393
"for a shared memory segment exceeded available memory, "
394-
"swap space or huge pages. To reduce the request size "
394+
"swap space, or huge pages. To reduce the request size "
395395
"(currently %zu bytes), reduce PostgreSQL's shared "
396396
"memory usage, perhaps by reducing shared_buffers or "
397397
"max_connections.",

‎src/backend/rewrite/rewriteHandler.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,10 +2088,10 @@ view_query_is_auto_updatable(Query *viewquery, bool check_cols)
20882088
* unique row in the underlying base relation.
20892089
*/
20902090
if (viewquery->hasAggs)
2091-
returngettext_noop("Views that return aggregate functions are not automatically updatable");
2091+
returngettext_noop("Views that return aggregate functions are not automatically updatable.");
20922092

20932093
if (viewquery->hasWindowFuncs)
2094-
returngettext_noop("Views that return window functions are not automatically updatable");
2094+
returngettext_noop("Views that return window functions are not automatically updatable.");
20952095

20962096
if (expression_returns_set((Node*)viewquery->targetList))
20972097
returngettext_noop("Views that return set-returning functions are not automatically updatable.");

‎src/backend/utils/misc/guc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6829,7 +6829,7 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt)
68296829
if (rename(AutoConfTmpFileName,AutoConfFileName)<0)
68306830
ereport(ERROR,
68316831
(errcode_for_file_access(),
6832-
errmsg("could not rename file \"%s\" to \"%s\": %m",
6832+
errmsg("could not rename file \"%s\" to \"%s\": %m",
68336833
AutoConfTmpFileName,AutoConfFileName)));
68346834
}
68356835
PG_CATCH();

‎src/bin/pg_ctl/nls.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# src/bin/pg_ctl/nls.mk
22
CATALOG_NAME = pg_ctl
33
AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru sv zh_CN zh_TW
4-
GETTEXT_FILES = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c
4+
GETTEXT_FILES = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c

‎src/bin/psql/command.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ exec_command(const char *cmd,
270270
pw=getpwuid(user_id);
271271
if (!pw)
272272
{
273-
psql_error("could not get home directory for userid %ld: %s\n",
273+
psql_error("could not get home directory for userID %ld: %s\n",
274274
(long)user_id,
275275
errno ?strerror(errno) :_("user does not exist"));
276276
exit(EXIT_FAILURE);

‎src/bin/psql/copy.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ do_copy(const char *args)
343343

344344
/* make sure the specified file is not a directory */
345345
if ((result=fstat(fileno(copystream),&st))<0)
346-
psql_error("could not stat file: %s\n",
347-
strerror(errno));
346+
psql_error("could not stat file \"%s\": %s\n",
347+
options->file,strerror(errno));
348348

349349
if (result==0&&S_ISDIR(st.st_mode))
350350
psql_error("%s: cannot copy from/to a directory\n",

‎src/test/regress/expected/updatable_views.out‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ DETAIL: Views containing HAVING are not automatically updatable.
151151
HINT: To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule.
152152
DELETE FROM ro_view4;
153153
ERROR: cannot delete from view "ro_view4"
154-
DETAIL: Views that return aggregate functions are not automatically updatable
154+
DETAIL: Views that return aggregate functions are not automatically updatable.
155155
HINT: To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule.
156156
DELETE FROM ro_view5;
157157
ERROR: cannot delete from view "ro_view5"
158-
DETAIL: Views that return window functions are not automatically updatable
158+
DETAIL: Views that return window functions are not automatically updatable.
159159
HINT: To enable deleting from the view, provide an INSTEAD OF DELETE trigger or an unconditional ON DELETE DO INSTEAD rule.
160160
DELETE FROM ro_view6;
161161
ERROR: cannot delete from view "ro_view6"
@@ -1497,7 +1497,7 @@ SELECT * FROM base_tbl;
14971497

14981498
ALTER VIEW rw_view1 SET (check_option=here); -- invalid
14991499
ERROR: invalid value for "check_option" option
1500-
DETAIL: Valid values are "local", and "cascaded".
1500+
DETAIL: Valid values are "local" and "cascaded".
15011501
ALTER VIEW rw_view1 SET (check_option=local);
15021502
INSERT INTO rw_view2 VALUES (-20); -- should fail
15031503
ERROR: new row violates WITH CHECK OPTION for view "rw_view1"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp