From 19d4a4d57720bda27bb179589b7875685dc1b631 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Tue, 23 Apr 2013 08:57:29 -0500 Subject: [PATCH] Make ConnectionParameters fields public --- connection.go | 34 +++++++++++++++++----------------- connection_pool_test.go | 4 ++-- connection_test.go | 12 ++++++------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/connection.go b/connection.go index f48a381e..8712d968 100644 --- a/connection.go +++ b/connection.go @@ -11,12 +11,12 @@ import ( ) type ConnectionParameters struct { - socket string // path to unix domain socket (e.g. /private/tmp/.s.PGSQL.5432) - host string - port uint16 // default: 5432 - database string - user string - password string + Socket string // path to unix domain socket (e.g. /private/tmp/.s.PGSQL.5432) + Host string + Port uint16 // default: 5432 + Database string + User string + Password string } type Connection struct { @@ -33,17 +33,17 @@ func Connect(parameters ConnectionParameters) (c *Connection, err error) { c = new(Connection) c.parameters = parameters - if c.parameters.port == 0 { - c.parameters.port = 5432 + if c.parameters.Port == 0 { + c.parameters.Port = 5432 } - if c.parameters.socket != "" { - c.conn, err = net.Dial("unix", c.parameters.socket) + if c.parameters.Socket != "" { + c.conn, err = net.Dial("unix", c.parameters.Socket) if err != nil { return nil, err } - } else if c.parameters.host != "" { - c.conn, err = net.Dial("tcp", fmt.Sprintf("%s:%d", c.parameters.host, c.parameters.port)) + } else if c.parameters.Host != "" { + c.conn, err = net.Dial("tcp", fmt.Sprintf("%s:%d", c.parameters.Host, c.parameters.Port)) if err != nil { return nil, err } @@ -53,9 +53,9 @@ func Connect(parameters ConnectionParameters) (c *Connection, err error) { c.runtimeParams = make(map[string]string) msg := newStartupMessage() - msg.options["user"] = c.parameters.user - if c.parameters.database != "" { - msg.options["database"] = c.parameters.database + msg.options["user"] = c.parameters.User + if c.parameters.Database != "" { + msg.options["database"] = c.parameters.Database } c.txStartupMessage(msg) @@ -244,10 +244,10 @@ func (c *Connection) rxAuthenticationX(r *messageReader) (err error) { switch code { case 0: // AuthenticationOk case 3: // AuthenticationCleartextPassword - c.txPasswordMessage(c.parameters.password) + c.txPasswordMessage(c.parameters.Password) case 5: // AuthenticationMD5Password salt := r.readByteString(4) - digestedPassword := "md5" + hexMD5(hexMD5(c.parameters.password+c.parameters.user)+salt) + digestedPassword := "md5" + hexMD5(hexMD5(c.parameters.Password+c.parameters.User)+salt) c.txPasswordMessage(digestedPassword) default: err = errors.New("Received unknown authentication message") diff --git a/connection_pool_test.go b/connection_pool_test.go index d0be865d..da63651b 100644 --- a/connection_pool_test.go +++ b/connection_pool_test.go @@ -6,7 +6,7 @@ import ( ) func createConnectionPool(maxConnections int) *ConnectionPool { - connectionOptions := ConnectionParameters{socket: "/private/tmp/.s.PGSQL.5432", user: "pgx_none", database: "pgx_test"} + connectionOptions := ConnectionParameters{Socket: "/private/tmp/.s.PGSQL.5432", User: "pgx_none", Database: "pgx_test"} pool, err := NewConnectionPool(connectionOptions, maxConnections) if err != nil { panic("Unable to create connection pool") @@ -15,7 +15,7 @@ func createConnectionPool(maxConnections int) *ConnectionPool { } func TestNewConnectionPool(t *testing.T) { - connectionOptions := ConnectionParameters{socket: "/private/tmp/.s.PGSQL.5432", user: "pgx_none", database: "pgx_test"} + connectionOptions := ConnectionParameters{Socket: "/private/tmp/.s.PGSQL.5432", User: "pgx_none", Database: "pgx_test"} pool, err := NewConnectionPool(connectionOptions, 5) if err != nil { t.Fatal("Unable to establish connection pool") diff --git a/connection_test.go b/connection_test.go index 4f4711db..3af6a6ed 100644 --- a/connection_test.go +++ b/connection_test.go @@ -9,7 +9,7 @@ var SharedConnection *Connection func getSharedConnection() (c *Connection) { if SharedConnection == nil { var err error - SharedConnection, err = Connect(ConnectionParameters{socket: "/private/tmp/.s.PGSQL.5432", user: "pgx_none", database: "pgx_test"}) + SharedConnection, err = Connect(ConnectionParameters{Socket: "/private/tmp/.s.PGSQL.5432", User: "pgx_none", Database: "pgx_test"}) if err != nil { panic("Unable to establish connection") } @@ -19,7 +19,7 @@ func getSharedConnection() (c *Connection) { } func TestConnect(t *testing.T) { - conn, err := Connect(ConnectionParameters{socket: "/private/tmp/.s.PGSQL.5432", user: "pgx_none", database: "pgx_test"}) + conn, err := Connect(ConnectionParameters{Socket: "/private/tmp/.s.PGSQL.5432", User: "pgx_none", Database: "pgx_test"}) if err != nil { t.Fatal("Unable to establish connection") } @@ -54,7 +54,7 @@ func TestConnect(t *testing.T) { } func TestConnectWithTcp(t *testing.T) { - conn, err := Connect(ConnectionParameters{host: "127.0.0.1", user: "pgx_md5", password: "secret", database: "pgx_test"}) + conn, err := Connect(ConnectionParameters{Host: "127.0.0.1", User: "pgx_md5", Password: "secret", Database: "pgx_test"}) if err != nil { t.Fatal("Unable to establish connection: " + err.Error()) } @@ -66,7 +66,7 @@ func TestConnectWithTcp(t *testing.T) { } func TestConnectWithInvalidUser(t *testing.T) { - _, err := Connect(ConnectionParameters{socket: "/private/tmp/.s.PGSQL.5432", user: "invalid_user", database: "pgx_test"}) + _, err := Connect(ConnectionParameters{Socket: "/private/tmp/.s.PGSQL.5432", User: "invalid_user", Database: "pgx_test"}) pgErr := err.(PgError) if pgErr.Code != "28000" { t.Fatal("Did not receive expected error when connecting with invalid user") @@ -74,7 +74,7 @@ func TestConnectWithInvalidUser(t *testing.T) { } func TestConnectWithPlainTextPassword(t *testing.T) { - conn, err := Connect(ConnectionParameters{socket: "/private/tmp/.s.PGSQL.5432", user: "pgx_pw", password: "secret", database: "pgx_test"}) + conn, err := Connect(ConnectionParameters{Socket: "/private/tmp/.s.PGSQL.5432", User: "pgx_pw", Password: "secret", Database: "pgx_test"}) if err != nil { t.Fatal("Unable to establish connection: " + err.Error()) } @@ -86,7 +86,7 @@ func TestConnectWithPlainTextPassword(t *testing.T) { } func TestConnectWithMD5Password(t *testing.T) { - conn, err := Connect(ConnectionParameters{socket: "/private/tmp/.s.PGSQL.5432", user: "pgx_md5", password: "secret", database: "pgx_test"}) + conn, err := Connect(ConnectionParameters{Socket: "/private/tmp/.s.PGSQL.5432", User: "pgx_md5", Password: "secret", Database: "pgx_test"}) if err != nil { t.Fatal("Unable to establish connection: " + err.Error()) }