Message style fixes

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 93953fc8e7d961715d366e7db31364de53697a55..b981ae81ffa84ec39d4cfc3a5598d1b3a07c0ef3 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3281,7 +3281,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 d9b982d3a0b71a0ba91b1f287747460d1ab09eff..59ea8cc16e397c9cc40d6d5417212439c5e0b50e 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -252,7 +252,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 b303a9cbd0ce8fdb3ca1f132ea07695c3dbaf9c9..6439344cc7c8306fef1e7fddd6b93d303ea7ae09 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 4fe871406c7a10c79fbd8bce49a554a2a05d7f89..f03d43376c5961fcd2224606aed7eb042c30ef47 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -1264,9 +1264,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
@@ -1675,7 +1675,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;
 }
@@ -2774,7 +2774,7 @@ keep_going:                                               /* We will come back to here until there is
                                else if (!conn->gctx && conn->gssencmode[0] == 'r')
                                {
                                        appendPQExpBufferStr(&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