diff options
| author | Michael Meskes <meskes@postgresql.org> | 2006-08-29 12:24:52 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2006-08-29 12:24:52 +0000 |
| commit | b1710339ba2e318cf6af1a50d4256e9fa98e6c8a (patch) | |
| tree | b6a8e0e1cd54f153d737beb368a528bfb389ad42 /src/interfaces/ecpg/test/expected/connect-test5.c | |
| parent | ba9f9bf1b103d72196d76646c6fcc71abbdd51f5 (diff) | |
| download | postgresql-b1710339ba2e318cf6af1a50d4256e9fa98e6c8a.tar.gz | |
Fixed parser and library to allow empty database names.
Streamlined connection name parsing.
Added Joachim's patch to shorten paths before diffing.
Diffstat (limited to 'src/interfaces/ecpg/test/expected/connect-test5.c')
| -rw-r--r-- | src/interfaces/ecpg/test/expected/connect-test5.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/interfaces/ecpg/test/expected/connect-test5.c b/src/interfaces/ecpg/test/expected/connect-test5.c index 31eb145bf2..6075aacf13 100644 --- a/src/interfaces/ecpg/test/expected/connect-test5.c +++ b/src/interfaces/ecpg/test/expected/connect-test5.c @@ -76,14 +76,14 @@ main(void) #line 38 "test5.pgc" - { ECPGconnect(__LINE__, 0, "connectdb" , "connectuser" , "connectdb" , "main", 0); } + { ECPGconnect(__LINE__, 0, "" , "connectdb" , NULL , "main", 0); } #line 40 "test5.pgc" { ECPGdisconnect(__LINE__, "main");} #line 41 "test5.pgc" - { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/connectdb" , "connectuser" , NULL , "main", 0); } + { ECPGconnect(__LINE__, 0, "connectdb" , "connectuser" , "connectdb" , "main", 0); } #line 43 "test5.pgc" { ECPGdisconnect(__LINE__, "main");} @@ -104,26 +104,41 @@ main(void) #line 50 "test5.pgc" - { ECPGconnect(__LINE__, 0, "unix:postgresql://200.46.204.71/connectdb" , "connectuser" , NULL , "main", 0); } + { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/connectdb" , "connectuser" , NULL , "main", 0); } #line 52 "test5.pgc" { ECPGdisconnect(__LINE__, "main");} #line 53 "test5.pgc" - { ECPGdisconnect(__LINE__, "nonexistant");} + { ECPGconnect(__LINE__, 0, "unix:postgresql://200.46.204.71/connectdb" , "connectuser" , NULL , "main", 0); } #line 55 "test5.pgc" + { ECPGdisconnect(__LINE__, "main");} +#line 56 "test5.pgc" + + + { ECPGconnect(__LINE__, 0, "unix:postgresql://localhost/" , "connectdb" , NULL , "main", 0); } +#line 58 "test5.pgc" + + { ECPGdisconnect(__LINE__, "main");} +#line 59 "test5.pgc" + /* connect twice */ { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); } -#line 58 "test5.pgc" +#line 62 "test5.pgc" { ECPGconnect(__LINE__, 0, "connectdb" , NULL,NULL , "main", 0); } -#line 59 "test5.pgc" +#line 63 "test5.pgc" { ECPGdisconnect(__LINE__, "main");} -#line 60 "test5.pgc" +#line 64 "test5.pgc" + + + /* not connected */ + { ECPGdisconnect(__LINE__, "nonexistant");} +#line 67 "test5.pgc" return (0); |