Skip to content

Commit 9d7b256

Browse files
author
Michael Meskes
committed
- Moved from PQsetdbLogin to PQconnectDB.
- Correctly parse connect options. - Changed regression tests accordingly.
1 parent 039dfbf commit 9d7b256

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+154
-108
lines changed

‎src/interfaces/ecpg/ChangeLog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2336,6 +2336,11 @@ Thu, 20 Mar 2008 16:54:27 +0100
23362336
Tue, 25 Mar 2008 13:42:26 +0100
23372337

23382338
- Should list ECPGget_PGconn in exports.txt.
2339+
2340+
Wed, 26 Mar 2008 17:02:08 +0100
2341+
2342+
- Moved from PQsetdbLogin to PQconnectDB.
2343+
- Correctly parse connect options.
23392344
- Set pgtypes library version to 3.1.
23402345
- Set compat library version to 3.1.
23412346
- Set ecpg library version to 6.2.

‎src/interfaces/ecpg/ecpglib/connect.c‎

Lines changed: 54 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.49 2008/03/20 16:29:44 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.50 2008/03/27 07:56:00 meskes Exp $ */
22

33
#define POSTGRES_ECPG_INTERNAL
44
#include "postgres_fe.h"
@@ -255,6 +255,13 @@ ECPGnoticeReceiver(void *arg, const PGresult *result)
255255
ecpg_log("raising sqlcode %d\n", sqlcode);
256256
}
257257

258+
static int
259+
strlen_or_null(const char *string)
260+
{
261+
if (!string)
262+
return 0;
263+
return (strlen(string));
264+
}
258265

259266
/* this contains some quick hacks, needs to be cleaned up, but it works */
260267
bool
@@ -263,12 +270,14 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
263270
struct sqlca_t *sqlca = ECPGget_sqlca();
264271
enum COMPAT_MODE compat = c;
265272
struct connection *this;
273+
int i;
266274
char *dbname = name ? ecpg_strdup(name, lineno) : NULL,
267275
*host = NULL,
268276
*tmp,
269277
*port = NULL,
270278
*realname = NULL,
271-
*options = NULL;
279+
*options = NULL,
280+
*connect_string = NULL;
272281

273282
ecpg_init_sqlca(sqlca);
274283

@@ -351,7 +360,8 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
351360
tmp = last_dir_separator(dbname + offset);
352361
if (tmp != NULL) /* database name given */
353362
{
354-
realname = ecpg_strdup(tmp + 1, lineno);
363+
if (tmp[1] != '\0') /* non-empty database name */
364+
realname = ecpg_strdup(tmp + 1, lineno);
355365
*tmp = '\0';
356366
}
357367

@@ -460,60 +470,73 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
460470
#endif
461471
actual_connection = all_connections;
462472

463-
ecpg_log("ECPGconnect: opening database %s on %s port %s %s%s%s%s\n",
473+
ecpg_log("ECPGconnect: opening database %s on %s port %s %s%s %s%s\n",
464474
realname ? realname : "<DEFAULT>",
465475
host ? host : "<DEFAULT>",
466476
port ? (ecpg_internal_regression_mode ? "<REGRESSION_PORT>" : port) : "<DEFAULT>",
467477
options ? "with options " : "", options ? options : "",
468478
user ? "for user " : "", user ? user : "");
469479

470-
this->connection = PQsetdbLogin(host, port, options, NULL, realname, user, passwd);
480+
connect_string = ecpg_alloc( strlen_or_null(host)
481+
+ strlen_or_null(port)
482+
+ strlen_or_null(options)
483+
+ strlen_or_null(realname)
484+
+ strlen_or_null(user)
485+
+ strlen_or_null(passwd)
486+
+ sizeof(" host = port = dbname = user = password ="), lineno);
487+
488+
if (options) /* replace '&' if tehre are any */
489+
for (i = 0; options[i]; i++)
490+
if (options[i] == '&')
491+
options[i] = ' ';
492+
493+
sprintf(connect_string,"%s%s %s%s %s%s %s%s %s%s %s",
494+
realname ? "dbname=" : "", realname ? realname : "",
495+
host ? "host=" : "", host ? host : "",
496+
port ? "port=" : "", port ? port : "",
497+
user ? "user=" : "", user ? user : "",
498+
passwd ? "password=" : "", passwd ? passwd : "",
499+
options ? options : "");
500+
501+
/* this is deprecated
502+
* this->connection = PQsetdbLogin(host, port, options, NULL, realname, user, passwd);*/
503+
this->connection = PQconnectdb(connect_string);
504+
505+
ecpg_free(connect_string);
506+
if (host)
507+
ecpg_free(host);
508+
if (port)
509+
ecpg_free(port);
510+
if (options)
511+
ecpg_free(options);
512+
if (dbname)
513+
ecpg_free(dbname);
471514

472515
if (PQstatus(this->connection) == CONNECTION_BAD)
473516
{
474517
const char *errmsg = PQerrorMessage(this->connection);
475518
const char *db = realname ? realname : "<DEFAULT>";
476519

477-
ecpg_log("ECPGconnect: could not open database %s on %s port %s %s%s%s%s in line %d\n\t%s\n",
478-
db,
479-
host ? host : "<DEFAULT>",
480-
port ? (ecpg_internal_regression_mode ? "<REGRESSION_PORT>" : port) : "<DEFAULT>",
481-
options ? "with options " : "", options ? options : "",
482-
user ? "for user " : "", user ? user : "",
483-
lineno, errmsg);
520+
ecpg_log("ECPGconnect: could not open database: %s\n", errmsg);
484521

485522
ecpg_finish(this);
486523
#ifdef ENABLE_THREAD_SAFETY
487524
pthread_mutex_unlock(&connections_mutex);
488525
#endif
489526

490527
ecpg_raise(lineno, ECPG_CONNECT, ECPG_SQLSTATE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION, db);
491-
if (host)
492-
ecpg_free(host);
493-
if (port)
494-
ecpg_free(port);
495-
if (options)
496-
ecpg_free(options);
497528
if (realname)
498529
ecpg_free(realname);
499-
if (dbname)
500-
ecpg_free(dbname);
530+
501531
return false;
502532
}
503-
#ifdef ENABLE_THREAD_SAFETY
504-
pthread_mutex_unlock(&connections_mutex);
505-
#endif
506533

507-
if (host)
508-
ecpg_free(host);
509-
if (port)
510-
ecpg_free(port);
511-
if (options)
512-
ecpg_free(options);
513534
if (realname)
514535
ecpg_free(realname);
515-
if (dbname)
516-
ecpg_free(dbname);
536+
537+
#ifdef ENABLE_THREAD_SAFETY
538+
pthread_mutex_unlock(&connections_mutex);
539+
#endif
517540

518541
this->committed = true;
519542
this->autocommit = autocommit;

‎src/interfaces/ecpg/preproc/preproc.y‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.362 2008/03/01 03:26:35 tgl Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.363 2008/03/27 07:56:00 meskes Exp $ */
22

33
/* Copyright comment */
44
%{
@@ -635,10 +635,10 @@ add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enu
635635
%type <str> connection_object opt_server opt_port c_stuff c_stuff_item
636636
%type <str> user_name opt_user char_variable ora_user ident opt_reference
637637
%type <str> var_type_declarations quoted_ident_stringvar ECPGKeywords_rest
638-
%type <str> db_prefix server opt_options opt_connection_name c_list
638+
%type <str> db_prefix server connect_options opt_options opt_connection_name c_list
639639
%type <str> ECPGSetConnection ECPGTypedef c_args ECPGKeywords ECPGCKeywords
640640
%type <str> enum_type civar civarind ECPGCursorStmt PreparableStmt
641-
%type <str> ECPGFree ECPGDeclare ECPGVar at enum_definition
641+
%type <str> ECPGFree ECPGDeclare ECPGVar at enum_definition opt_opt_value
642642
%type <str> struct_union_type s_struct_union vt_declarations execute_rest
643643
%type <str> var_declaration type_declaration single_vt_declaration
644644
%type <str> ECPGSetAutocommit on_off variable_declarations ECPGDescribe
@@ -5166,7 +5166,7 @@ char_variable: cvariable
51665166
}
51675167
;
51685168

5169-
opt_options: Op ColId
5169+
opt_options: Op connect_options
51705170
{
51715171
if (strlen($1) == 0)
51725172
mmerror(PARSE_ERROR, ET_ERROR, "incomplete statement");
@@ -5179,6 +5179,27 @@ opt_options: Op ColId
51795179
| /*EMPTY*/ { $$ = EMPTY; }
51805180
;
51815181

5182+
connect_options: ColId opt_opt_value
5183+
{ $$ = make2_str($1, $2); }
5184+
| ColId opt_opt_value Op connect_options
5185+
{
5186+
if (strlen($3) == 0)
5187+
mmerror(PARSE_ERROR, ET_ERROR, "incomplete statement");
5188+
5189+
if (strcmp($3, "&") != 0)
5190+
mmerror(PARSE_ERROR, ET_ERROR, "unrecognised token '%s'", $3);
5191+
5192+
$$ = cat_str(3, make2_str($1, $2), $3, $4);
5193+
}
5194+
;
5195+
5196+
opt_opt_value: /*EMPTY*/
5197+
{ $$ = EMPTY; }
5198+
| '=' Iconst
5199+
{ $$ = make2_str(make_str("="), $2); }
5200+
| '=' IDENT
5201+
{ $$ = make2_str(make_str("="), $2); }
5202+
;
51825203
/*
51835204
* Declare a prepared cursor. The syntax is different from the standard
51845205
* declare statement, so we create a new rule.

‎src/interfaces/ecpg/test/connect/test1.pgc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ exec sql end declare section;
5555
exec sql connect to unix:postgresql://localhost:@TEMP_PORT@/connectdb user connectuser using "connectpw";
5656
exec sql disconnect;
5757

58-
exec sql connect to unix:postgresql://localhost:@TEMP_PORT@/connectdb user connectuser;
58+
exec sql connect to unix:postgresql://localhost:@TEMP_PORT@/connectdb?connect_timeout=14 user connectuser;
5959
exec sql disconnect;
6060

6161
/* wrong db */

‎src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[NO_PID]: ECPGdebug: set to 1
22
[NO_PID]: sqlca: code: 0, state: 00000
3-
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
3+
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
44
[NO_PID]: sqlca: code: 0, state: 00000
55
[NO_PID]: ecpg_execute line 31: QUERY: create table test ( id int , c char ( 10 ) , s smallint , i int , b bool , f float , l bigint , dbl double precision , dec decimal , dat date , tmp timestamptz ) with 0 parameter on connection regress1
66
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[NO_PID]: ECPGdebug: set to 1
22
[NO_PID]: sqlca: code: 0, state: 00000
3-
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
3+
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
44
[NO_PID]: sqlca: code: 0, state: 00000
55
[NO_PID]: ecpg_execute line 23: QUERY: create table test ( i int primary key , j int ) with 0 parameter on connection regress1
66
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix2.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[NO_PID]: ECPGdebug: set to 1
22
[NO_PID]: sqlca: code: 0, state: 00000
3-
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
3+
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
44
[NO_PID]: sqlca: code: 0, state: 00000
55
[NO_PID]: ecpg_execute line 66: QUERY: set DateStyle to 'DMY' with 0 parameter on connection regress1
66
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/expected/connect-test1.c.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ main(void)
118118
#line 56 "test1.pgc"
119119

120120

121-
{ ECPGconnect(__LINE__, 0, "unix:postgresql://localhost:@TEMP_PORT@/connectdb" , "connectuser" , NULL , NULL, 0); }
121+
{ ECPGconnect(__LINE__, 0, "unix:postgresql://localhost:@TEMP_PORT@/connectdb?connect_timeout=14" , "connectuser" , NULL , NULL, 0); }
122122
#line 58 "test1.pgc"
123123

124124
{ ECPGdisconnect(__LINE__, "CURRENT");}

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[NO_PID]: ECPGdebug: set to 1
22
[NO_PID]: sqlca: code: 0, state: 00000
3-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
3+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
44
[NO_PID]: sqlca: code: 0, state: 00000
55
[NO_PID]: ecpg_execute line 23: QUERY: alter user connectuser encrypted password 'connectpw' with 0 parameter on connection main
66
[NO_PID]: sqlca: code: 0, state: 00000
@@ -10,54 +10,53 @@
1010
[NO_PID]: sqlca: code: 0, state: 00000
1111
[NO_PID]: ecpg_finish: Connection main closed.
1212
[NO_PID]: sqlca: code: 0, state: 00000
13-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <DEFAULT>
13+
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <DEFAULT>
1414
[NO_PID]: sqlca: code: 0, state: 00000
1515
[NO_PID]: ecpg_finish: Connection main closed.
1616
[NO_PID]: sqlca: code: 0, state: 00000
17-
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user connectdb
17+
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user connectdb
1818
[NO_PID]: sqlca: code: 0, state: 00000
1919
[NO_PID]: ecpg_finish: Connection main closed.
2020
[NO_PID]: sqlca: code: 0, state: 00000
21-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT>
21+
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT>
2222
[NO_PID]: sqlca: code: 0, state: 00000
2323
[NO_PID]: ecpg_finish: Connection main closed.
2424
[NO_PID]: sqlca: code: 0, state: 00000
25-
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <REGRESSION_PORT> for user connectdb
25+
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <REGRESSION_PORT> for user connectdb
2626
[NO_PID]: sqlca: code: 0, state: 00000
2727
[NO_PID]: ecpg_finish: Connection main closed.
2828
[NO_PID]: sqlca: code: 0, state: 00000
29-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT>
29+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT>
3030
[NO_PID]: sqlca: code: 0, state: 00000
3131
[NO_PID]: ecpg_finish: Connection main closed.
3232
[NO_PID]: sqlca: code: 0, state: 00000
33-
[NO_PID]: ECPGconnect: opening database <DEFAULT> on <DEFAULT> port <REGRESSION_PORT> for user connectdb
33+
[NO_PID]: ECPGconnect: opening database <DEFAULT> on <DEFAULT> port <REGRESSION_PORT> for user connectdb
3434
[NO_PID]: sqlca: code: 0, state: 00000
3535
[NO_PID]: ecpg_finish: Connection main closed.
3636
[NO_PID]: sqlca: code: 0, state: 00000
37-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
37+
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
3838
[NO_PID]: sqlca: code: 0, state: 00000
3939
[NO_PID]: ecpg_finish: Connection connectdb closed.
4040
[NO_PID]: sqlca: code: 0, state: 00000
41-
[NO_PID]: ECPGconnect: opening database on localhost port <REGRESSION_PORT> for user connectdb
41+
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <REGRESSION_PORT> for user connectdb
4242
[NO_PID]: sqlca: code: 0, state: 00000
43-
[NO_PID]: ecpg_finish: Connection closed.
43+
[NO_PID]: ecpg_finish: Connection (null) closed.
4444
[NO_PID]: sqlca: code: 0, state: 00000
45-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
45+
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
4646
[NO_PID]: sqlca: code: 0, state: 00000
4747
[NO_PID]: ecpg_finish: Connection connectdb closed.
4848
[NO_PID]: sqlca: code: 0, state: 00000
49-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
49+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
5050
[NO_PID]: sqlca: code: 0, state: 00000
5151
[NO_PID]: ecpg_finish: Connection connectdb closed.
5252
[NO_PID]: sqlca: code: 0, state: 00000
53-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
53+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> with options connect_timeout=14 for user connectuser
5454
[NO_PID]: sqlca: code: 0, state: 00000
5555
[NO_PID]: ecpg_finish: Connection connectdb closed.
5656
[NO_PID]: sqlca: code: 0, state: 00000
57-
[NO_PID]: ECPGconnect: opening database nonexistant on localhost port <REGRESSION_PORT> for user connectuser
57+
[NO_PID]: ECPGconnect: opening database nonexistant on localhost port <REGRESSION_PORT> for user connectuser
5858
[NO_PID]: sqlca: code: 0, state: 00000
59-
[NO_PID]: ECPGconnect: could not open database nonexistant on localhost port <REGRESSION_PORT> for user connectuser in line 62
60-
FATAL: database "nonexistant" does not exist
59+
[NO_PID]: ECPGconnect: could not open database: FATAL: database "nonexistant" does not exist
6160

6261
[NO_PID]: sqlca: code: 0, state: 00000
6362
[NO_PID]: ecpg_finish: Connection nonexistant closed.
@@ -66,10 +65,9 @@
6665
[NO_PID]: sqlca: code: -402, state: 08001
6766
[NO_PID]: raising sqlcode -220 in line 63, 'No such connection CURRENT in line 63.'.
6867
[NO_PID]: sqlca: code: -220, state: 08003
69-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
68+
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
7069
[NO_PID]: sqlca: code: 0, state: 00000
71-
[NO_PID]: ECPGconnect: could not open database connectdb on localhost port <REGRESSION_PORT> for user connectuser in line 66
72-
could not connect to server: Connection refused
70+
[NO_PID]: ECPGconnect: could not open database: could not connect to server: Connection refused
7371
Is the server running on host "localhost" and accepting
7472
TCP/IP connections on port 20?
7573

@@ -78,5 +76,5 @@
7876
[NO_PID]: sqlca: code: 0, state: 00000
7977
[NO_PID]: raising sqlcode -402 in line 66, 'Could not connect to database connectdb in line 66.'.
8078
[NO_PID]: sqlca: code: -402, state: 08001
81-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
79+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
8280
[NO_PID]: sqlca: code: 0, state: 00000

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[NO_PID]: ECPGdebug: set to 1
22
[NO_PID]: sqlca: code: 0, state: 00000
3-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
3+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
44
[NO_PID]: sqlca: code: 0, state: 00000
5-
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
5+
[NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>
66
[NO_PID]: sqlca: code: 0, state: 00000
77
[NO_PID]: ecpg_execute line 28: QUERY: select current_database () with 0 parameter on connection second
88
[NO_PID]: sqlca: code: 0, state: 00000

0 commit comments

Comments
 (0)