golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-04-28 13:40:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

dialect/sql/sqlgraph: use selector's column instead of table's column in HasNeighbors (#2060)

Browse Source 
Allows for HasNeighbors' selector to be a generic selector instead of *SelectTable.
A use case for this is doing HasNeighbors* function on materialized queries instead
of on concrete tables only.
This commit is contained in:
Andrey Elenskiy
2021-10-25 00:46:54 -04:00
committed by GitHub
parent a1f6de2793
commit 62d64f2b78
2 changed files with 82 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dialect/sql/sqlgraph/graph.go
View File

@@ -228,23 +228,20 @@ func HasNeighbors(q *sql.Selector, s *Step) {
if s.Edge.Inverse {
pk1 = s.Edge.Columns[1]
}
from := q.Table()
join := builder.Table(s.Edge.Table).Schema(s.Edge.Schema)
q.Where(
sql.In(
from.C(s.From.Column),
q.C(s.From.Column),
builder.Select(join.C(pk1)).From(join),
),
)
case r == M2O || (r == O2O && s.Edge.Inverse):
from := q.Table()
q.Where(sql.NotNull(from.C(s.Edge.Columns[0])))
q.Where(sql.NotNull(q.C(s.Edge.Columns[0])))
case r == O2M || (r == O2O && !s.Edge.Inverse):
from := q.Table()
to := builder.Table(s.Edge.Table).Schema(s.Edge.Schema)
q.Where(
sql.In(
from.C(s.From.Column),
q.C(s.From.Column),
builder.Select(to.C(s.Edge.Columns[0])).
From(to).
Where(sql.NotNull(to.C(s.Edge.Columns[0]))),
@@ -263,7 +260,6 @@ func HasNeighborsWith(q *sql.Selector, s *Step, pred func(*sql.Selector)) {
if s.Edge.Inverse {
pk1, pk2 = pk2, pk1
}
from := q.Table()
to := builder.Table(s.To.Table).Schema(s.To.Schema)
edge := builder.Table(s.Edge.Table).Schema(s.Edge.Schema)
join := builder.Select(edge.C(pk2)).
@@ -274,23 +270,21 @@ func HasNeighborsWith(q *sql.Selector, s *Step, pred func(*sql.Selector)) {
matches.WithContext(q.Context())
pred(matches)
join.FromSelect(matches)
q.Where(sql.In(from.C(s.From.Column), join))
q.Where(sql.In(q.C(s.From.Column), join))
case r == M2O || (r == O2O && s.Edge.Inverse):
from := q.Table()
to := builder.Table(s.To.Table).Schema(s.To.Schema)
matches := builder.Select(to.C(s.To.Column)).
From(to)
matches.WithContext(q.Context())
pred(matches)
q.Where(sql.In(from.C(s.Edge.Columns[0]), matches))
q.Where(sql.In(q.C(s.Edge.Columns[0]), matches))
case r == O2M || (r == O2O && !s.Edge.Inverse):
from := q.Table()
to := builder.Table(s.Edge.Table).Schema(s.Edge.Schema)
matches := builder.Select(to.C(s.Edge.Columns[0])).
From(to)
matches.WithContext(q.Context())
pred(matches)
q.Where(sql.In(from.C(s.From.Column), matches))
q.Where(sql.In(q.C(s.From.Column), matches))
}
}