Merge Options.Host and Options.Port into Options.Addr.

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## v4
 
+- `Options.Host` and `Options.Port` merged into `Options.Addr`.
 - `LoadInto` renamed to `Scan`, `ColumnLoader` renamed to `ColumnScanner`, LoadColumn renamed to ScanColumn, `NewRecord() interface{}` changed to `NewModel() ColumnScanner`, `AppendQuery(dst []byte) []byte` changed to `AppendValue(dst []byte, quote bool) ([]byte, error)`.
 - Structs, maps and slices are marshalled to JSON by default.
 - Added support for scanning slices, .e.g. scanning `[]int`.

conn.go

@@ -2,8 +2,10 @@ package pg
 
 import (
 	"container/list"
+	"crypto/md5"
 	"crypto/tls"
 	"encoding/binary"
+	"encoding/hex"
 	"fmt"
 	"io"
 	"net"
@@ -340,3 +342,9 @@ func (cn *conn) FlushWrite() error {
 	}
 	return err
 }
+
+func md5s(s string) string {
+	h := md5.New()
+	h.Write([]byte(s))
+	return hex.EncodeToString(h.Sum(nil))
+}

db.go

@@ -17,8 +17,7 @@ type Options struct {
 	// The network type, either tcp or unix.
 	// Default is tcp.
 	Network  string
-	Host     string
-	Port     string
+	Addr     string
 	User     string
 	Password string
 	Database string
@@ -63,27 +62,14 @@ func (opt *Options) getNetwork() string {
 	return opt.Network
 }
 
-func (opt *Options) getHost() string {
-	if opt == nil || opt.Host == "" {
-		return "localhost"
-	}
-	return opt.Host
-}
-
-func (opt *Options) getPort() string {
-	if opt == nil || opt.Port == "" {
-		return "5432"
-	}
-	return opt.Port
-}
-
 func (opt *Options) getAddr() string {
-	switch opt.getNetwork() {
-	case "tcp":
-		return net.JoinHostPort(opt.getHost(), opt.getPort())
-	default:
-		return opt.getHost()
+	if opt.Addr != "" {
+		return opt.Addr
+	}
+	if opt.getNetwork() == "unix" {
+		return "/var/run/postgresql/.s.PGSQL.5432"
 	}
+	return "localhost:5432"
 }
 
 func (opt *Options) getUser() string {

main_test.go

@@ -3,6 +3,7 @@ package pg_test
 import (
 	"bytes"
 	"database/sql/driver"
+	"io"
 	"strings"
 	"testing"
 	"time"
@@ -17,7 +18,7 @@ import (
 func TestUnixSocket(t *testing.T) {
 	db := pg.Connect(&pg.Options{
 		Network: "unix",
-		Host:    "/var/run/postgresql/.s.PGSQL.5432",
+		Addr:    "/var/run/postgresql/.s.PGSQL.5432",
 		User:    "postgres",
 	})
 	defer db.Close()
@@ -221,3 +222,14 @@ func (t *DBTest) TestCopyTo(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(res.Affected(), Equals, 1000000)
 }
+
+//------------------------------------------------------------------------------
+
+// NopWriteCloser is a WriteCloser which does nothing in Close.
+type NopWriteCloser struct {
+	io.Writer
+}
+
+func (NopWriteCloser) Close() error {
+	return nil
+}

orm/format.go

@@ -77,10 +77,6 @@ func (f *Formatter) Append(dst []byte, src string) ([]byte, error) {
 }
 
 func (f *Formatter) AppendBytes(dst []byte, src []byte) ([]byte, error) {
-	if f.params == nil {
-		return append(dst, src...), nil
-	}
-
 	p := parser.New(src)
 
 	for p.Valid() {