diff --git a/go.mod b/go.mod index 0cc5e003..5d18d577 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/cockroachdb/apd v1.1.0 github.com/gofrs/uuid v3.2.0+incompatible - github.com/jackc/pgconn v1.6.5-0.20200821030021-3eb5432c4738 + github.com/jackc/pgconn v1.6.5-0.20200821030840-fdfc783345f6 github.com/jackc/pgio v1.0.0 github.com/jackc/pgproto3/v2 v2.0.4 github.com/jackc/pgtype v1.4.2 diff --git a/go.sum b/go.sum index 83088ac9..4249eec2 100644 --- a/go.sum +++ b/go.sum @@ -42,6 +42,8 @@ github.com/jackc/pgconn v1.6.4 h1:S7T6cx5o2OqmxdHaXLH1ZeD1SbI8jBznyYE9Ec0RCQ8= github.com/jackc/pgconn v1.6.4/go.mod h1:w2pne1C2tZgP+TvjqLpOigGzNqjBgQW9dUw/4Chex78= github.com/jackc/pgconn v1.6.5-0.20200821030021-3eb5432c4738 h1:t/IRFEw2da5v6DroUIYPbEIDWxGGyvVLItoO7gOUBZM= github.com/jackc/pgconn v1.6.5-0.20200821030021-3eb5432c4738/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk= +github.com/jackc/pgconn v1.6.5-0.20200821030840-fdfc783345f6 h1:7f1RmJO6KZI4cskLrNHBd5CCLmLpIQ0BD75hsorvdz8= +github.com/jackc/pgconn v1.6.5-0.20200821030840-fdfc783345f6/go.mod h1:gm9GeeZiC+Ja7JV4fB/MNDeaOqsCrzFiZlLVhAompxk= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= diff --git a/pgxpool/pool.go b/pgxpool/pool.go index 7d9e86f2..e288a86c 100644 --- a/pgxpool/pool.go +++ b/pgxpool/pool.go @@ -194,7 +194,7 @@ func ConnectConfig(ctx context.Context, config *Config) (*Pool, error) { conn := value.(*connResource).conn conn.Close(ctx) select { - case <-conn.PgConn().CleanupChan(): + case <-conn.PgConn().CleanupDone(): case <-ctx.Done(): } cancel()