diff options
Diffstat (limited to 'src/interfaces/ecpg')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/error.c | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/prepare.c | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/ecpg.trailer | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/expected/sql-declare.stderr | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c index fb519195fc5..c346a6b86ce 100644 --- 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 6edff5c0c0d..d44198fef0e 100644 --- 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 1d58c778d9f..547da18d6ec 100644 --- 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 e70253a0448..d74082a3871 100644 --- 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 |