fix: scan error uptrace#709

calorie · May 27, 2023 · ff2dcb7 · ff2dcb7
1 parent dacffd2
commit ff2dcb7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/internal/dbtest/orm_test.go b/internal/dbtest/orm_test.go
@@ -56,7 +56,9 @@ func testBookRelations(t *testing.T, db *bun.DB) {
 		Relation("Author.Avatar").
 		Relation("Editor").
 		Relation("Editor.Avatar").
-		Relation("Genres").
+		Relation("Genres", func(q *bun.SelectQuery) *bun.SelectQuery {
+			return q.Column("id", "name", "genre__rating")
+		}).
 		Relation("Comments").
 		Relation("Translations", func(q *bun.SelectQuery) *bun.SelectQuery {
 			return q.Order("id")

diff --git a/relation_join.go b/relation_join.go
@@ -178,7 +178,12 @@ func (j *relationJoin) m2mQuery(q *SelectQuery) *SelectQuery {
 	baseTable := j.BaseModel.Table()
 
 	if j.Relation.M2MTable != nil {
-		q = q.ColumnExpr(string(j.Relation.M2MTable.SQLAlias) + ".*")
+		for _, f := range j.Relation.M2MBaseFields {
+			q = q.ColumnExpr(string(j.Relation.M2MTable.SQLAlias) + "." + string(f.SQLName))
+		}
+		for _, f := range j.Relation.M2MJoinFields {
+			q = q.ColumnExpr(string(j.Relation.M2MTable.SQLAlias) + "." + string(f.SQLName))
+		}
 	}
 
 	//nolint