diff options
author | Noah Misch <noah@leadboat.com> | 2019-06-08 10:12:26 -0700 |
---|---|---|
committer | Noah Misch <noah@leadboat.com> | 2019-06-08 10:12:26 -0700 |
commit | f2c71cb71fe186dcf8ebec967f98d1c7c4777943 (patch) | |
tree | ef576b2116f347e2b22926de64b8f0ead2f282ba /src/interfaces/ecpg/test | |
parent | 31d250e049b4e3d51a635edaa2221c11815e40e7 (diff) | |
download | postgresql-f2c71cb71fe186dcf8ebec967f98d1c7c4777943.tar.gz postgresql-f2c71cb71fe186dcf8ebec967f98d1c7c4777943.zip |
Stop using spelling "nonexistant".
The documentation used "nonexistent" exclusively, and the source tree
used it three times as often as "nonexistant".
Diffstat (limited to 'src/interfaces/ecpg/test')
10 files changed, 46 insertions, 46 deletions
diff --git a/src/interfaces/ecpg/test/connect/test1.pgc b/src/interfaces/ecpg/test/connect/test1.pgc index 101b806d5ba..82cdfb8fc56 100644 --- a/src/interfaces/ecpg/test/connect/test1.pgc +++ b/src/interfaces/ecpg/test/connect/test1.pgc @@ -50,7 +50,7 @@ exec sql end declare section; exec sql disconnect; /* wrong db */ - exec sql connect to tcp:postgresql://localhost/nonexistant user regress_ecpg_user1 identified by connectpw; + exec sql connect to tcp:postgresql://localhost/nonexistent user regress_ecpg_user1 identified by connectpw; exec sql disconnect; /* wrong port */ diff --git a/src/interfaces/ecpg/test/connect/test5.pgc b/src/interfaces/ecpg/test/connect/test5.pgc index 53b86556b15..2e34ab84fc6 100644 --- a/src/interfaces/ecpg/test/connect/test5.pgc +++ b/src/interfaces/ecpg/test/connect/test5.pgc @@ -70,7 +70,7 @@ exec sql end declare section; exec sql disconnect main; /* not connected */ - exec sql disconnect nonexistant; + exec sql disconnect nonexistent; return 0; } diff --git a/src/interfaces/ecpg/test/expected/connect-test1-minGW32.stderr b/src/interfaces/ecpg/test/expected/connect-test1-minGW32.stderr index 50a6785a02f..b334537b600 100644 --- a/src/interfaces/ecpg/test/expected/connect-test1-minGW32.stderr +++ b/src/interfaces/ecpg/test/expected/connect-test1-minGW32.stderr @@ -52,14 +52,14 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection ecpg2_regression closed [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGconnect: opening database nonexistant on localhost port <DEFAULT> for user regress_ecpg_user1 +[NO_PID]: ECPGconnect: opening database nonexistent on localhost port <DEFAULT> for user regress_ecpg_user1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGconnect: could not open database: FATAL: database "nonexistant" does not exist +[NO_PID]: ECPGconnect: could not open database: FATAL: database "nonexistent" does not exist [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_finish: connection nonexistant closed +[NO_PID]: ecpg_finish: connection nonexistent closed [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlcode -402 on line 53: could not connect to database "nonexistant" on line 53 +[NO_PID]: raising sqlcode -402 on line 53: could not connect to database "nonexistent" on line 53 [NO_PID]: sqlca: code: -402, state: 08001 [NO_PID]: raising sqlcode -220 on line 54: connection "CURRENT" does not exist on line 54 [NO_PID]: sqlca: code: -220, state: 08003 diff --git a/src/interfaces/ecpg/test/expected/connect-test1.c b/src/interfaces/ecpg/test/expected/connect-test1.c index 98b7e717c72..894273339cd 100644 --- a/src/interfaces/ecpg/test/expected/connect-test1.c +++ b/src/interfaces/ecpg/test/expected/connect-test1.c @@ -101,7 +101,7 @@ main(void) /* wrong db */ - { ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost/nonexistant" , "regress_ecpg_user1" , "connectpw" , NULL, 0); } + { ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost/nonexistent" , "regress_ecpg_user1" , "connectpw" , NULL, 0); } #line 53 "test1.pgc" { ECPGdisconnect(__LINE__, "CURRENT");} diff --git a/src/interfaces/ecpg/test/expected/connect-test1.stderr b/src/interfaces/ecpg/test/expected/connect-test1.stderr index ad806a02251..c5cbf749efe 100644 --- a/src/interfaces/ecpg/test/expected/connect-test1.stderr +++ b/src/interfaces/ecpg/test/expected/connect-test1.stderr @@ -52,14 +52,14 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection ecpg2_regression closed [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGconnect: opening database nonexistant on localhost port <DEFAULT> for user regress_ecpg_user1 +[NO_PID]: ECPGconnect: opening database nonexistent on localhost port <DEFAULT> for user regress_ecpg_user1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGconnect: could not open database: FATAL: database "nonexistant" does not exist +[NO_PID]: ECPGconnect: could not open database: FATAL: database "nonexistent" does not exist [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_finish: connection nonexistant closed +[NO_PID]: ecpg_finish: connection nonexistent closed [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlcode -402 on line 53: could not connect to database "nonexistant" on line 53 +[NO_PID]: raising sqlcode -402 on line 53: could not connect to database "nonexistent" on line 53 [NO_PID]: sqlca: code: -402, state: 08001 [NO_PID]: raising sqlcode -220 on line 54: connection "CURRENT" does not exist on line 54 [NO_PID]: sqlca: code: -220, state: 08003 diff --git a/src/interfaces/ecpg/test/expected/connect-test5.c b/src/interfaces/ecpg/test/expected/connect-test5.c index 4b6569e7633..b44104854da 100644 --- a/src/interfaces/ecpg/test/expected/connect-test5.c +++ b/src/interfaces/ecpg/test/expected/connect-test5.c @@ -154,7 +154,7 @@ main(void) /* not connected */ - { ECPGdisconnect(__LINE__, "nonexistant");} + { ECPGdisconnect(__LINE__, "nonexistent");} #line 73 "test5.pgc" diff --git a/src/interfaces/ecpg/test/expected/connect-test5.stderr b/src/interfaces/ecpg/test/expected/connect-test5.stderr index a797fd95d96..cefdb0739e5 100644 --- a/src/interfaces/ecpg/test/expected/connect-test5.stderr +++ b/src/interfaces/ecpg/test/expected/connect-test5.stderr @@ -88,5 +88,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 73: connection "nonexistant" does not exist on line 73 +[NO_PID]: raising sqlcode -220 on line 73: connection "nonexistent" does not exist on line 73 [NO_PID]: sqlca: code: -220, state: 08003 diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever.c b/src/interfaces/ecpg/test/expected/preproc-whenever.c index 332ef85b10a..861d84f1fe7 100644 --- a/src/interfaces/ecpg/test/expected/preproc-whenever.c +++ b/src/interfaces/ecpg/test/expected/preproc-whenever.c @@ -103,7 +103,7 @@ if (sqlca.sqlcode < 0) sqlprint();} #line 37 "whenever.pgc" - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistent", ECPGt_EOIT, ECPGt_int,&(i),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 39 "whenever.pgc" @@ -127,7 +127,7 @@ if (sqlca.sqlcode < 0) sqlprint();} /* exec sql whenever sqlerror do print ( \"select\" ) ; */ #line 42 "whenever.pgc" - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistent", ECPGt_EOIT, ECPGt_int,&(i),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 43 "whenever.pgc" @@ -151,7 +151,7 @@ if (sqlca.sqlcode < 0) print ( "select" );} /* exec sql whenever sqlerror call print2 ( ) ; */ #line 46 "whenever.pgc" - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistent", ECPGt_EOIT, ECPGt_int,&(i),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 47 "whenever.pgc" @@ -175,7 +175,7 @@ if (sqlca.sqlcode < 0) print2 ( );} /* exec sql whenever sqlerror continue ; */ #line 50 "whenever.pgc" - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistent", ECPGt_EOIT, ECPGt_int,&(i),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 51 "whenever.pgc" @@ -193,7 +193,7 @@ if (sqlca.sqlwarn[0] == 'W') warn ( );} /* exec sql whenever sqlerror goto error ; */ #line 54 "whenever.pgc" - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistent", ECPGt_EOIT, ECPGt_int,&(i),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); #line 55 "whenever.pgc" diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever.stderr b/src/interfaces/ecpg/test/expected/preproc-whenever.stderr index e5c8fc239b2..03e94a6241b 100644 --- a/src/interfaces/ecpg/test/expected/preproc-whenever.stderr +++ b/src/interfaces/ecpg/test/expected/preproc-whenever.stderr @@ -27,68 +27,68 @@ Warning: At least one column was truncated [NO_PID]: ECPGtrans on line 37: action "rollback"; connection "ecpg1_regression" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 39: query: select * from nonexistant; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 39: query: select * from nonexistent; with 0 parameter(s) on connection ecpg1_regression [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: bad response - ERROR: relation "nonexistant" does not exist -LINE 1: select * from nonexistant +[NO_PID]: ecpg_check_PQresult on line 39: bad response - ERROR: relation "nonexistent" does not exist +LINE 1: select * from nonexistent ^ [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistant" does not exist on line 39 +[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistent" 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 "nonexistent" does not exist on line 39 [NO_PID]: ECPGtrans on line 40: action "rollback"; connection "ecpg1_regression" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 43: query: select * from nonexistant; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 43: query: select * from nonexistent; with 0 parameter(s) on connection ecpg1_regression [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: bad response - ERROR: relation "nonexistant" does not exist -LINE 1: select * from nonexistant +[NO_PID]: ecpg_check_PQresult on line 43: bad response - ERROR: relation "nonexistent" does not exist +LINE 1: select * from nonexistent ^ [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistant" does not exist on line 43 +[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistent" 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 "nonexistent" does not exist on line 43 [NO_PID]: ECPGtrans on line 44: action "rollback"; connection "ecpg1_regression" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 47: query: select * from nonexistant; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 47: query: select * from nonexistent; with 0 parameter(s) on connection ecpg1_regression [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: bad response - ERROR: relation "nonexistant" does not exist -LINE 1: select * from nonexistant +[NO_PID]: ecpg_check_PQresult on line 47: bad response - ERROR: relation "nonexistent" does not exist +LINE 1: select * from nonexistent ^ [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistant" does not exist on line 47 +[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistent" 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 "nonexistent" does not exist on line 47 [NO_PID]: ECPGtrans on line 48: action "rollback"; connection "ecpg1_regression" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: query: select * from nonexistant; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 51: query: select * from nonexistent; with 0 parameter(s) on connection ecpg1_regression [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: bad response - ERROR: relation "nonexistant" does not exist -LINE 1: select * from nonexistant +[NO_PID]: ecpg_check_PQresult on line 51: bad response - ERROR: relation "nonexistent" does not exist +LINE 1: select * from nonexistent ^ [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistant" does not exist on line 51 +[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistent" does not exist on line 51 [NO_PID]: sqlca: code: -400, state: 42P01 [NO_PID]: ECPGtrans on line 52: action "rollback"; connection "ecpg1_regression" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 55: query: select * from nonexistant; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 55: query: select * from nonexistent; with 0 parameter(s) on connection ecpg1_regression [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: bad response - ERROR: relation "nonexistant" does not exist -LINE 1: select * from nonexistant +[NO_PID]: ecpg_check_PQresult on line 55: bad response - ERROR: relation "nonexistent" does not exist +LINE 1: select * from nonexistent ^ [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistant" does not exist on line 55 +[NO_PID]: raising sqlstate 42P01 (sqlcode -400): relation "nonexistent" does not exist on line 55 [NO_PID]: sqlca: code: -400, state: 42P01 [NO_PID]: ECPGtrans on line 59: action "rollback"; connection "ecpg1_regression" [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/preproc/whenever.pgc b/src/interfaces/ecpg/test/preproc/whenever.pgc index 14cf571e6ae..6090e5fbd5a 100644 --- a/src/interfaces/ecpg/test/preproc/whenever.pgc +++ b/src/interfaces/ecpg/test/preproc/whenever.pgc @@ -36,23 +36,23 @@ int main(void) exec sql select * into :i, :c from test; exec sql rollback; - exec sql select * into :i from nonexistant; + exec sql select * into :i from nonexistent; exec sql rollback; exec sql whenever sqlerror do print("select"); - exec sql select * into :i from nonexistant; + exec sql select * into :i from nonexistent; exec sql rollback; exec sql whenever sqlerror call print2(); - exec sql select * into :i from nonexistant; + exec sql select * into :i from nonexistent; exec sql rollback; exec sql whenever sqlerror continue; - exec sql select * into :i from nonexistant; + exec sql select * into :i from nonexistent; exec sql rollback; exec sql whenever sqlerror goto error; - exec sql select * into :i from nonexistant; + exec sql select * into :i from nonexistent; printf("Should not be reachable\n"); error: |