database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

NLS cleanup in ecpglib

Browse Source 
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.
This commit is contained in:
Peter Eisentraut
2009-01-15 11:52:55 +00:00
parent cbb1358b18
commit cb05ab81a8
16 changed files with 69 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/ecpg/test/expected/connect-test2.stderr
View File

@ -46,7 +46,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_get_data on line 37: RESULT: regress1 offset: -1; array: yes
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -220 on line 40: no such connection first on line 40
[NO_PID]: raising sqlcode -220 on line 40: connection "first" does not exist on line 40
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: ecpg_finish: connection second closed
[NO_PID]: sqlca: code: 0, state: 00000

6
src/interfaces/ecpg/test/expected/connect-test3.stderr
View File

@ -24,7 +24,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -220 on line 35: no such connection DEFAULT on line 35
[NO_PID]: raising sqlcode -220 on line 35: connection "DEFAULT" does not exist on line 35
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: ECPGconnect: connection identifier second is already in use
[NO_PID]: sqlca: code: 0, state: 00000
@ -32,7 +32,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection first closed
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -220 on line 40: no such connection CURRENT on line 40
[NO_PID]: raising sqlcode -220 on line 40: connection "CURRENT" does not exist on line 40
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: raising sqlcode -220 on line 41: no such connection DEFAULT on line 41
[NO_PID]: raising sqlcode -220 on line 41: connection "DEFAULT" does not exist on line 41
[NO_PID]: sqlca: code: -220, state: 08003

2
src/interfaces/ecpg/test/expected/connect-test4.stderr
View File

@ -2,5 +2,5 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -220 on line 17: no such connection DEFAULT on line 17
[NO_PID]: raising sqlcode -220 on line 17: connection "DEFAULT" does not exist on line 17
[NO_PID]: sqlca: code: -220, state: 08003

4
src/interfaces/ecpg/test/expected/connect-test5.stderr
View File

@ -50,7 +50,7 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -402 on line 56: could not connect to database "connectdb" on line 56
[NO_PID]: sqlca: code: -402, state: 08001
[NO_PID]: raising sqlcode -220 on line 57: no such connection main on line 57
[NO_PID]: raising sqlcode -220 on line 57: connection "main" does not exist on line 57
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: ECPGconnect: opening database <DEFAULT> on <DEFAULT> port <DEFAULT> for user connectdb
[NO_PID]: sqlca: code: 0, state: 00000
@ -62,5 +62,5 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_finish: connection main closed
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -220 on line 68: no such connection nonexistant on line 68
[NO_PID]: raising sqlcode -220 on line 68: connection "nonexistant" does not exist on line 68
[NO_PID]: sqlca: code: -220, state: 08003

12
src/interfaces/ecpg/test/expected/preproc-init.stderr
View File

@ -1,14 +1,14 @@
[NO_PID]: ECPGdebug: set to 1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlcode -220 on line 88: no such connection NULL on line 88
[NO_PID]: raising sqlcode -220 on line 88: connection "NULL" does not exist on line 88
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: raising sqlcode -220 on line 90: no such connection NULL on line 90
[NO_PID]: raising sqlcode -220 on line 90: connection "NULL" does not exist on line 90
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: raising sqlcode -220 on line 92: no such connection NULL on line 92
[NO_PID]: raising sqlcode -220 on line 92: connection "NULL" does not exist on line 92
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: raising sqlcode -220 on line 94: no such connection NULL on line 94
[NO_PID]: raising sqlcode -220 on line 94: connection "NULL" does not exist on line 94
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: raising sqlcode -220 on line 96: no such connection NULL on line 96
[NO_PID]: raising sqlcode -220 on line 96: connection "NULL" does not exist on line 96
[NO_PID]: sqlca: code: -220, state: 08003
[NO_PID]: raising sqlcode -220 on line 98: no such connection NULL on line 98
[NO_PID]: raising sqlcode -220 on line 98: connection "NULL" does not exist on line 98
[NO_PID]: sqlca: code: -220, state: 08003

6
src/interfaces/ecpg/test/expected/preproc-whenever.stderr
View File

@ -37,7 +37,7 @@ LINE 1: select * from nonexistant
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 39: relation "nonexistant" does not exist on line 39
[NO_PID]: sqlca: code: -400, state: 42P01
sql error: relation "nonexistant" does not exist on line 39
SQL error: relation "nonexistant" does not exist on line 39
[NO_PID]: ECPGtrans on line 40: action "rollback"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 43: query: select * from nonexistant; with 0 parameter(s) on connection regress1
@ -51,7 +51,7 @@ LINE 1: select * from nonexistant
[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 43: relation "nonexistant" does not exist on line 43
[NO_PID]: sqlca: code: -400, state: 42P01
Error in statement 'select':
sql error: relation "nonexistant" does not exist on line 43
SQL error: relation "nonexistant" does not exist on line 43
[NO_PID]: ECPGtrans on line 44: action "rollback"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 47: query: select * from nonexistant; with 0 parameter(s) on connection regress1
@ -65,7 +65,7 @@ LINE 1: select * from nonexistant
[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 47: relation "nonexistant" does not exist on line 47
[NO_PID]: sqlca: code: -400, state: 42P01
Found another error
sql error: relation "nonexistant" does not exist on line 47
SQL error: relation "nonexistant" does not exist on line 47
[NO_PID]: ECPGtrans on line 48: action "rollback"; connection "regress1"
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 51: query: select * from nonexistant; with 0 parameter(s) on connection regress1

2
src/interfaces/ecpg/test/expected/sql-fetch.stderr
View File

@ -142,6 +142,6 @@
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: raising sqlstate 55006 (sqlcode -400) on line 53: cannot drop "my_table" because it is being used by active queries in this session on line 53
[NO_PID]: sqlca: code: -400, state: 55006
sql error: cannot drop "my_table" because it is being used by active queries in this session on line 53
SQL error: cannot drop "my_table" because it is being used by active queries in this session on line 53
[NO_PID]: ecpg_finish: connection regress1 closed
[NO_PID]: sqlca: code: 0, state: 00000

2
src/interfaces/ecpg/test/expected/sql-quote.stderr
View File

@ -28,7 +28,7 @@
[NO_PID]: sqlca: code: 0, state: 22P06
[NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
[NO_PID]: sqlca: code: 0, state: 22P06
sql error: nonstandard use of \\ in a string literal
SQL error: nonstandard use of \\ in a string literal
[NO_PID]: ecpg_execute on line 28: query: insert into "My_Table" values ( 1 , E'a\\\\b' ); with 0 parameter(s) on connection regress1
[NO_PID]: sqlca: code: 0, state: 00000
[NO_PID]: ecpg_execute on line 28: using PQexec