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

dialect/sql/sqlgraph: add support for edge-schema in create-bulk

Browse Source
This commit is contained in:
Ariel Mashraki
2022-11-20 16:10:32 +02:00
committed by Ariel Mashraki
parent aa3d21f01a
commit f46dd7ace8
3 changed files with 74 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,6 +332,15 @@ type (
}
)
// FieldValues returns the values of additional fields that were set on the join-table.
func (e *EdgeTarget) FieldValues() []any {
vs := make([]any, len(e.Fields))
for i, f := range e.Fields {
vs[i] = f.Value
}
return vs
}
type (
// CreateSpec holds the information for creating
// a node in the graph.
@@ -372,7 +381,7 @@ type (
}
)
// SetField appends a new field setter to the create spec.
// SetField appends a new field setter to the creation spec.
func (u *CreateSpec) SetField(column string, t field.Type, value driver.Value) {
u.Fields = append(u.Fields, &FieldSpec{
Column: column,
@@ -1328,29 +1337,39 @@ func (g *graph) batchAddM2M(ctx context.Context, spec *BatchCreateSpec) error {
tables := make(map[string]*sql.InsertBuilder)
for _, node := range spec.Nodes {
edges := EdgeSpecs(node.Edges).FilterRel(M2M)
for t, edges := range edges.GroupTable() {
insert, ok := tables[t]
if !ok {
insert = g.builder.Insert(t).Columns(edges[0].Columns...)
if edges[0].Schema != "" {
// If the Schema field was provided to the EdgeSpec (by the
// generated code), it should be the same for all EdgeSpecs.
insert.Schema(edges[0].Schema)
}
}
tables[t] = insert
for name, edges := range edges.GroupTable() {
if len(edges) != 1 {
return fmt.Errorf("expect exactly 1 edge-spec per table, but got %d", len(edges))
}
edge := edges[0]
insert, ok := tables[name]
if !ok {
columns := edge.Columns
// Additional fields, such as edge-schema fields.
for _, f := range edge.Target.Fields {
columns = append(columns, f.Column)
}
insert = g.builder.Insert(name).Columns(columns...)
if edge.Schema != "" {
// If the Schema field was provided to the EdgeSpec (by the
// generated code), it should be the same for all EdgeSpecs.
insert.Schema(edge.Schema)
}
// Ignore conflicts only if edges do not contain extra fields, because these fields
// can hold different values on different insertions (e.g. time.Now() or uuid.New()).
if len(edge.Target.Fields) == 0 {
insert.OnConflict(sql.DoNothing())
}
}
tables[name] = insert
pk1, pk2 := []driver.Value{node.ID.Value}, edge.Target.Nodes
if edge.Inverse {
pk1, pk2 = pk2, pk1
}
for _, pair := range product(pk1, pk2) {
insert.Values(pair[0], pair[1])
insert.Values(append([]any{pair[0], pair[1]}, edge.Target.FieldValues()...)...)
if edge.Bidi {
insert.Values(pair[1], pair[0])
insert.Values(append([]any{pair[1], pair[0]}, edge.Target.FieldValues()...)...)
}
}
}

6
dialect/sql/sqlgraph/graph_test.go
View File

@@ -1454,15 +1454,15 @@ func TestBatchCreate(t *testing.T) {
WithArgs(false, 32, "a8m", 2, 30, "nati").
WillReturnResult(sqlmock.NewResult(10, 2))
// Insert M2M inverse-edges.
m.ExpectExec(escape("INSERT INTO `group_users` (`group_id`, `user_id`) VALUES (?, ?), (?, ?)")).
m.ExpectExec(escape("INSERT INTO `group_users` (`group_id`, `user_id`) VALUES (?, ?), (?, ?) ON DUPLICATE KEY UPDATE `group_id` = `group_users`.`group_id`, `user_id` = `group_users`.`user_id`")).
WithArgs(2, 10, 2, 11).
WillReturnResult(sqlmock.NewResult(2, 2))
// Insert M2M bidirectional edges.
m.ExpectExec(escape("INSERT INTO `user_friends` (`user_id`, `friend_id`) VALUES (?, ?), (?, ?), (?, ?), (?, ?)")).
m.ExpectExec(escape("INSERT INTO `user_friends` (`user_id`, `friend_id`) VALUES (?, ?), (?, ?), (?, ?), (?, ?) ON DUPLICATE KEY UPDATE `user_id` = `user_friends`.`user_id`, `friend_id` = `user_friends`.`friend_id`")).
WithArgs(10, 2, 2, 10, 11, 2, 2, 11).
WillReturnResult(sqlmock.NewResult(2, 2))
// Insert M2M edges.
m.ExpectExec(escape("INSERT INTO `user_products` (`user_id`, `product_id`) VALUES (?, ?), (?, ?)")).
m.ExpectExec(escape("INSERT INTO `user_products` (`user_id`, `product_id`) VALUES (?, ?), (?, ?) ON DUPLICATE KEY UPDATE `user_id` = `user_products`.`user_id`, `product_id` = `user_products`.`product_id`")).
WithArgs(10, 2, 11, 2).
WillReturnResult(sqlmock.NewResult(2, 2))
// Update FKs exist in different tables.