fix: reuse tx for relation join (#366)

* fix: use Conn() instead of idb method
uptrace · Dec 19, 2021 · 60bdb1a · 60bdb1a
1 parent 95144dd
commit 60bdb1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/query_base.go b/query_base.go
@@ -37,10 +37,10 @@ var (
 	_ IConn = (*sql.Tx)(nil)
 	_ IConn = (*DB)(nil)
 	_ IConn = (*Conn)(nil)
-	_ IConn = (*Tx)(nil)
+	_ IConn = (Tx{})
 )
 
-// IDB is a common interface for *bun.DB, bun.Conn, and bun.Tx.
+// IDB is a common interface for *bun.DB, and bun.Tx.
 type IDB interface {
 	IConn
 	Dialect() schema.Dialect
@@ -60,9 +60,8 @@ type IDB interface {
 }
 
 var (
-	_ IConn = (*DB)(nil)
-	_ IConn = (*Conn)(nil)
-	_ IConn = (*Tx)(nil)
+	_ IDB = (*DB)(nil)
+	_ IDB = Tx{}
 )
 
 type baseQuery struct {

diff --git a/query_select.go b/query_select.go
@@ -344,9 +344,9 @@ func (q *SelectQuery) selectJoins(ctx context.Context, joins []relationJoin) err
 		case schema.HasOneRelation, schema.BelongsToRelation:
 			err = q.selectJoins(ctx, j.JoinModel.getJoins())
 		case schema.HasManyRelation:
-			err = j.selectMany(ctx, q.db.NewSelect())
+			err = j.selectMany(ctx, q.db.NewSelect().Conn(q.conn))
 		case schema.ManyToManyRelation:
-			err = j.selectM2M(ctx, q.db.NewSelect())
+			err = j.selectM2M(ctx, q.db.NewSelect().Conn(q.conn))
 		default:
 			panic("not reached")
 		}