database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-15 19:21:59 +03:00
Code Activity

Allow "dbname" from connection string to be overridden in PQconnectDBParams

Browse Source 
If the "dbname" attribute in PQconnectDBParams contained a connection string
or URI (and expand_dbname = TRUE), the database name from the connection
string could not be overridden by a subsequent "dbname" keyword in the
array. That was not intentional; all other options can be overridden.
Furthermore, any subsequent "dbname" caused the connection string from the
first dbname value to be processed again, overriding any values for the same
options that were given between the connection string and the second dbname
option.

In the passing, clarify in the docs that only the first dbname option in the
array is parsed as a connection string.

Alex Shulgin. Backpatch to all supported versions.
This commit is contained in:
Heikki Linnakangas
2014-11-25 17:12:07 +02:00
parent 1f35170395
commit 9880fea4fd
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/interfaces/libpq/fe-connect.c
View File

@ -4221,9 +4221,9 @@ conninfo_array_parse(const char **keywords, const char **values,
}
/*
* If we are on the dbname parameter, and we have a parsed
* conninfo string, copy those parameters across, overriding any
* existing previous settings
* If we are on the first dbname parameter, and we have a parsed
* connection string, copy those parameters across, overriding any
* existing previous settings.
*/
if (strcmp(pname, "dbname") == 0 && str_options)
{
@ -4255,6 +4255,12 @@ conninfo_array_parse(const char **keywords, const char **values,
}
}
}
/*
* Forget the parsed connection string, so that any subsequent
* dbname parameters will not be expanded.
*/
PQconninfoFree(str_options);
str_options = NULL;
}
else
{