From ddd9cf451e264369a3d1de040872eba9e7f7887a Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Tue, 27 Aug 2019 18:29:14 -0500 Subject: [PATCH] Update pgxpool for latest pgconn --- pgxpool/conn.go | 2 +- pgxpool/pool_test.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pgxpool/conn.go b/pgxpool/conn.go index ac23c5df..315eb09d 100644 --- a/pgxpool/conn.go +++ b/pgxpool/conn.go @@ -27,7 +27,7 @@ func (c *Conn) Release() { c.res = nil now := time.Now() - if conn.IsClosed() || conn.PgConn().TxStatus != 'I' || (now.Sub(res.CreationTime()) > c.p.maxConnLifetime) { + if conn.IsClosed() || conn.PgConn().TxStatus() != 'I' || (now.Sub(res.CreationTime()) > c.p.maxConnLifetime) { res.Destroy() return } diff --git a/pgxpool/pool_test.go b/pgxpool/pool_test.go index d375e8cf..3c229bb9 100644 --- a/pgxpool/pool_test.go +++ b/pgxpool/pool_test.go @@ -360,17 +360,17 @@ func TestConnReleaseClosesConnInFailedTransaction(t *testing.T) { pid := c.Conn().PgConn().PID() - assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus) + assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus()) _, err = c.Exec(ctx, "begin") assert.NoError(t, err) - assert.Equal(t, byte('T'), c.Conn().PgConn().TxStatus) + assert.Equal(t, byte('T'), c.Conn().PgConn().TxStatus()) _, err = c.Exec(ctx, "selct") assert.Error(t, err) - assert.Equal(t, byte('E'), c.Conn().PgConn().TxStatus) + assert.Equal(t, byte('E'), c.Conn().PgConn().TxStatus()) c.Release() waitForReleaseToComplete() @@ -379,7 +379,7 @@ func TestConnReleaseClosesConnInFailedTransaction(t *testing.T) { require.NoError(t, err) assert.NotEqual(t, pid, c.Conn().PgConn().PID()) - assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus) + assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus()) c.Release() } @@ -398,12 +398,12 @@ func TestConnReleaseClosesConnInTransaction(t *testing.T) { pid := c.Conn().PgConn().PID() - assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus) + assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus()) _, err = c.Exec(ctx, "begin") assert.NoError(t, err) - assert.Equal(t, byte('T'), c.Conn().PgConn().TxStatus) + assert.Equal(t, byte('T'), c.Conn().PgConn().TxStatus()) c.Release() waitForReleaseToComplete() @@ -412,7 +412,7 @@ func TestConnReleaseClosesConnInTransaction(t *testing.T) { require.NoError(t, err) assert.NotEqual(t, pid, c.Conn().PgConn().PID()) - assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus) + assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus()) c.Release() }