Don't die on trailing whitespace in a connection string

Currently, if you give pq a connection string with a trailing whitespace, pq likes to die with the confusing message pq: invalid option: "" This patch just trims whitespace around the connection string so that when parseOptions splits on " ", it doesn't get a spurious empty option. Editorialized by Daniel Farina <[email protected]>
xuegang · Jun 7, 2013 · d0047d4 · d0047d4
1 parent 592007b
commit d0047d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/conn.go b/conn.go
@@ -112,6 +112,8 @@ func parseOpts(name string, o Values) {
 		return
 	}
 
+	name = strings.TrimSpace(name)
+
 	ps := strings.Split(name, " ")
 	for _, p := range ps {
 		kv := strings.Split(p, "=")

diff --git a/conn_test.go b/conn_test.go
@@ -517,3 +517,12 @@ func TestRollback(t *testing.T) {
 		t.Fatal("Transaction rollback failed")
 	}
 }
+
+func TestConnTrailingSpace(t *testing.T) {
+	o := make(Values)
+	expected := Values{"dbname": "hello", "user": "goodbye"}
+	parseOpts("dbname=hello user=goodbye ", o)
+	if !reflect.DeepEqual(expected, o) {
+		t.Fatalf("Expected: %#v Got: %#v", expected, o)
+	}
+}