Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit cb05ab8

Browse files
peterepetere
committed
NLS cleanup in ecpglib
Replace leftover instances of _() by ecpg_gettext(), the latter being the correct way to refer to the library's message catalog, instead of the one of the program using the library. Drop NLS support for ecpg_log(), which is a debugging instrument similar to elog() in the backend. We cannot support NLS in the ecpg compatlib, because that requires ecpg_gettext, which is in ecpglib, which is not a dependency of compatlib. It doesn't seem worthwhile to worry about this, since the only translatable string is "out of memory", and gettext probably won't be able to do much without memory either. Adjust messages to project style.
1 parent cbb1358 commit cb05ab8

16 files changed

+69
-63
lines changed

‎src/interfaces/ecpg/compatlib/informix.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.56 2008/11/01 08:55:21 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.57 2009/01/15 11:52:54 petere Exp $ */
22

33
#define POSTGRES_ECPG_INTERNAL
44
#include "postgres_fe.h"
@@ -1010,7 +1010,7 @@ ECPG_informix_set_var(int number, void *pointer, int lineno)
10101010

10111011
sqlca->sqlcode = ECPG_OUT_OF_MEMORY;
10121012
strncpy(sqlca->sqlstate, "YE001", sizeof("YE001"));
1013-
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc), _("out of memory on line %d"), lineno);
1013+
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc), "out of memory on line %d", lineno);
10141014
sqlca->sqlerrm.sqlerrml = strlen(sqlca->sqlerrm.sqlerrmc);
10151015
/* free all memory we have allocated for the user */
10161016
ECPGfree_auto_mem();

‎src/interfaces/ecpg/ecpglib/connect.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.52 2008/12/17 16:52:07 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.53 2009/01/15 11:52:55 petere Exp $ */
22

33
#define POSTGRES_ECPG_INTERNAL
44
#include "postgres_fe.h"
@@ -223,7 +223,7 @@ ECPGnoticeReceiver(void *arg, const PGresult *result)
223223
sqlstate = ECPG_SQLSTATE_ECPG_INTERNAL_ERROR;
224224

225225
if (message == NULL) /* Shouldn't happen, but need to be sure */
226-
message = _("No message received");
226+
message = ecpg_gettext("empty message text");
227227

228228
/* these are not warnings */
229229
if (strncmp(sqlstate, "00", 2) == 0)
@@ -378,7 +378,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
378378
if (strncmp(dbname, "unix:", 5) != 0)
379379
{
380380
ecpg_log("ECPGconnect: socketname %s given for TCP connection on line %d\n", host, lineno);
381-
ecpg_raise(lineno, ECPG_CONNECT, ECPG_SQLSTATE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION, realname ? realname : _("<DEFAULT>"));
381+
ecpg_raise(lineno, ECPG_CONNECT, ECPG_SQLSTATE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION, realname ? realname : ecpg_gettext("<DEFAULT>"));
382382
if (host)
383383
ecpg_free(host);
384384

@@ -404,7 +404,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
404404
if (strcmp(dbname + offset, "localhost") != 0 && strcmp(dbname + offset, "127.0.0.1") != 0)
405405
{
406406
ecpg_log("ECPGconnect: non-localhost access via sockets on line %d\n", lineno);
407-
ecpg_raise(lineno, ECPG_CONNECT, ECPG_SQLSTATE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION, realname ? realname : _("<DEFAULT>"));
407+
ecpg_raise(lineno, ECPG_CONNECT, ECPG_SQLSTATE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION, realname ? realname : ecpg_gettext("<DEFAULT>"));
408408
if (host)
409409
ecpg_free(host);
410410
if (port)
@@ -471,11 +471,11 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
471471
actual_connection = all_connections;
472472

473473
ecpg_log("ECPGconnect: opening database %s on %s port %s %s%s %s%s\n",
474-
realname ? realname : _("<DEFAULT>"),
475-
host ? host : _("<DEFAULT>"),
476-
port ? (ecpg_internal_regression_mode ? _("<REGRESSION_PORT>") : port) : _("<DEFAULT>"),
477-
options ? _("with options ") : "", options ? options : "",
478-
user ? _("for user ") : "", user ? user : "");
474+
realname ? realname : "<DEFAULT>",
475+
host ? host : "<DEFAULT>",
476+
port ? (ecpg_internal_regression_mode ? "<REGRESSION_PORT>" : port) : "<DEFAULT>",
477+
options ? "with options " : "", options ? options : "",
478+
user ? "for user " : "", user ? user : "");
479479

480480
connect_string = ecpg_alloc( strlen_or_null(host)
481481
+ strlen_or_null(port)
@@ -515,7 +515,7 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
515515
if (PQstatus(this->connection) == CONNECTION_BAD)
516516
{
517517
const char *errmsg = PQerrorMessage(this->connection);
518-
const char *db = realname ? realname : _("<DEFAULT>");
518+
const char *db = realname ? realname : ecpg_gettext("<DEFAULT>");
519519

520520
ecpg_log("ECPGconnect: could not open database: %s\n", errmsg);
521521

‎src/interfaces/ecpg/ecpglib/data.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.41 2008/05/16 15:20:03 petere Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.42 2009/01/15 11:52:55 petere Exp $ */
22

33
#define POSTGRES_ECPG_INTERNAL
44
#include "postgres_fe.h"
@@ -60,7 +60,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
6060
else
6161
log_offset = offset;
6262

63-
ecpg_log("ecpg_get_data on line %d: RESULT: %s offset: %ld; array: %s\n", lineno, pval ? (binary ? _("BINARY") : pval) : _("EMPTY"), log_offset, isarray ? _("yes") : _("no"));
63+
ecpg_log("ecpg_get_data on line %d: RESULT: %s offset: %ld; array: %s\n", lineno, pval ? (binary ? "BINARY" : pval) : "EMPTY", log_offset, isarray ? "yes" : "no");
6464

6565
/* We will have to decode the value */
6666

@@ -360,7 +360,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
360360
else
361361
ecpg_raise(lineno, ECPG_CONVERT_BOOL,
362362
ECPG_SQLSTATE_DATATYPE_MISMATCH,
363-
_("different size"));
363+
NULL);
364364
break;
365365
}
366366
else if (pval[0] == 't' && pval[1] == '\0')
@@ -372,7 +372,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
372372
else
373373
ecpg_raise(lineno, ECPG_CONVERT_BOOL,
374374
ECPG_SQLSTATE_DATATYPE_MISMATCH,
375-
_("different size"));
375+
NULL);
376376
break;
377377
}
378378
else if (pval[0] == '\0' && PQgetisnull(results, act_tuple, act_field))

‎src/interfaces/ecpg/ecpglib/descriptor.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* dynamic SQL support routines
22
*
3-
* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.30 2008/05/16 15:20:03 petere Exp $
3+
* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.31 2009/01/15 11:52:55 petere Exp $
44
*/
55

66
#define POSTGRES_ECPG_INTERNAL
@@ -724,6 +724,6 @@ ecpg_find_desc(int line, const char *name)
724724
bool
725725
ECPGdescribe(int line, bool input, const char *statement,...)
726726
{
727-
ecpg_log("ECPGdescribe called on line %d for %s: %s\n", line, (input) ? _("input") : _("output"), statement);
727+
ecpg_log("ECPGdescribe called on line %d for %s: %s\n", line, input ? "input" : "output", statement);
728728
return false;
729729
}

‎src/interfaces/ecpg/ecpglib/error.c

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.20 2008/05/16 15:20:03 petere Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.21 2009/01/15 11:52:55 petere Exp $ */
22

33
#define POSTGRES_ECPG_INTERNAL
44
#include "postgres_fe.h"
@@ -37,7 +37,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
3737
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
3838
/* translator: this string will be truncated at 149
3939
characters expanded. */
40-
ecpg_gettext("unsupported type %s on line %d"), str, line);
40+
ecpg_gettext("unsupported type \"%s\" on line %d"), str, line);
4141
break;
4242

4343
case ECPG_TOO_MANY_ARGUMENTS:
@@ -58,28 +58,34 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
5858
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
5959
/* translator: this string will be truncated at 149
6060
characters expanded. */
61-
ecpg_gettext("not correctly formatted int type \"%s\" on line %d"), str, line);
61+
ecpg_gettext("invalid input syntax for type int: \"%s\", on line %d"), str, line);
6262
break;
6363

6464
case ECPG_UINT_FORMAT:
6565
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
6666
/* translator: this string will be truncated at 149
6767
characters expanded. */
68-
ecpg_gettext("not correctly formatted unsigned type \"%s\" on line %d"), str, line);
68+
ecpg_gettext("invalid input syntax for type unsigned int: \"%s\", on line %d"), str, line);
6969
break;
7070

7171
case ECPG_FLOAT_FORMAT:
7272
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
7373
/* translator: this string will be truncated at 149
7474
characters expanded. */
75-
ecpg_gettext("not correctly formatted floating-point type \"%s\" on line %d"), str, line);
75+
ecpg_gettext("invalid input syntax for floating-point type: \"%s\", on line %d"), str, line);
7676
break;
7777

7878
case ECPG_CONVERT_BOOL:
79-
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
80-
/* translator: this string will be truncated at 149
81-
characters expanded. */
82-
ecpg_gettext("could not convert %s to bool on line %d"), str, line);
79+
if (str)
80+
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
81+
/* translator: this string will be truncated at 149
82+
characters expanded. */
83+
ecpg_gettext("invalid syntax for type boolean: \"%s\", on line %d"), str, line);
84+
else
85+
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
86+
/* translator: this string will be truncated at 149
87+
characters expanded. */
88+
ecpg_gettext("could not convert boolean value: size mismatch, on line %d"), line);
8389
break;
8490

8591
case ECPG_EMPTY:
@@ -93,7 +99,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
9399
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
94100
/* translator: this string will be truncated at 149
95101
characters expanded. */
96-
ecpg_gettext("NULL value without indicator on line %d"), line);
102+
ecpg_gettext("null value without indicator on line %d"), line);
97103
break;
98104

99105
case ECPG_NO_ARRAY:
@@ -107,7 +113,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
107113
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
108114
/* translator: this string will be truncated at 149
109115
characters expanded. */
110-
ecpg_gettext("data read from backend is not an array on line %d"), line);
116+
ecpg_gettext("data read from server is not an array on line %d"), line);
111117
break;
112118

113119
case ECPG_ARRAY_INSERT:
@@ -121,7 +127,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
121127
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
122128
/* translator: this string will be truncated at 149
123129
characters expanded. */
124-
ecpg_gettext("no such connection %s on line %d"), str, line);
130+
ecpg_gettext("connection \"%s\" does not exist on line %d"), str, line);
125131
break;
126132

127133
case ECPG_NOT_CONN:
@@ -135,14 +141,14 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
135141
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
136142
/* translator: this string will be truncated at 149
137143
characters expanded. */
138-
ecpg_gettext("invalid statement name %s on line %d"), str, line);
144+
ecpg_gettext("invalid statement name \"%s\" on line %d"), str, line);
139145
break;
140146

141147
case ECPG_UNKNOWN_DESCRIPTOR:
142148
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
143149
/* translator: this string will be truncated at 149
144150
characters expanded. */
145-
ecpg_gettext("descriptor %s not found on line %d"), str, line);
151+
ecpg_gettext("descriptor \"%s\" not found on line %d"), str, line);
146152
break;
147153

148154
case ECPG_INVALID_DESCRIPTOR_INDEX:
@@ -156,7 +162,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
156162
snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc),
157163
/* translator: this string will be truncated at 149
158164
characters expanded. */
159-
ecpg_gettext("unknown descriptor item %s on line %d"), str, line);
165+
ecpg_gettext("unrecognized descriptor item \"%s\" on line %d"), str, line);
160166
break;
161167

162168
case ECPG_VAR_NOT_NUMERIC:
@@ -304,5 +310,5 @@ sqlprint(void)
304310
struct sqlca_t *sqlca = ECPGget_sqlca();
305311

306312
sqlca->sqlerrm.sqlerrmc[sqlca->sqlerrm.sqlerrml] = '\0';
307-
fprintf(stderr, _("sql error: %s\n"), sqlca->sqlerrm.sqlerrmc);
313+
fprintf(stderr, ecpg_gettext("SQL error: %s\n"), sqlca->sqlerrm.sqlerrmc);
308314
}

‎src/interfaces/ecpg/ecpglib/execute.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.78 2008/05/16 15:20:03 petere Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.79 2009/01/15 11:52:55 petere Exp $ */
22

33
/*
44
* The aim is to get a simpler inteface to the database routines.
@@ -301,7 +301,7 @@ ecpg_is_type_an_array(int type, const struct statement * stmt, const struct vari
301301
return (ECPG_ARRAY_ERROR);
302302

303303
ecpg_type_infocache_push(&(stmt->connection->cache_head), type, isarray, stmt->lineno);
304-
ecpg_log("ecpg_is_type_an_array on line %d: type (%d); C (%d); array (%s)\n", stmt->lineno, type, var->type, isarray ? _("yes") : _("no"));
304+
ecpg_log("ecpg_is_type_an_array on line %d: type (%d); C (%d); array (%s)\n", stmt->lineno, type, var->type, isarray ? "yes" : "no");
305305
return isarray;
306306
}
307307

@@ -729,7 +729,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
729729
for (element = 0; element < var->arrsize; element++)
730730
sprintf(mallocedval + strlen(mallocedval), "%c,", (((int *) var->value)[element]) ? 't' : 'f');
731731
else
732-
ecpg_raise(lineno, ECPG_CONVERT_BOOL, ECPG_SQLSTATE_DATATYPE_MISMATCH, _("different size"));
732+
ecpg_raise(lineno, ECPG_CONVERT_BOOL, ECPG_SQLSTATE_DATATYPE_MISMATCH, NULL);
733733

734734
strcpy(mallocedval + strlen(mallocedval) - 1, "]");
735735
}
@@ -740,7 +740,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
740740
else if (var->offset == sizeof(int))
741741
sprintf(mallocedval, "%c", (*((int *) var->value)) ? 't' : 'f');
742742
else
743-
ecpg_raise(lineno, ECPG_CONVERT_BOOL, ECPG_SQLSTATE_DATATYPE_MISMATCH, _("different size"));
743+
ecpg_raise(lineno, ECPG_CONVERT_BOOL, ECPG_SQLSTATE_DATATYPE_MISMATCH, NULL);
744744
}
745745

746746
*tobeinserted_p = mallocedval;
@@ -1042,7 +1042,7 @@ free_params(const char **paramValues, int nParams, bool print, int lineno)
10421042
for (n = 0; n < nParams; n++)
10431043
{
10441044
if (print)
1045-
ecpg_log("free_params on line %d: parameter %d = %s\n", lineno, n + 1, paramValues[n] ? paramValues[n] : _("null"));
1045+
ecpg_log("free_params on line %d: parameter %d = %s\n", lineno, n + 1, paramValues[n] ? paramValues[n] : "null");
10461046
ecpg_free((void *) (paramValues[n]));
10471047
}
10481048
ecpg_free(paramValues);
@@ -1625,7 +1625,7 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char
16251625
if (con == NULL || con->connection == NULL)
16261626
{
16271627
free_statement(stmt);
1628-
ecpg_raise(lineno, ECPG_NOT_CONN, ECPG_SQLSTATE_ECPG_INTERNAL_ERROR, (con) ? con->name : _("<empty>"));
1628+
ecpg_raise(lineno, ECPG_NOT_CONN, ECPG_SQLSTATE_ECPG_INTERNAL_ERROR, (con) ? con->name : ecpg_gettext("<empty>"));
16291629
setlocale(LC_NUMERIC, oldlocale);
16301630
ecpg_free(oldlocale);
16311631
return false;

‎src/interfaces/ecpg/ecpglib/misc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.47 2009/01/02 13:26:54 petere Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.48 2009/01/15 11:52:55 petere Exp $ */
22

33
#define POSTGRES_ECPG_INTERNAL
44
#include "postgres_fe.h"
@@ -110,7 +110,7 @@ ecpg_init(const struct connection * con, const char *connection_name, const int
110110
if (con == NULL)
111111
{
112112
ecpg_raise(lineno, ECPG_NO_CONN, ECPG_SQLSTATE_CONNECTION_DOES_NOT_EXIST,
113-
connection_name ? connection_name : _("NULL"));
113+
connection_name ? connection_name : ecpg_gettext("NULL"));
114114
return (false);
115115
}
116116

@@ -179,7 +179,7 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
179179
if (!ecpg_init(con, connection_name, lineno))
180180
return (false);
181181

182-
ecpg_log("ECPGtrans on line %d: action \"%s\"; connection \"%s\"\n", lineno, transaction, con ? con->name : _("null"));
182+
ecpg_log("ECPGtrans on line %d: action \"%s\"; connection \"%s\"\n", lineno, transaction, con ? con->name : "null");
183183

184184
/* if we have no connection we just simulate the command */
185185
if (con && con->connection)

‎src/interfaces/ecpg/ecpglib/nls.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# $PostgreSQL $
22
CATALOG_NAME = ecpglib
33
AVAIL_LANGUAGES =
4-
GETTEXT_FILES = ../compatlib/informix.c connect.c data.c descriptor.c error.c execute.c misc.c prepare.c
5-
GETTEXT_TRIGGERS = _ ecpg_gettext ecpg_log
4+
GETTEXT_FILES = connect.c error.c execute.c misc.c
5+
GETTEXT_TRIGGERS = ecpg_gettext

‎src/interfaces/ecpg/test/expected/connect-test2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
[NO_PID]: sqlca: code: 0, state: 00000
4747
[NO_PID]: ecpg_get_data on line 37: RESULT: regress1 offset: -1; array: yes
4848
[NO_PID]: sqlca: code: 0, state: 00000
49-
[NO_PID]: raising sqlcode -220 on line 40: no such connection first on line 40
49+
[NO_PID]: raising sqlcode -220 on line 40: connection "first" does not exist on line 40
5050
[NO_PID]: sqlca: code: -220, state: 08003
5151
[NO_PID]: ecpg_finish: connection second closed
5252
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/connect-test3.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
[NO_PID]: sqlca: code: 0, state: 00000
2525
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
2626
[NO_PID]: sqlca: code: 0, state: 00000
27-
[NO_PID]: raising sqlcode -220 on line 35: no such connection DEFAULT on line 35
27+
[NO_PID]: raising sqlcode -220 on line 35: connection "DEFAULT" does not exist on line 35
2828
[NO_PID]: sqlca: code: -220, state: 08003
2929
[NO_PID]: ECPGconnect: connection identifier second is already in use
3030
[NO_PID]: sqlca: code: 0, state: 00000
3131
[NO_PID]: ecpg_finish: connection second closed
3232
[NO_PID]: sqlca: code: 0, state: 00000
3333
[NO_PID]: ecpg_finish: connection first closed
3434
[NO_PID]: sqlca: code: 0, state: 00000
35-
[NO_PID]: raising sqlcode -220 on line 40: no such connection CURRENT on line 40
35+
[NO_PID]: raising sqlcode -220 on line 40: connection "CURRENT" does not exist on line 40
3636
[NO_PID]: sqlca: code: -220, state: 08003
37-
[NO_PID]: raising sqlcode -220 on line 41: no such connection DEFAULT on line 41
37+
[NO_PID]: raising sqlcode -220 on line 41: connection "DEFAULT" does not exist on line 41
3838
[NO_PID]: sqlca: code: -220, state: 08003

‎src/interfaces/ecpg/test/expected/connect-test4.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
[NO_PID]: sqlca: code: 0, state: 00000
33
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
44
[NO_PID]: sqlca: code: 0, state: 00000
5-
[NO_PID]: raising sqlcode -220 on line 17: no such connection DEFAULT on line 17
5+
[NO_PID]: raising sqlcode -220 on line 17: connection "DEFAULT" does not exist on line 17
66
[NO_PID]: sqlca: code: -220, state: 08003

‎src/interfaces/ecpg/test/expected/connect-test5.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
[NO_PID]: sqlca: code: 0, state: 00000
5151
[NO_PID]: raising sqlcode -402 on line 56: could not connect to database "connectdb" on line 56
5252
[NO_PID]: sqlca: code: -402, state: 08001
53-
[NO_PID]: raising sqlcode -220 on line 57: no such connection main on line 57
53+
[NO_PID]: raising sqlcode -220 on line 57: connection "main" does not exist on line 57
5454
[NO_PID]: sqlca: code: -220, state: 08003
5555
[NO_PID]: ECPGconnect: opening database <DEFAULT> on <DEFAULT> port <DEFAULT> for user connectdb
5656
[NO_PID]: sqlca: code: 0, state: 00000
@@ -62,5 +62,5 @@
6262
[NO_PID]: sqlca: code: 0, state: 00000
6363
[NO_PID]: ecpg_finish: connection main closed
6464
[NO_PID]: sqlca: code: 0, state: 00000
65-
[NO_PID]: raising sqlcode -220 on line 68: no such connection nonexistant on line 68
65+
[NO_PID]: raising sqlcode -220 on line 68: connection "nonexistant" does not exist on line 68
6666
[NO_PID]: sqlca: code: -220, state: 08003

‎src/interfaces/ecpg/test/expected/preproc-init.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[NO_PID]: ECPGdebug: set to 1
22
[NO_PID]: sqlca: code: 0, state: 00000
3-
[NO_PID]: raising sqlcode -220 on line 88: no such connection NULL on line 88
3+
[NO_PID]: raising sqlcode -220 on line 88: connection "NULL" does not exist on line 88
44
[NO_PID]: sqlca: code: -220, state: 08003
5-
[NO_PID]: raising sqlcode -220 on line 90: no such connection NULL on line 90
5+
[NO_PID]: raising sqlcode -220 on line 90: connection "NULL" does not exist on line 90
66
[NO_PID]: sqlca: code: -220, state: 08003
7-
[NO_PID]: raising sqlcode -220 on line 92: no such connection NULL on line 92
7+
[NO_PID]: raising sqlcode -220 on line 92: connection "NULL" does not exist on line 92
88
[NO_PID]: sqlca: code: -220, state: 08003
9-
[NO_PID]: raising sqlcode -220 on line 94: no such connection NULL on line 94
9+
[NO_PID]: raising sqlcode -220 on line 94: connection "NULL" does not exist on line 94
1010
[NO_PID]: sqlca: code: -220, state: 08003
11-
[NO_PID]: raising sqlcode -220 on line 96: no such connection NULL on line 96
11+
[NO_PID]: raising sqlcode -220 on line 96: connection "NULL" does not exist on line 96
1212
[NO_PID]: sqlca: code: -220, state: 08003
13-
[NO_PID]: raising sqlcode -220 on line 98: no such connection NULL on line 98
13+
[NO_PID]: raising sqlcode -220 on line 98: connection "NULL" does not exist on line 98
1414
[NO_PID]: sqlca: code: -220, state: 08003

0 commit comments

Comments
 (0)