From 9067b2d991f0a1b505e8add8592ce7b3d32130c3 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Sat, 17 May 2014 13:44:55 -0500
Subject: [PATCH] Rename ConnectionPoolOptions to ConnPoolConfig

---
 README.md                      | 2 +-
 bench_test.go                  | 2 +-
 conn_pool.go                   | 4 ++--
 conn_pool_test.go              | 6 +++---
 examples/url_shortener/main.go | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 1c7d3b5a..80a83277 100644
--- a/README.md
+++ b/README.md
@@ -139,7 +139,7 @@ changing transcoders).
 ### Logging
 
 Pgx defines the pgx.Logger interface. A value that satisfies this interface
-used as part of ConnectionOptions or ConnectionPoolOptions to enable logging
+used as part of ConnectionOptions or ConnPoolConfig to enable logging
 of pgx activities.
 
 ## Testing
diff --git a/bench_test.go b/bench_test.go
index bacf62db..de425cd9 100644
--- a/bench_test.go
+++ b/bench_test.go
@@ -635,7 +635,7 @@ func BenchmarkTimestampTzBinary(b *testing.B) {
 }
 
 func BenchmarkConnPool(b *testing.B) {
-	options := pgx.ConnectionPoolOptions{MaxConnections: 5}
+	options := pgx.ConnPoolConfig{MaxConnections: 5}
 	pool, err := pgx.NewConnPool(*defaultConnConfig, options)
 	if err != nil {
 		b.Fatalf("Unable to create connection pool: %v", err)
diff --git a/conn_pool.go b/conn_pool.go
index a82c55d4..7028a829 100644
--- a/conn_pool.go
+++ b/conn_pool.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 )
 
-type ConnectionPoolOptions struct {
+type ConnPoolConfig struct {
 	MaxConnections int // max simultaneous connections to use
 	AfterConnect   func(*Conn) error
 	Logger         Logger
@@ -29,7 +29,7 @@ type ConnPoolStat struct {
 
 // NewConnPool creates a new ConnPool. config are passed through to
 // Connect directly.
-func NewConnPool(config ConnConfig, options ConnectionPoolOptions) (p *ConnPool, err error) {
+func NewConnPool(config ConnConfig, options ConnPoolConfig) (p *ConnPool, err error) {
 	p = new(ConnPool)
 	p.config = config
 	p.maxConnections = options.MaxConnections
diff --git a/conn_pool_test.go b/conn_pool_test.go
index ca91bf67..b202d5e9 100644
--- a/conn_pool_test.go
+++ b/conn_pool_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func createConnPool(t *testing.T, maxConnections int) *pgx.ConnPool {
-	options := pgx.ConnectionPoolOptions{MaxConnections: maxConnections}
+	options := pgx.ConnPoolConfig{MaxConnections: maxConnections}
 	pool, err := pgx.NewConnPool(*defaultConnConfig, options)
 	if err != nil {
 		t.Fatalf("Unable to create connection pool: %v", err)
@@ -24,7 +24,7 @@ func TestNewConnPool(t *testing.T) {
 		return nil
 	}
 
-	options := pgx.ConnectionPoolOptions{MaxConnections: 2, AfterConnect: afterConnect}
+	options := pgx.ConnPoolConfig{MaxConnections: 2, AfterConnect: afterConnect}
 	pool, err := pgx.NewConnPool(*defaultConnConfig, options)
 	if err != nil {
 		t.Fatal("Unable to establish connection pool")
@@ -43,7 +43,7 @@ func TestNewConnPool(t *testing.T) {
 		return errAfterConnect
 	}
 
-	options = pgx.ConnectionPoolOptions{MaxConnections: 2, AfterConnect: afterConnect}
+	options = pgx.ConnPoolConfig{MaxConnections: 2, AfterConnect: afterConnect}
 	pool, err = pgx.NewConnPool(*defaultConnConfig, options)
 	if err != errAfterConnect {
 		t.Errorf("Expected errAfterConnect but received unexpected: %v", err)
diff --git a/examples/url_shortener/main.go b/examples/url_shortener/main.go
index 9d483f97..aea056aa 100644
--- a/examples/url_shortener/main.go
+++ b/examples/url_shortener/main.go
@@ -102,7 +102,7 @@ func main() {
 		User:     "jack",
 		Password: "jack",
 		Database: "url_shortener"}
-	poolOptions := pgx.ConnectionPoolOptions{MaxConnections: 5, AfterConnect: afterConnect}
+	poolOptions := pgx.ConnPoolConfig{MaxConnections: 5, AfterConnect: afterConnect}
 	pool, err = pgx.NewConnectionPool(connectionOptions, poolOptions)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Unable to create connection pool: %v\n", err)