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

hlinnaka · hlinnaka · commit 95be3436221a · 2014-11-25T17:39:07.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/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -4460,9 +4460,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)
 			{
@@ -4494,6 +4494,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
 			{

Original file line number	Diff line number	Diff line change
`@@ -4460,9 +4460,9 @@ conninfo_array_parse(const char keywords, const char values,`
`4460`	`4460`	`}`
`4461`	`4461`
`4462`	`4462`	`/*`
`4463`		`- * If we are on the dbname parameter, and we have a parsed`
`4464`		`- * conninfo string, copy those parameters across, overriding any`
`4465`		`- * existing previous settings`
	`4463`	`+ * If we are on the first dbname parameter, and we have a parsed`
	`4464`	`+ * connection string, copy those parameters across, overriding any`
	`4465`	`+ * existing previous settings.`
`4466`	`4466`	`*/`
`4467`	`4467`	`if (strcmp(pname, "dbname") == 0 && str_options)`
`4468`	`4468`	`{`
`@@ -4494,6 +4494,12 @@ conninfo_array_parse(const char keywords, const char values,`
`4494`	`4494`	`}`
`4495`	`4495`	`}`
`4496`	`4496`	`}`
	`4497`	`+ /*`
	`4498`	`+ * Forget the parsed connection string, so that any subsequent`
	`4499`	`+ * dbname parameters will not be expanded.`
	`4500`	`+ */`
	`4501`	`+ PQconninfoFree(str_options);`
	`4502`	`+ str_options = NULL;`
`4497`	`4503`	`}`
`4498`	`4504`	`else`
`4499`	`4505`	`{`