Message style fixes

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 394746a5ce0544d927986950e210d5c9f2e64493..389626285c8cb4314666c6a3e329805bb31b8e0b 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3278,7 +3278,7 @@ printGSSInfo(void)
    if (!PQgssEncInUse(pset.db))
        return;                 /* no GSSAPI encryption in use */
 
-   printf(_("GSSAPI Encrypted connection\n"));
+   printf(_("GSSAPI-encrypted connection\n"));
 }
 
 

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 5fb1baadc574dd8524a97c41a123f53898690523..d78dff71f98e10290a7b665433397822560e7a6f 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -251,7 +251,7 @@ slashUsage(unsigned short int pager)
    fprintf(output, _("  \\do[S]  [PATTERN]      list operators\n"));
    fprintf(output, _("  \\dO[S+] [PATTERN]      list collations\n"));
    fprintf(output, _("  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"));
-   fprintf(output, _("  \\dP[tin+] [PATTERN]    list [only table/index] partitioned relations\n"));
+   fprintf(output, _("  \\dP[itn+] [PATTERN]    list [only index/table] partitioned relations [n=nested]\n"));
    fprintf(output, _("  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"));
    fprintf(output, _("  \\dRp[+] [PATTERN]      list replication publications\n"));
    fprintf(output, _("  \\dRs[+] [PATTERN]      list replication subscriptions\n"));

diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index fb519195fc5ce2f9a74b5bcab326d9cd22644e43..c346a6b86cef914e96c869d33d909a3920f7b8b6 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -204,7 +204,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
            snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
            /*------
                translator: this string will be truncated at 149 characters expanded.  */
-                    ecpg_gettext("The cursor is invalid on line %d"), line);
+                    ecpg_gettext("cursor is invalid on line %d"), line);
            break;
 
        default:

diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
index 6edff5c0c0dcb65ca45dfee5e7e4acceb8acc8f4..d44198fef0eaa156ebfdbe09a1452226573297ff 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/prepare.c
+++ b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -696,7 +696,7 @@ ECPGdeclare(int lineno, const char *connection_name, const char *name)
 
    memset(p, 0, sizeof(struct declared_statement));
 
-   ecpg_log("ECPGdeclare on line %d: declared name %s on connection: \"%s\"\n", lineno, name, connection_name);
+   ecpg_log("ECPGdeclare on line %d: declared name \"%s\" on connection: \"%s\"\n", lineno, name, connection_name);
 
    p->name = ecpg_strdup(name, lineno);
    p->connection_name = ecpg_strdup(connection_name, lineno);
@@ -831,7 +831,7 @@ ecpg_release_declared_statement(const char *connection_name)
            else
                g_declared_list = cur->next;
 
-           ecpg_log("ecpg_release_declared_statement: declared name %s is released\n", cur->name);
+           ecpg_log("ecpg_release_declared_statement: declared name \"%s\" is released\n", cur->name);
 
            ecpg_free(cur->name);
            ecpg_free(cur->connection_name);

diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
index 1d58c778d9f83434493a72514a43d705706fe966..547da18d6ec97d167a8bc47ef361db2c725225e8 100644 (file)
--- a/src/interfaces/ecpg/preproc/ecpg.trailer
+++ b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -303,7 +303,7 @@ ECPGDeclareStmt: DECLARE prepared_name STATEMENT
                if (strcmp($2, ptr->name) == 0)
                {
                    /* re-definition is a bug */
-                   mmerror(PARSE_ERROR, ET_ERROR, "declared name %s is already defined", ptr->name);
+                   mmerror(PARSE_ERROR, ET_ERROR, "declared name \"%s\" is already defined", ptr->name);
                }
            }
 

diff --git a/src/interfaces/ecpg/test/expected/sql-declare.stderr b/src/interfaces/ecpg/test/expected/sql-declare.stderr
index e70253a0448d2f76953c2f8c963a41300ff1d538..d74082a38710e22e474b2112b160efa87cb8f7ef 100644 (file)
--- a/src/interfaces/ecpg/test/expected/sql-declare.stderr
+++ b/src/interfaces/ecpg/test/expected/sql-declare.stderr
@@ -92,7 +92,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: deallocate_one on line 86: name stmt_1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeclare on line 98: declared name stmt_2 on connection: "con1"
+[NO_PID]: ECPGdeclare on line 98: declared name "stmt_2" on connection: "con1"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: prepare_common on line 99: name stmt_2; query: "SELECT f1,f2,f3 FROM source"
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -142,7 +142,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: deallocate_one on line 111: name stmt_2
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeclare on line 122: declared name stmt_3 on connection: "con1"
+[NO_PID]: ECPGdeclare on line 122: declared name "stmt_3" on connection: "con1"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: prepare_common on line 123: name stmt_3; query: "SELECT f1,f2,f3 FROM source"
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -280,9 +280,9 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: connection con2 closed
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_release_declared_statement: declared name stmt_3 is released
+[NO_PID]: ecpg_release_declared_statement: declared name "stmt_3" is released
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_release_declared_statement: declared name stmt_2 is released
+[NO_PID]: ecpg_release_declared_statement: declared name "stmt_2" is released
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: connection con1 closed
 [NO_PID]: sqlca: code: 0, state: 00000

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 3359f70b4cd530b3f6c5eb6cdb0da85794a60f67..a7eab9a4af256b0c60d8b186a39af0926dc1ab13 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -1263,9 +1263,9 @@ connectOptions2(PGconn *conn)
        if (strcmp(conn->gssencmode, "require") == 0)
        {
            conn->status = CONNECTION_BAD;
-           printfPQExpBuffer(
-                             &conn->errorMessage,
-                             libpq_gettext("no GSSAPI support; cannot require GSSAPI\n"));
+           printfPQExpBuffer(&conn->errorMessage,
+                             libpq_gettext("gssencmode value \"%s\" invalid when GSSAPI support is not compiled in\n"),
+                             conn->gssencmode);
            return false;
        }
 #endif
@@ -1674,7 +1674,7 @@ parse_int_param(const char *value, int *result, PGconn *conn,
    }
 
    appendPQExpBuffer(&conn->errorMessage,
-                     libpq_gettext("invalid integer value \"%s\" for keyword \"%s\"\n"),
+                     libpq_gettext("invalid integer value \"%s\" for connection option \"%s\"\n"),
                      value, context);
    return false;
 }
@@ -2773,7 +2773,7 @@ keep_going:                       /* We will come back to here until there is
                else if (!conn->gctx && conn->gssencmode[0] == 'r')
                {
                    appendPQExpBuffer(&conn->errorMessage,
-                                     libpq_gettext("GSSAPI encryption required, but was impossible (possibly no credential cache, no server support, or using a local socket)\n"));
+                                     libpq_gettext("GSSAPI encryption required but was impossible (possibly no credential cache, no server support, or using a local socket)\n"));
                    goto error_return;
                }
 #endif