GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename pgxpool.NewConfig to NewWithConfig 

https://github.com/jackc/pgx/issues/1264
pull/1281/head
Jack Christensen 2022-07-30 09:16:42 -05:00
parent c3258b7f52
commit 033fc6f62a
4 changed files with 18 additions and 18 deletions
examples/url_shortener

2
examples/url_shortener/main.go
View File

@ -75,7 +75,7 @@ func main() {
log.Fatalln("Unable to parse DATABASE_URL:", err) log.Fatalln("Unable to parse DATABASE_URL:", err)
} }
db, err = pgxpool.NewConfig(context.Background(), poolConfig) db, err = pgxpool.NewWithConfig(context.Background(), poolConfig)
if err != nil { if err != nil {
log.Fatalln("Unable to create connection pool:", err) log.Fatalln("Unable to create connection pool:", err)
} }

4
pgxpool/bench_test.go
View File

@ -34,7 +34,7 @@ func BenchmarkMinimalPreparedSelectBaseline(b *testing.B) {
return err return err
} }
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(b, err) require.NoError(b, err)
conn, err := db.Acquire(context.Background()) conn, err := db.Acquire(context.Background())
@ -65,7 +65,7 @@ func BenchmarkMinimalPreparedSelect(b *testing.B) {
return err return err
} }
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(b, err) require.NoError(b, err)
var n int64 var n int64

6
pgxpool/pool.go
View File

@ -160,11 +160,11 @@ func New(ctx context.Context, connString string) (*Pool, error) {
return nil, err return nil, err
} }
return NewConfig(ctx, config) return NewWithConfig(ctx, config)
} }
// NewConfig creates a new Pool. config must have been created by ParseConfig. // NewWithConfig creates a new Pool. config must have been created by ParseConfig.
func NewConfig(ctx context.Context, config *Config) (*Pool, error) { func NewWithConfig(ctx context.Context, config *Config) (*Pool, error) {
// Default values are set in ParseConfig. Enforce initial creation by ParseConfig rather than setting defaults from // Default values are set in ParseConfig. Enforce initial creation by ParseConfig rather than setting defaults from
// zero values. // zero values.
if !config.createdByParseConfig { if !config.createdByParseConfig {

24
pgxpool/pool_test.go
View File

@ -30,7 +30,7 @@ func TestConnectConfig(t *testing.T) {
connString := os.Getenv("PGX_TEST_DATABASE") connString := os.Getenv("PGX_TEST_DATABASE")
config, err := pgxpool.ParseConfig(connString) config, err := pgxpool.ParseConfig(connString)
require.NoError(t, err) require.NoError(t, err)
pool, err := pgxpool.NewConfig(context.Background(), config) pool, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
assertConfigsEqual(t, config, pool.Config(), "Pool.Config() returns original config") assertConfigsEqual(t, config, pool.Config(), "Pool.Config() returns original config")
pool.Close() pool.Close()
@ -52,7 +52,7 @@ func TestConnectConfigRequiresConnConfigFromParseConfig(t *testing.T) {
config := &pgxpool.Config{} config := &pgxpool.Config{}
require.PanicsWithValue(t, "config must be created by ParseConfig", func() { pgxpool.NewConfig(context.Background(), config) }) require.PanicsWithValue(t, "config must be created by ParseConfig", func() { pgxpool.NewWithConfig(context.Background(), config) })
} }
func TestConfigCopyReturnsEqualConfig(t *testing.T) { func TestConfigCopyReturnsEqualConfig(t *testing.T) {
@ -72,7 +72,7 @@ func TestConfigCopyCanBeUsedToConnect(t *testing.T) {
copied := original.Copy() copied := original.Copy()
assert.NotPanics(t, func() { assert.NotPanics(t, func() {
_, err = pgxpool.NewConfig(context.Background(), copied) _, err = pgxpool.NewWithConfig(context.Background(), copied)
}) })
assert.NoError(t, err) assert.NoError(t, err)
} }
@ -205,7 +205,7 @@ func TestPoolBeforeConnect(t *testing.T) {
return nil return nil
} }
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
@ -226,7 +226,7 @@ func TestPoolAfterConnect(t *testing.T) {
return err return err
} }
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
@ -249,7 +249,7 @@ func TestPoolBeforeAcquire(t *testing.T) {
return acquireAttempts%2 == 0 return acquireAttempts%2 == 0
} }
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
@ -304,7 +304,7 @@ func TestPoolAfterRelease(t *testing.T) {
return afterReleaseCount%2 == 1 return afterReleaseCount%2 == 1
} }
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
@ -357,7 +357,7 @@ func TestConnReleaseChecksMaxConnLifetime(t *testing.T) {
config.MaxConnLifetime = 250 * time.Millisecond config.MaxConnLifetime = 250 * time.Millisecond
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
@ -410,7 +410,7 @@ func TestPoolBackgroundChecksMaxConnLifetime(t *testing.T) {
config.MaxConnLifetime = 100 * time.Millisecond config.MaxConnLifetime = 100 * time.Millisecond
config.HealthCheckPeriod = 100 * time.Millisecond config.HealthCheckPeriod = 100 * time.Millisecond
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
@ -435,7 +435,7 @@ func TestPoolBackgroundChecksMaxConnIdleTime(t *testing.T) {
config.MaxConnIdleTime = 100 * time.Millisecond config.MaxConnIdleTime = 100 * time.Millisecond
config.HealthCheckPeriod = 150 * time.Millisecond config.HealthCheckPeriod = 150 * time.Millisecond
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
@ -464,7 +464,7 @@ func TestPoolBackgroundChecksMinConns(t *testing.T) {
config.HealthCheckPeriod = 100 * time.Millisecond config.HealthCheckPeriod = 100 * time.Millisecond
config.MinConns = 2 config.MinConns = 2
db, err := pgxpool.NewConfig(context.Background(), config) db, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
defer db.Close() defer db.Close()
@ -909,7 +909,7 @@ func TestConnectEagerlyReachesMinPoolSize(t *testing.T) {
return nil return nil
} }
pool, err := pgxpool.NewConfig(context.Background(), config) pool, err := pgxpool.NewWithConfig(context.Background(), config)
require.NoError(t, err) require.NoError(t, err)
defer pool.Close() defer pool.Close()