feat: conditions not supporting composite in

dialect/feature/feature.go

@@ -31,4 +31,5 @@ const (
 	UpdateFromTable
 	MSSavepoint
 	GeneratedIdentity
+	CompositeIn // ... WHERE (A,B) IN ((N, NN), (N, NN)...)
 )

dialect/pgdialect/dialect.go

@@ -47,7 +47,8 @@ func New() *Dialect {
 		feature.TableNotExists |
 		feature.InsertOnConflict |
 		feature.SelectExists |
-		feature.GeneratedIdentity
+		feature.GeneratedIdentity |
+		feature.CompositeIn
 	return d
 }
 

dialect/sqlitedialect/dialect.go

@@ -38,7 +38,8 @@ func New() *Dialect {
 		feature.DeleteTableAlias |
 		feature.InsertOnConflict |
 		feature.TableNotExists |
-		feature.SelectExists
+		feature.SelectExists |
+		feature.CompositeIn
 	return d
 }
 

relation_join.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"reflect"
 
+	"github.com/uptrace/bun/dialect/feature"
 	"github.com/uptrace/bun/internal"
 	"github.com/uptrace/bun/schema"
 )
@@ -60,6 +61,14 @@ func (j *relationJoin) manyQuery(q *SelectQuery) *SelectQuery {
 	q = q.Model(hasManyModel)
 
 	var where []byte
+
+	if q.db.dialect.Features().Has(feature.CompositeIn) {
+		return j.manyQueryCompositeIn(where, q)
+	}
+	return j.manyQueryMulti(where, q)
+}
+
+func (j *relationJoin) manyQueryCompositeIn(where []byte, q *SelectQuery) *SelectQuery {
 	if len(j.Relation.JoinFields) > 1 {
 		where = append(where, '(')
 	}
@@ -88,6 +97,29 @@ func (j *relationJoin) manyQuery(q *SelectQuery) *SelectQuery {
 	return q
 }
 
+func (j *relationJoin) manyQueryMulti(where []byte, q *SelectQuery) *SelectQuery {
+	where = appendMultiValues(
+		q.db.Formatter(),
+		where,
+		j.JoinModel.rootValue(),
+		j.JoinModel.parentIndex(),
+		j.Relation.BaseFields,
+		j.Relation.JoinFields,
+		j.JoinModel.Table().SQLAlias,
+	)
+
+	q = q.Where(internal.String(where))
+
+	if j.Relation.PolymorphicField != nil {
+		q = q.Where("? = ?", j.Relation.PolymorphicField.SQLName, j.Relation.PolymorphicValue)
+	}
+
+	j.applyTo(q)
+	q = q.Apply(j.hasManyColumns)
+
+	return q
+}
+
 func (j *relationJoin) hasManyColumns(q *SelectQuery) *SelectQuery {
 	b := make([]byte, 0, 32)
 
@@ -312,3 +344,64 @@ func appendChildValues(
 	}
 	return b
 }
+
+func getColumns(table schema.Safe, fields []*schema.Field) [][]byte {
+	//Based upon query_base.appendColumns
+	var list [][]byte
+	for _, f := range fields {
+		b := []byte{}
+
+		if len(table) > 0 {
+			b = append(b, table...)
+			b = append(b, '.')
+		}
+		b = append(b, f.SQLName...)
+		list = append(list, b)
+	}
+	return list
+}
+
+func appendMultiValues(
+	fmter schema.Formatter, b []byte, v reflect.Value, index []int, baseFields, joinFields []*schema.Field, table schema.Safe,
+) []byte {
+	// This is a mix of appendChildValues and query_base.appendColumns
+	if len(joinFields) != len(baseFields) {
+		panic("asdfasdf")
+	}
+
+	// First get the columns
+	joins := getColumns(table, joinFields)
+	// Then values
+	b = append(b, '(')
+	seen := make(map[string]struct{})
+	walk(v, index, func(v reflect.Value) {
+		start := len(b)
+		for i, f := range baseFields {
+			if i > 0 {
+				b = append(b, " AND "...)
+			}
+			if len(baseFields) > 1 {
+				b = append(b, '(')
+			}
+			b = append(b, joins[i]...)
+			b = append(b, '=')
+			b = f.AppendValue(fmter, b, v)
+			if len(baseFields) > 1 {
+				b = append(b, ')')
+			}
+		}
+
+		b = append(b, ") OR ("...)
+
+		if _, ok := seen[string(b[start:])]; ok {
+			b = b[:start]
+		} else {
+			seen[string(b[start:])] = struct{}{}
+		}
+	})
+	if len(seen) > 0 {
+		b = b[:len(b)-6] // trim ") OR ("
+	}
+	b = append(b, ')')
+	return b
+}