gopkg/pgx
2
0
Fork 0
Code Activity

Prune methods that delegated to *pgconn.PgConn

Browse Source
This commit is contained in:
Jack Christensen
2019-04-25 14:25:16 -05:00
parent aed6b822d9
commit 00d123a944
4 changed files with 14 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pool/conn.go
+1 -1
View File
@@ -31,7 +31,7 @@ func (c *Conn) Release() {
return
}
if conn.TxStatus() != 'I' {
if conn.PgConn().TxStatus != 'I' {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
_, err := conn.Exec(ctx, "rollback")
cancel()
pool/pool_test.go
+11 -11
View File
@@ -100,19 +100,19 @@ func TestConnReleaseRollsBackFailedTransaction(t *testing.T) {
c, err := pool.Acquire(ctx)
require.NoError(t, err)
pid := c.Conn().PID()
pid := c.Conn().PgConn().PID()
assert.Equal(t, byte('I'), c.Conn().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().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().TxStatus())
assert.Equal(t, byte('E'), c.Conn().PgConn().TxStatus)
c.Release()
waitForReleaseToComplete()
@@ -120,8 +120,8 @@ func TestConnReleaseRollsBackFailedTransaction(t *testing.T) {
c, err = pool.Acquire(ctx)
require.NoError(t, err)
assert.Equal(t, pid, c.Conn().PID())
assert.Equal(t, byte('I'), c.Conn().TxStatus())
assert.Equal(t, pid, c.Conn().PgConn().PID())
assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus)
c.Release()
}
@@ -136,14 +136,14 @@ func TestConnReleaseRollsBackInTransaction(t *testing.T) {
c, err := pool.Acquire(ctx)
require.NoError(t, err)
pid := c.Conn().PID()
pid := c.Conn().PgConn().PID()
assert.Equal(t, byte('I'), c.Conn().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().TxStatus())
assert.Equal(t, byte('T'), c.Conn().PgConn().TxStatus)
c.Release()
waitForReleaseToComplete()
@@ -151,8 +151,8 @@ func TestConnReleaseRollsBackInTransaction(t *testing.T) {
c, err = pool.Acquire(ctx)
require.NoError(t, err)
assert.Equal(t, pid, c.Conn().PID())
assert.Equal(t, byte('I'), c.Conn().TxStatus())
assert.Equal(t, pid, c.Conn().PgConn().PID())
assert.Equal(t, byte('I'), c.Conn().PgConn().TxStatus)
c.Release()
}