>From 44d9d6a2c9cf5af83988f9d3b6eeb39c36104ef9 Mon Sep 17 00:00:00 2001 From: Alex Shulgin Date: Mon, 24 Nov 2014 18:12:51 +0300 Subject: [PATCH 2/3] Allow further dbname=value to override conninfo parsed from an expanded dbname in conninfo_array_parse(). --- src/interfaces/libpq/fe-connect.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c new file mode 100644 index d7f2ec2..5b45128 *** a/src/interfaces/libpq/fe-connect.c --- b/src/interfaces/libpq/fe-connect.c *************** conninfo_parse(const char *conninfo, PQE *** 4302,4311 **** * Defaults are supplied (from a service file, environment variables, etc) * for unspecified options, but only if use_defaults is TRUE. * ! * If expand_dbname is non-zero, and the value passed for keyword "dbname" is a ! * connection string (as indicated by recognized_connection_string) then parse ! * and process it, overriding any previously processed conflicting ! * keywords. Subsequent keywords will take precedence, however. */ static PQconninfoOption * conninfo_array_parse(const char *const * keywords, const char *const * values, --- 4302,4313 ---- * Defaults are supplied (from a service file, environment variables, etc) * for unspecified options, but only if use_defaults is TRUE. * ! * If expand_dbname is non-zero, and the value passed for the first occurrence ! * of "dbname" keyword is a connection string (as indicated by ! * recognized_connection_string) then parse and process it, overriding any ! * previously processed conflicting keywords. Subsequent keywords will take ! * precedence, however. In particular, a further occurrence of "dbname" may ! * override the dbname provided in the connection string. */ static PQconninfoOption * conninfo_array_parse(const char *const * keywords, const char *const * values, *************** conninfo_array_parse(const char *const * *** 4381,4387 **** } /* ! * If we are on the dbname parameter, and we have a parsed * connection string, copy those parameters across, overriding any * existing previous settings. */ --- 4383,4389 ---- } /* ! * If we are on the *first* dbname parameter, and we have a parsed * connection string, copy those parameters across, overriding any * existing previous settings. */ *************** conninfo_array_parse(const char *const * *** 4415,4420 **** --- 4417,4428 ---- } } } + /* + * Clear out the parsed dbname, so that a possible further + * occurrence of dbname have the chance to override it. + */ + PQconninfoFree(dbname_options); + dbname_options = NULL; } else { -- 2.1.0