In case the connection magically disappears libecpg only returns an internal

error sqlstate. This change makes it return a correct value..

3 files changed, 16 insertions, 16 deletions

diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.stderr b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.stderr
index 29d10ec4dfb..fc909e54f09 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.stderr
+++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.stderr
@@ -22,10 +22,10 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 32: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_check_PQresult on line 32: ERROR:  duplicate key value violates unique constraint "test_pkey"
+[NO_PID]: ecpg_check_PQresult on line 32: bad response - ERROR:  duplicate key value violates unique constraint "test_pkey"
 DETAIL:  Key (i)=(7) already exists.
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlstate 23505 (sqlcode -239) on line 32: duplicate key value violates unique constraint "test_pkey" on line 32
+[NO_PID]: raising sqlstate 23505 (sqlcode -239): duplicate key value violates unique constraint "test_pkey" on line 32
 [NO_PID]: sqlca: code: -239, state: 23505
 [NO_PID]: ECPGtrans on line 34: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -43,9 +43,9 @@ DETAIL:  Key (i)=(7) already exists.
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 40: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_check_PQresult on line 40: ERROR:  more than one row returned by a subquery used as an expression
+[NO_PID]: ecpg_check_PQresult on line 40: bad response - ERROR:  more than one row returned by a subquery used as an expression
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlstate 21000 (sqlcode -284) on line 40: more than one row returned by a subquery used as an expression on line 40
+[NO_PID]: raising sqlstate 21000 (sqlcode -284): more than one row returned by a subquery used as an expression on line 40
 [NO_PID]: sqlca: code: -284, state: 21000
 [NO_PID]: ECPGtrans on line 41: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever.stderr b/src/interfaces/ecpg/test/expected/preproc-whenever.stderr
index 193d626581c..68aec75ba64 100644
--- a/src/interfaces/ecpg/test/expected/preproc-whenever.stderr
+++ b/src/interfaces/ecpg/test/expected/preproc-whenever.stderr
@@ -31,11 +31,11 @@ Warning: At least one column was truncated
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_check_PQresult on line 39: ERROR:  relation "nonexistant" does not exist
+[NO_PID]: ecpg_check_PQresult on line 39: bad response - ERROR:  relation "nonexistant" does not exist
 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]: raising sqlstate 42P01 (sqlcode -400): 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
 [NO_PID]: ECPGtrans on line 40: action "rollback"; connection "regress1"
@@ -44,11 +44,11 @@ SQL error: relation "nonexistant" does not exist on line 39
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 43: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_check_PQresult on line 43: ERROR:  relation "nonexistant" does not exist
+[NO_PID]: ecpg_check_PQresult on line 43: bad response - ERROR:  relation "nonexistant" does not exist
 LINE 1: select * from nonexistant
                       ^
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 43: relation "nonexistant" does not exist on line 43
+[NO_PID]: raising sqlstate 42P01 (sqlcode -400): 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
@@ -58,11 +58,11 @@ SQL error: relation "nonexistant" does not exist on line 43
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 47: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_check_PQresult on line 47: ERROR:  relation "nonexistant" does not exist
+[NO_PID]: ecpg_check_PQresult on line 47: bad response - ERROR:  relation "nonexistant" does not exist
 LINE 1: select * from nonexistant
                       ^
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 47: relation "nonexistant" does not exist on line 47
+[NO_PID]: raising sqlstate 42P01 (sqlcode -400): 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
@@ -72,11 +72,11 @@ SQL error: relation "nonexistant" does not exist on line 47
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 51: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_check_PQresult on line 51: ERROR:  relation "nonexistant" does not exist
+[NO_PID]: ecpg_check_PQresult on line 51: bad response - ERROR:  relation "nonexistant" does not exist
 LINE 1: select * from nonexistant
                       ^
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 51: relation "nonexistant" does not exist on line 51
+[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistant" does not exist on line 51
 [NO_PID]: sqlca: code: -400, state: 42P01
 [NO_PID]: ECPGtrans on line 52: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -84,11 +84,11 @@ LINE 1: select * from nonexistant
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 55: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_check_PQresult on line 55: ERROR:  relation "nonexistant" does not exist
+[NO_PID]: ecpg_check_PQresult on line 55: bad response - ERROR:  relation "nonexistant" does not exist
 LINE 1: select * from nonexistant
                       ^
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 55: relation "nonexistant" does not exist on line 55
+[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistant" does not exist on line 55
 [NO_PID]: sqlca: code: -400, state: 42P01
 [NO_PID]: ECPGtrans on line 59: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
diff --git a/src/interfaces/ecpg/test/expected/sql-fetch.stderr b/src/interfaces/ecpg/test/expected/sql-fetch.stderr
index 115b73ade99..038b61e71c4 100644
--- a/src/interfaces/ecpg/test/expected/sql-fetch.stderr
+++ b/src/interfaces/ecpg/test/expected/sql-fetch.stderr
@@ -138,9 +138,9 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 53: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_check_PQresult on line 53: ERROR:  cannot drop "my_table" because it is being used by active queries in this session
+[NO_PID]: ecpg_check_PQresult on line 53: bad response - ERROR:  cannot drop "my_table" because it is being used by active queries in this session
 [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]: raising sqlstate 55006 (sqlcode -400): 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
 [NO_PID]: ecpg_finish: connection regress1 closed