When using libpq URI syntax, error out on invalid parameter names.

robertmhaas · robertmhaas · commit 3b5548a3d524 · 2012-06-08T08:47:24.000-04:00
Dan Farina
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -4874,9 +4874,11 @@ conninfo_uri_parse_params(char *params,
 				return false;
 			}
 
-			fprintf(stderr,
-					libpq_gettext("WARNING: ignoring unrecognized URI query parameter: %s\n"),
-					keyword);
+			printfPQExpBuffer(errorMessage,
+							  libpq_gettext(
+								  "invalid URI query parameter \"%s\"\n"),
+							  keyword);
+			return false;
 		}
 		if (malloced)
 		{
diff --git a/src/interfaces/libpq/test/expected.out b/src/interfaces/libpq/test/expected.out
@@ -59,8 +59,8 @@ trying postgresql://host/db?u%73er=someotheruser&port=12345
 user='someotheruser' dbname='db' host='host' port='12345' (inet)
 
 trying postgresql://host/db?u%7aer=someotheruser&port=12345
-WARNING: ignoring unrecognized URI query parameter: uzer
-dbname='db' host='host' port='12345' (inet)
+uri-regress: invalid URI query parameter "uzer"
+
 
 trying postgresql://host:12345?user=uri-user
 user='uri-user' host='host' port='12345' (inet)
@@ -102,8 +102,8 @@ trying postgres://?host=/path/to/socket/dir
 host='/path/to/socket/dir' (local)
 
 trying postgresql://host?uzer=
-WARNING: ignoring unrecognized URI query parameter: uzer
-host='host' (inet)
+uri-regress: invalid URI query parameter "uzer"
+
 
 trying postgre://
 uri-regress: missing "=" after "postgre://" in connection info string

Original file line number	Diff line number	Diff line change
`@@ -4874,9 +4874,11 @@ conninfo_uri_parse_params(char *params,`
`4874`	`4874`	`return false;`
`4875`	`4875`	`}`
`4876`	`4876`
`4877`		`- fprintf(stderr,`
`4878`		`- libpq_gettext("WARNING: ignoring unrecognized URI query parameter: %s\n"),`
`4879`		`- keyword);`
	`4877`	`+ printfPQExpBuffer(errorMessage,`
	`4878`	`+ libpq_gettext(`
	`4879`	`+ "invalid URI query parameter \"%s\"\n"),`
	`4880`	`+ keyword);`
	`4881`	`+ return false;`
`4880`	`4882`	`}`
`4881`	`4883`	`if (malloced)`
`4882`	`4884`	`{`