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

hlinnaka · hlinnaka · commit 08cd4d9a64b2 · 2014-11-25T17:39:00.000+02:00
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.
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
@@ -124,7 +124,10 @@ PGconn *PQconnectdbParams(const char * const *keywords,
       <para>
        When <literal>expand_dbname</literal> is non-zero, the
        <parameter>dbname</parameter> key word value is allowed to be recognized
-       as a connection string. More details on the possible formats appear in
+       as a connection string. Only the first occurrence of
+       <parameter>dbname</parameter> is expanded this way, any subsequent
+       <parameter>dbname</parameter> value is processed as plain database name. More
+       details on the possible connection string formats appear in
        <xref linkend="libpq-connstring">.
       </para>
 
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -4393,10 +4393,11 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage,
  * 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.
+ * 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.
  */
 static PQconninfoOption *
 conninfo_array_parse(const char *const * keywords, const char *const * values,
@@ -4472,7 +4473,7 @@ conninfo_array_parse(const char *const * keywords, const char *const * values,
 			}
 
 			/*
-			 * If we are on the dbname parameter, and we have a parsed
+			 * If we are on the first dbname parameter, and we have a parsed
 			 * connection string, copy those parameters across, overriding any
 			 * existing previous settings.
 			 */
@@ -4506,6 +4507,12 @@ conninfo_array_parse(const char *const * keywords, const char *const * values,
 						}
 					}
 				}
+				/*
+				 * Forget the parsed connection string, so that any subsequent
+				 * dbname parameters will not be expanded.
+				 */
+				PQconninfoFree(dbname_options);
+				dbname_options = NULL;
 			}
 			else
 			{

Original file line number	Diff line number	Diff line change
`@@ -4393,10 +4393,11 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage,`
`4393`	`4393`	`* Defaults are supplied (from a service file, environment variables, etc)`
`4394`	`4394`	`* for unspecified options, but only if use_defaults is TRUE.`
`4395`	`4395`	`*`
`4396`		`- * If expand_dbname is non-zero, and the value passed for keyword "dbname" is a`
`4397`		`- * connection string (as indicated by recognized_connection_string) then parse`
`4398`		`- * and process it, overriding any previously processed conflicting`
`4399`		`- * keywords. Subsequent keywords will take precedence, however.`
	`4396`	`+ * If expand_dbname is non-zero, and the value passed for the first occurrence`
	`4397`	`+ * of "dbname" keyword is a connection string (as indicated by`
	`4398`	`+ * recognized_connection_string) then parse and process it, overriding any`
	`4399`	`+ * previously processed conflicting keywords. Subsequent keywords will take`
	`4400`	`+ * precedence, however.`
`4400`	`4401`	`*/`
`4401`	`4402`	`static PQconninfoOption *`
`4402`	`4403`	`conninfo_array_parse(const char const keywords, const char const values,`
`@@ -4472,7 +4473,7 @@ conninfo_array_parse(const char const keywords, const char const values,`
`4472`	`4473`	`}`
`4473`	`4474`
`4474`	`4475`	`/*`
`4475`		`- * If we are on the dbname parameter, and we have a parsed`
	`4476`	`+ * If we are on the first dbname parameter, and we have a parsed`
`4476`	`4477`	`* connection string, copy those parameters across, overriding any`
`4477`	`4478`	`* existing previous settings.`
`4478`	`4479`	`*/`
`@@ -4506,6 +4507,12 @@ conninfo_array_parse(const char const keywords, const char const values,`
`4506`	`4507`	`}`
`4507`	`4508`	`}`
`4508`	`4509`	`}`
	`4510`	`+ /*`
	`4511`	`+ * Forget the parsed connection string, so that any subsequent`
	`4512`	`+ * dbname parameters will not be expanded.`
	`4513`	`+ */`
	`4514`	`+ PQconninfoFree(dbname_options);`
	`4515`	`+ dbname_options = NULL;`
`4509`	`4516`	`}`
`4510`	`4517`	`else`
`4511`	`4518`	`{`