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)
3737snprintf (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 );
4141break ;
4242
4343case ECPG_TOO_MANY_ARGUMENTS :
@@ -58,28 +58,34 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
5858snprintf (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 typeint: \"%s\", on line %d" ),str ,line );
6262break ;
6363
6464case ECPG_UINT_FORMAT :
6565snprintf (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 typeunsigned int: \"%s\", on line %d" ),str ,line );
6969break ;
7070
7171case ECPG_FLOAT_FORMAT :
7272snprintf (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 );
7676break ;
7777
7878case 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 );
8389break ;
8490
8591case ECPG_EMPTY :
@@ -93,7 +99,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
9399snprintf (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 );
97103break ;
98104
99105case ECPG_NO_ARRAY :
@@ -107,7 +113,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
107113snprintf (sqlca -> sqlerrm .sqlerrmc ,sizeof (sqlca -> sqlerrm .sqlerrmc ),
108114/* translator: this string will be truncated at 149
109115 characters expanded. */
110- ecpg_gettext ("data read frombackend is not an array on line %d" ),line );
116+ ecpg_gettext ("data read fromserver is not an array on line %d" ),line );
111117break ;
112118
113119case ECPG_ARRAY_INSERT :
@@ -121,7 +127,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
121127snprintf (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 );
125131break ;
126132
127133case ECPG_NOT_CONN :
@@ -135,14 +141,14 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
135141snprintf (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 );
139145break ;
140146
141147case ECPG_UNKNOWN_DESCRIPTOR :
142148snprintf (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 );
146152break ;
147153
148154case ECPG_INVALID_DESCRIPTOR_INDEX :
@@ -156,7 +162,7 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str)
156162snprintf (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 );
160166break ;
161167
162168case ECPG_VAR_NOT_NUMERIC :
@@ -304,5 +310,5 @@ sqlprint(void)
304310struct sqlca_t * sqlca = ECPGget_sqlca ();
305311
306312sqlca -> 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}