From 3e5096afefdd7ef540ffe0225a6e2d6c30221a29 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Thu, 11 Apr 2013 19:42:24 -0500
Subject: [PATCH] Added ability to choose user to log in as

---
 conn.go      | 2 +-
 conn_test.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conn.go b/conn.go
index 1b66efa2..40c5174f 100644
--- a/conn.go
+++ b/conn.go
@@ -41,10 +41,10 @@ func Connect(options map[string]string) (c *conn, err error) {
 	var database string
 
 	msg := newStartupMessage()
+	msg.options["user"], _ = options["user"]
 	if database, present = options["database"]; present {
 		msg.options["database"] = database
 	}
-	msg.options["user"] = "jack"
 	c.txStartupMessage(msg)
 
 	for {
diff --git a/conn_test.go b/conn_test.go
index d63b3039..1ce520f9 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -5,7 +5,7 @@ import (
 )
 
 func TestConnect(t *testing.T) {
-	conn, err := Connect(map[string]string{"socket": "/private/tmp/.s.PGSQL.5432", "database": "pgx_test"})
+	conn, err := Connect(map[string]string{"socket": "/private/tmp/.s.PGSQL.5432", "user": "pgx", "database": "pgx_test"})
 	if err != nil {
 		t.Fatal("Unable to establish connection")
 	}
@@ -35,7 +35,7 @@ func TestConnect(t *testing.T) {
 }
 
 func TestQuery(t *testing.T) {
-	conn, err := Connect(map[string]string{"socket": "/private/tmp/.s.PGSQL.5432"})
+	conn, err := Connect(map[string]string{"socket": "/private/tmp/.s.PGSQL.5432", "user": "pgx", "database": "pgx_test"})
 	if err != nil {
 		t.Fatal("Unable to establish connection")
 	}