Assorted message improvements

diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 683621c35e5b05ea671d6aa480071e06839a9aef..9d0039c42a42088ac21326d6cbd6c5ad6121ecf0 100644 (file)
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -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\".")));
        }
 }
 

diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index 6ab4a67a6dcb7dc9c8e17c57da8fe75e16936a4e..b7c9b809401e728cb34e3e044b9df3ed0c0ba1e7 100644 (file)
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -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.",

diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index e6c553068c748fcdfd168d9a2f3b30caf0f38f60..cb65c0502effc01212e240cbd8e1f14462aef75f 100644 (file)
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -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.");

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index e887ec3a3711207eaa8596bb6fee6f9fb691b73d..0e630fdbde5684ec8b112012888c4de29e521277 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -6829,7 +6829,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();

diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 187df408835cd296aae152ca0644687687e4e863..badc1b7e6c9b28c77a97a22c30863cc999c460e0 100644 (file)
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -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

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 741a72d9254cf0ba507485166aabc3434097e062..d18a7a6c35131e99154c9842484aa46b1d602111 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -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);

diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index c759abfc855d323bf0dde4eb237ee397254d81b0..4b749154adf951c3e02c6d3152f0ecf2d85373fd 100644 (file)
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -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",

diff --git a/src/test/regress/expected/updatable_views.out b/src/test/regress/expected/updatable_views.out
index ea9197ab1d78381309fa58cd99dec7e9bcd2c7f4..6576c474510fc4ca007a222ceb41291a4a4fc37d 100644 (file)
--- a/src/test/regress/expected/updatable_views.out
+++ b/src/test/regress/expected/updatable_views.out
@@ -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"