From 9990e4894d81e14d6f3ad95d1110de27f425c0b9 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Fri, 28 Dec 2018 17:09:56 -0600
Subject: [PATCH] Rename base package to pgconn

---
 conn.go                          | 12 ++++++------
 messages.go                      |  4 ++--
 base/conn.go => pgconn/pgconn.go |  2 +-
 {base => pgconn}/pgconn_test.go  |  6 +++---
 v4.md                            |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename base/conn.go => pgconn/pgconn.go (99%)
 rename {base => pgconn}/pgconn_test.go (75%)

diff --git a/conn.go b/conn.go
index e550be98..f1bbf3bf 100644
--- a/conn.go
+++ b/conn.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/jackc/pgx/base"
+	"github.com/jackc/pgx/pgconn"
 	"github.com/jackc/pgx/pgio"
 	"github.com/jackc/pgx/pgproto3"
 	"github.com/jackc/pgx/pgtype"
@@ -94,7 +94,7 @@ type ConnConfig struct {
 // Use ConnPool to manage access to multiple database connections from multiple
 // goroutines.
 type Conn struct {
-	pgConn             *base.PgConn
+	pgConn             *pgconn.PgConn
 	wbuf               []byte
 	config             ConnConfig // config used when establishing this connection
 	preparedStatements map[string]*PreparedStatement
@@ -179,7 +179,7 @@ var ErrDeadConn = errors.New("conn is dead")
 
 // ErrTLSRefused occurs when the connection attempt requires TLS and the
 // PostgreSQL server refuses to use TLS
-var ErrTLSRefused = base.ErrTLSRefused
+var ErrTLSRefused = pgconn.ErrTLSRefused
 
 // ErrConnBusy occurs when the connection is busy (for example, in the middle of
 // reading query results) and another action is attempted.
@@ -244,18 +244,18 @@ func connect(config ConnConfig, connInfo *pgtype.ConnInfo) (c *Conn, err error)
 }
 
 func (c *Conn) connect(config ConnConfig, tlsConfig *tls.Config) (err error) {
-	cc := base.ConnConfig{
+	cc := pgconn.ConnConfig{
 		Host:          config.Host,
 		Port:          config.Port,
 		Database:      config.Database,
 		User:          config.User,
 		Password:      config.Password,
 		TLSConfig:     tlsConfig,
-		Dial:          base.DialFunc(config.Dial),
+		Dial:          pgconn.DialFunc(config.Dial),
 		RuntimeParams: config.RuntimeParams,
 	}
 
-	c.pgConn, err = base.Connect(cc)
+	c.pgConn, err = pgconn.Connect(cc)
 	if err != nil {
 		return err
 	}
diff --git a/messages.go b/messages.go
index a09b4580..9b6db02d 100644
--- a/messages.go
+++ b/messages.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/jackc/pgx/base"
+	"github.com/jackc/pgx/pgconn"
 	"github.com/jackc/pgx/pgio"
 	"github.com/jackc/pgx/pgtype"
 )
@@ -79,7 +79,7 @@ func (fd FieldDescription) Type() reflect.Type {
 	}
 }
 
-type PgError = base.PgError
+type PgError = pgconn.PgError
 
 // Notice represents a notice response message reported by the PostgreSQL
 // server. Be aware that this is distinct from LISTEN/NOTIFY notification.
diff --git a/base/conn.go b/pgconn/pgconn.go
similarity index 99%
rename from base/conn.go
rename to pgconn/pgconn.go
index 386daaa5..c9caef42 100644
--- a/base/conn.go
+++ b/pgconn/pgconn.go
@@ -1,4 +1,4 @@
-package base
+package pgconn
 
 import (
 	"crypto/md5"
diff --git a/base/pgconn_test.go b/pgconn/pgconn_test.go
similarity index 75%
rename from base/pgconn_test.go
rename to pgconn/pgconn_test.go
index ad1a9918..dbcf2704 100644
--- a/base/pgconn_test.go
+++ b/pgconn/pgconn_test.go
@@ -1,7 +1,7 @@
-package base_test
+package pgconn_test
 
 import (
-	"github.com/jackc/pgx/base"
+	"github.com/jackc/pgx/pgconn"
 
 	"testing"
 
@@ -10,7 +10,7 @@ import (
 )
 
 func TestSimple(t *testing.T) {
-	pgConn, err := base.Connect(base.ConnConfig{Host: "/var/run/postgresql", User: "jack", Database: "pgx_test"})
+	pgConn, err := pgconn.Connect(pgconn.ConnConfig{Host: "/var/run/postgresql", User: "jack", Database: "pgx_test"})
 	require.Nil(t, err)
 
 	pgConn.SendExec("select current_database()")
diff --git a/v4.md b/v4.md
index 63f5202b..51c9e798 100644
--- a/v4.md
+++ b/v4.md
@@ -34,7 +34,7 @@ Minor Potential Changes:
 
 ## Changes
 
-`base.PgConn` now contains core PostgreSQL connection functionality.
+`pgconn.PgConn` now contains core PostgreSQL connection functionality.
 
 ### Incompatible Changes