GOMODULES/pgx
1
0
Fork 0
mirror of https://github.com/jackc/pgx.git synced 2025-05-31 11:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update pgxpool for latest pgconn

Browse Source
This commit is contained in:
Jack Christensen 2019-08-27 18:29:14 -05:00
parent 8170eaf401
commit ddd9cf451e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pgxpool/conn.go
View File

@ -27,7 +27,7 @@ func (c *Conn) Release() {
c.res = nil c.res = nil
now := time.Now() 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() res.Destroy()
return return
} }

14
pgxpool/pool_test.go
View File

@ -360,17 +360,17 @@ func TestConnReleaseClosesConnInFailedTransaction(t *testing.T) {
pid := c.Conn().PgConn().PID() 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") _, err = c.Exec(ctx, "begin")
assert.NoError(t, err) 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") _, err = c.Exec(ctx, "selct")
assert.Error(t, err) assert.Error(t, err)
assert.Equal(t, byte('E'), c.Conn().PgConn().TxStatus) assert.Equal(t, byte('E'), c.Conn().PgConn().TxStatus())
c.Release() c.Release()
waitForReleaseToComplete() waitForReleaseToComplete()
@ -379,7 +379,7 @@ func TestConnReleaseClosesConnInFailedTransaction(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
assert.NotEqual(t, pid, c.Conn().PgConn().PID()) 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() c.Release()
} }
@ -398,12 +398,12 @@ func TestConnReleaseClosesConnInTransaction(t *testing.T) {
pid := c.Conn().PgConn().PID() 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") _, err = c.Exec(ctx, "begin")
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, byte('T'), c.Conn().PgConn().TxStatus) assert.Equal(t, byte('T'), c.Conn().PgConn().TxStatus())
c.Release() c.Release()
waitForReleaseToComplete() waitForReleaseToComplete()
@ -412,7 +412,7 @@ func TestConnReleaseClosesConnInTransaction(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
assert.NotEqual(t, pid, c.Conn().PgConn().PID()) 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() c.Release()
} }