Skip to content

Commit 68d1c33

Browse files
tglsfdctglsfdc
committed
Update ecpg's connect-test1 for connection-failure message changes.
I should have updated this in commits 52a1022 and follow-ons, but I missed it because it's not run by default, and none of the buildfarm runs it either. Maybe we should try to improve that situation. Discussion: https://postgr.es/m/CAH2-Wz=j9SRW=s5BV4-3k+=tr4N3A03in+gTuVA09vNF+-iHjA@mail.gmail.com
1 parent a8ed6bb commit 68d1c33

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

‎src/interfaces/ecpg/test/expected/connect-test1-minGW32.stderr‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
[NO_PID]: sqlca: code: 0, state: 00000
1717
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user regress_ecpg_user2
1818
[NO_PID]: sqlca: code: 0, state: 00000
19-
[NO_PID]: ECPGconnect: could not open database: FATAL: database "regress_ecpg_user2" does not exist
20-
19+
[NO_PID]: ECPGconnect: connection to server failed: FATAL: database "regress_ecpg_user2" does not exist
2120
[NO_PID]: sqlca: code: 0, state: 00000
2221
[NO_PID]: ecpg_finish: connection main closed
2322
[NO_PID]: sqlca: code: 0, state: 00000
@@ -31,8 +30,7 @@
3130
[NO_PID]: sqlca: code: 0, state: 00000
3231
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user regress_ecpg_user2
3332
[NO_PID]: sqlca: code: 0, state: 00000
34-
[NO_PID]: ECPGconnect: could not open database: FATAL: database "regress_ecpg_user2" does not exist
35-
33+
[NO_PID]: ECPGconnect: connection to server failed: FATAL: database "regress_ecpg_user2" does not exist
3634
[NO_PID]: sqlca: code: 0, state: 00000
3735
[NO_PID]: ecpg_finish: connection (null) closed
3836
[NO_PID]: sqlca: code: 0, state: 00000
@@ -54,8 +52,7 @@
5452
[NO_PID]: sqlca: code: 0, state: 00000
5553
[NO_PID]: ECPGconnect: opening database nonexistent on localhost port <DEFAULT> for user regress_ecpg_user1
5654
[NO_PID]: sqlca: code: 0, state: 00000
57-
[NO_PID]: ECPGconnect: could not open database: FATAL: database "nonexistent" does not exist
58-
55+
[NO_PID]: ECPGconnect: connection to server failed: FATAL: database "nonexistent" does not exist
5956
[NO_PID]: sqlca: code: 0, state: 00000
6057
[NO_PID]: ecpg_finish: connection nonexistent closed
6158
[NO_PID]: sqlca: code: 0, state: 00000
@@ -65,10 +62,8 @@
6562
[NO_PID]: sqlca: code: -220, state: 08003
6663
[NO_PID]: ECPGconnect: opening database ecpg2_regression on localhost port <REGRESSION_PORT> for user regress_ecpg_user1
6764
[NO_PID]: sqlca: code: 0, state: 00000
68-
[NO_PID]: ECPGconnect: could not open database: could not connect to server: Connection refused (0x0000274D/10061)
69-
Is the server running on host "localhost" and accepting
70-
TCP/IP connections on port 20?
71-
65+
[NO_PID]: ECPGconnect: connection to server failed: Connection refused (0x0000274D/10061)
66+
Is the server running on that host and accepting TCP/IP connections?
7267
[NO_PID]: sqlca: code: 0, state: 00000
7368
[NO_PID]: ecpg_finish: connection ecpg2_regression closed
7469
[NO_PID]: sqlca: code: 0, state: 00000

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
[NO_PID]: sqlca: code: 0, state: 00000
1717
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user regress_ecpg_user2
1818
[NO_PID]: sqlca: code: 0, state: 00000
19-
[NO_PID]: ECPGconnect: could not open database: FATAL: database "regress_ecpg_user2" does not exist
20-
19+
[NO_PID]: ECPGconnect: connection to server failed: FATAL: database "regress_ecpg_user2" does not exist
2120
[NO_PID]: sqlca: code: 0, state: 00000
2221
[NO_PID]: ecpg_finish: connection main closed
2322
[NO_PID]: sqlca: code: 0, state: 00000
@@ -31,8 +30,7 @@
3130
[NO_PID]: sqlca: code: 0, state: 00000
3231
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user regress_ecpg_user2
3332
[NO_PID]: sqlca: code: 0, state: 00000
34-
[NO_PID]: ECPGconnect: could not open database: FATAL: database "regress_ecpg_user2" does not exist
35-
33+
[NO_PID]: ECPGconnect: connection to server failed: FATAL: database "regress_ecpg_user2" does not exist
3634
[NO_PID]: sqlca: code: 0, state: 00000
3735
[NO_PID]: ecpg_finish: connection (null) closed
3836
[NO_PID]: sqlca: code: 0, state: 00000
@@ -54,8 +52,7 @@
5452
[NO_PID]: sqlca: code: 0, state: 00000
5553
[NO_PID]: ECPGconnect: opening database nonexistent on localhost port <DEFAULT> for user regress_ecpg_user1
5654
[NO_PID]: sqlca: code: 0, state: 00000
57-
[NO_PID]: ECPGconnect: could not open database: FATAL: database "nonexistent" does not exist
58-
55+
[NO_PID]: ECPGconnect: connection to server failed: FATAL: database "nonexistent" does not exist
5956
[NO_PID]: sqlca: code: 0, state: 00000
6057
[NO_PID]: ecpg_finish: connection nonexistent closed
6158
[NO_PID]: sqlca: code: 0, state: 00000
@@ -65,10 +62,8 @@
6562
[NO_PID]: sqlca: code: -220, state: 08003
6663
[NO_PID]: ECPGconnect: opening database ecpg2_regression on 127.0.0.1 port <REGRESSION_PORT> for user regress_ecpg_user1
6764
[NO_PID]: sqlca: code: 0, state: 00000
68-
[NO_PID]: ECPGconnect: could not open database: could not connect to server: Connection refused
69-
Is the server running on host "127.0.0.1" and accepting
70-
TCP/IP connections on port 20?
71-
65+
[NO_PID]: ECPGconnect: connection to server failed: Connection refused
66+
Is the server running on that host and accepting TCP/IP connections?
7267
[NO_PID]: sqlca: code: 0, state: 00000
7368
[NO_PID]: ecpg_finish: connection ecpg2_regression closed
7469
[NO_PID]: sqlca: code: 0, state: 00000

0 commit comments

Comments
 (0)