mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-02 22:34:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Proper parameter separators for PostgreSQL connection initialization.

Browse Source
This commit is contained in:
Ilia Alshanetsky 2004-07-29 00:18:02 +00:00
parent 45ddc6a5cd
commit 65ae35729d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/pdo_pgsql/pgsql_driver.c
View File

@ -317,7 +317,7 @@ static int pdo_pgsql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
{
pdo_pgsql_db_handle *H;
int ret = 0;
char *conn_str;
char *conn_str, *p, *e;
H = pecalloc(1, sizeof(pdo_pgsql_db_handle), dbh->is_persistent);
dbh->driver_data = H;
@ -325,15 +325,24 @@ static int pdo_pgsql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
H->einfo.errcode = 0;
H->einfo.errmsg = NULL;
/* PostgreSQL wants params in the connect string to be separated by spaces,
* if the PDO standard semicolons are used, we convert them to spaces
*/
e = (char *) dbh->data_source + strlen(dbh->data_source);
p = (char *) dbh->data_source;
while ((p = memchr(p, ';', (e - p)))) {
*p = ' ';
}
/* support both full connection string & connection string + login and/or password */
if (!dbh->username || !dbh->password) {
conn_str = (char *) dbh->data_source;
} else if (dbh->username && dbh->password) {
spprintf(&conn_str, 0, "%s;user=%s;password=%s", dbh->data_source, dbh->username, dbh->password);
spprintf(&conn_str, 0, "%s user=%s password=%s", dbh->data_source, dbh->username, dbh->password);
} else if (dbh->username) {
spprintf(&conn_str, 0, "%s;user=%s", dbh->data_source, dbh->username);
spprintf(&conn_str, 0, "%s user=%s", dbh->data_source, dbh->username);
} else {
spprintf(&conn_str, 0, "%s;password=%s", dbh->data_source, dbh->password);
spprintf(&conn_str, 0, "%s password=%s", dbh->data_source, dbh->password);
}
H->server = PQconnectdb(dbh->data_source);