Fix message style

Mark one message not for translation, and prefer "cannot" over "may
not", per commentary from Robert Haas.

Discussion: https://postgr.es/m/20190430145813.GA29872@alvherre.pgsql

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 419da8784ac80727e334df5e8cb9c919f57811f6..bf82304b0ff50916dbd2092479dc35fc3ace0607 100644 (file)
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -1301,7 +1301,7 @@ heap_getnext(TableScanDesc sscan, ScanDirection direction)
        if (unlikely(sscan->rs_rd->rd_tableam != GetHeapamTableAmRoutine()))
                ereport(ERROR,
                                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                errmsg("only heap AM is supported")));
+                                errmsg_internal("only heap AM is supported")));
 
        /* Note: no locking manipulations needed */
 

diff --git a/src/backend/access/table/tableamapi.c b/src/backend/access/table/tableamapi.c
index 32877e7674f52d5d04a0dd4fe2d80b617791145c..34e6a4f20de4c7e52ddbba367758680d96790002 100644 (file)
--- a/src/backend/access/table/tableamapi.c
+++ b/src/backend/access/table/tableamapi.c
@@ -106,7 +106,8 @@ check_default_table_access_method(char **newval, void **extra, GucSource source)
 {
        if (**newval == '\0')
        {
-               GUC_check_errdetail("default_table_access_method may not be empty.");
+               GUC_check_errdetail("%s cannot be empty.",
+                                                       "default_table_access_method");
                return false;
        }
 

diff --git a/src/test/regress/expected/create_am.out b/src/test/regress/expected/create_am.out
index 352959b7518b26220ba9b8035572404013cb3b2d..f6d5c97cdedc88c58d3bf52714f08abcee3618a0 100644 (file)
--- a/src/test/regress/expected/create_am.out
+++ b/src/test/regress/expected/create_am.out
@@ -110,7 +110,7 @@ NOTICE:  drop cascades to index grect2ind2
 -- prevent empty values
 SET default_table_access_method = '';
 ERROR:  invalid value for parameter "default_table_access_method": ""
-DETAIL:  default_table_access_method may not be empty.
+DETAIL:  default_table_access_method cannot be empty.
 -- prevent nonexistant values
 SET default_table_access_method = 'I do not exist AM';
 ERROR:  invalid value for parameter "default_table_access_method": "I do not exist AM"