2
0

Only have a single Begin transaction method

This commit is contained in:
Jack Christensen
2019-04-24 13:35:27 -05:00
parent 1b8f0016e9
commit 2263521f70
9 changed files with 35 additions and 42 deletions
+2 -2
View File
@@ -61,8 +61,8 @@ func (c *Conn) QueryRow(ctx context.Context, sql string, args ...interface{}) pg
return c.Conn().QueryRow(ctx, sql, args...)
}
func (c *Conn) Begin() (*pgx.Tx, error) {
return c.Conn().Begin()
func (c *Conn) Begin(ctx context.Context, txOptions *pgx.TxOptions) (*pgx.Tx, error) {
return c.Conn().Begin(ctx, txOptions)
}
func (c *Conn) Conn() *pgx.Conn {
+3 -3
View File
@@ -127,13 +127,13 @@ func (p *Pool) QueryRow(ctx context.Context, sql string, args ...interface{}) pg
return &poolRow{r: row, c: c}
}
func (p *Pool) Begin() (*Tx, error) {
c, err := p.Acquire(context.Background())
func (p *Pool) Begin(ctx context.Context, txOptions *pgx.TxOptions) (*Tx, error) {
c, err := p.Acquire(ctx)
if err != nil {
return nil, err
}
t, err := c.Begin()
t, err := c.Begin(ctx, txOptions)
if err != nil {
return nil, err
}
+3 -3
View File
@@ -14,7 +14,7 @@ func TestTxExec(t *testing.T) {
require.NoError(t, err)
defer pool.Close()
tx, err := pool.Begin()
tx, err := pool.Begin(context.Background(), nil)
require.NoError(t, err)
defer tx.Rollback(context.Background())
@@ -26,7 +26,7 @@ func TestTxQuery(t *testing.T) {
require.NoError(t, err)
defer pool.Close()
tx, err := pool.Begin()
tx, err := pool.Begin(context.Background(), nil)
require.NoError(t, err)
defer tx.Rollback(context.Background())
@@ -38,7 +38,7 @@ func TestTxQueryRow(t *testing.T) {
require.NoError(t, err)
defer pool.Close()
tx, err := pool.Begin()
tx, err := pool.Begin(context.Background(), nil)
require.NoError(t, err)
defer tx.Rollback(context.Background())