entc/gen: move set-neighbors logic from codegen to sqlgraph

Summary: Pull Request resolved: https://github.com/facebookincubator/ent/pull/183

Reviewed By: alexsn

Differential Revision: D18644179

fbshipit-source-id: 2f2b0c03811a09c4c11240e5161187afbb2ac553
This commit is contained in:
Ariel Mashraki
2019-11-24 02:43:21 -08:00
committed by Facebook Github Bot
parent 1e49561634
commit c355ed49be
34 changed files with 659 additions and 659 deletions

View File

@@ -57,15 +57,17 @@ func (cq *CarQuery) Order(o ...Order) *CarQuery {
// QueryOwner chains the current query on the owner edge.
func (cq *CarQuery) QueryOwner() *UserQuery {
query := &UserQuery{config: cq.config}
builder := sql.Dialect(cq.driver.Dialect())
t1 := builder.Table(user.Table)
t2 := cq.sqlQuery()
t2.Select(t2.C(car.OwnerColumn))
query.sql = builder.Select(t1.Columns(user.Columns...)...).
From(t1).
Join(t2).
On(t1.C(user.FieldID), t2.C(car.OwnerColumn))
step := &sql.Step{}
step.From.V = cq.sqlQuery()
step.From.Table = car.Table
step.From.Column = car.FieldID
step.To.Table = user.Table
step.To.Column = user.FieldID
step.Edge.Rel = sql.M2O
step.Edge.Inverse = true
step.Edge.Table = car.OwnerTable
step.Edge.Columns = append(step.Edge.Columns, car.OwnerColumn)
query.sql = sql.SetNeighbors(cq.driver.Dialect(), step)
return query
}

View File

@@ -57,20 +57,17 @@ func (gq *GroupQuery) Order(o ...Order) *GroupQuery {
// QueryUsers chains the current query on the users edge.
func (gq *GroupQuery) QueryUsers() *UserQuery {
query := &UserQuery{config: gq.config}
builder := sql.Dialect(gq.driver.Dialect())
t1 := builder.Table(user.Table)
t2 := gq.sqlQuery()
t2.Select(t2.C(group.FieldID))
t3 := builder.Table(group.UsersTable)
t4 := builder.Select(t3.C(group.UsersPrimaryKey[1])).
From(t3).
Join(t2).
On(t3.C(group.UsersPrimaryKey[0]), t2.C(group.FieldID))
query.sql = builder.Select().
From(t1).
Join(t4).
On(t1.C(user.FieldID), t4.C(group.UsersPrimaryKey[1]))
step := &sql.Step{}
step.From.V = gq.sqlQuery()
step.From.Table = group.Table
step.From.Column = group.FieldID
step.To.Table = user.Table
step.To.Column = user.FieldID
step.Edge.Rel = sql.M2M
step.Edge.Inverse = false
step.Edge.Table = group.UsersTable
step.Edge.Columns = append(step.Edge.Columns, group.UsersPrimaryKey...)
query.sql = sql.SetNeighbors(gq.driver.Dialect(), step)
return query
}

View File

@@ -58,35 +58,34 @@ func (uq *UserQuery) Order(o ...Order) *UserQuery {
// QueryCars chains the current query on the cars edge.
func (uq *UserQuery) QueryCars() *CarQuery {
query := &CarQuery{config: uq.config}
builder := sql.Dialect(uq.driver.Dialect())
t1 := builder.Table(car.Table)
t2 := uq.sqlQuery()
t2.Select(t2.C(user.FieldID))
query.sql = builder.Select().
From(t1).
Join(t2).
On(t1.C(user.CarsColumn), t2.C(user.FieldID))
step := &sql.Step{}
step.From.V = uq.sqlQuery()
step.From.Table = user.Table
step.From.Column = user.FieldID
step.To.Table = car.Table
step.To.Column = car.FieldID
step.Edge.Rel = sql.O2M
step.Edge.Inverse = false
step.Edge.Table = user.CarsTable
step.Edge.Columns = append(step.Edge.Columns, user.CarsColumn)
query.sql = sql.SetNeighbors(uq.driver.Dialect(), step)
return query
}
// QueryGroups chains the current query on the groups edge.
func (uq *UserQuery) QueryGroups() *GroupQuery {
query := &GroupQuery{config: uq.config}
builder := sql.Dialect(uq.driver.Dialect())
t1 := builder.Table(group.Table)
t2 := uq.sqlQuery()
t2.Select(t2.C(user.FieldID))
t3 := builder.Table(user.GroupsTable)
t4 := builder.Select(t3.C(user.GroupsPrimaryKey[0])).
From(t3).
Join(t2).
On(t3.C(user.GroupsPrimaryKey[1]), t2.C(user.FieldID))
query.sql = builder.Select().
From(t1).
Join(t4).
On(t1.C(group.FieldID), t4.C(user.GroupsPrimaryKey[0]))
step := &sql.Step{}
step.From.V = uq.sqlQuery()
step.From.Table = user.Table
step.From.Column = user.FieldID
step.To.Table = group.Table
step.To.Column = group.FieldID
step.Edge.Rel = sql.M2M
step.Edge.Inverse = true
step.Edge.Table = user.GroupsTable
step.Edge.Columns = append(step.Edge.Columns, user.GroupsPrimaryKey...)
query.sql = sql.SetNeighbors(uq.driver.Dialect(), step)
return query
}