entc/gen: move node creation to sqlgraph

2026-05-24 09:31:56 +03:00 · 2019-12-16 16:55:20 +02:00
parent 5e9d13be97
commit c6800a3869
71 changed files with 2524 additions and 1838 deletions
--- a/entc/integration/customid/ent/blob_create.go
+++ b/entc/integration/customid/ent/blob_create.go
@@ -9,8 +9,9 @@ package ent
 import (
 	"context"

-	"github.com/facebookincubator/ent/dialect/sql"
+	"github.com/facebookincubator/ent/dialect/sql/sqlgraph"
 	"github.com/facebookincubator/ent/entc/integration/customid/ent/blob"
+	"github.com/facebookincubator/ent/schema/field"
 	"github.com/google/uuid"
 )

@@ -53,28 +54,31 @@ func (bc *BlobCreate) SaveX(ctx context.Context) *Blob {

 func (bc *BlobCreate) sqlSave(ctx context.Context) (*Blob, error) {
 	var (
-		builder = sql.Dialect(bc.driver.Dialect())
-		b       = &Blob{config: bc.config}
+		b    = &Blob{config: bc.config}
+		spec = &sqlgraph.CreateSpec{
+			Table: blob.Table,
+			ID: &sqlgraph.FieldSpec{
+				Type:   field.TypeUUID,
+				Column: blob.FieldID,
+			},
+		}
 	)
-	tx, err := bc.driver.Tx(ctx)
-	if err != nil {
-		return nil, err
+	if value := bc.id; value != nil {
+		b.ID = *value
+		spec.ID.Value = *value
 	}
-	insert := builder.Insert(blob.Table).Default()
 	if value := bc.uuid; value != nil {
-		insert.Set(blob.FieldUUID, *value)
+		spec.Fields = append(spec.Fields, &sqlgraph.FieldSpec{
+			Type:   field.TypeUUID,
+			Value:  *value,
+			Column: blob.FieldUUID,
+		})
 		b.UUID = *value
 	}
-	if value := bc.id; value != nil {
-		insert.Set(blob.FieldID, *value)
-		b.ID = *value
-	}
-
-	query, args := insert.Query()
-	if err := tx.Exec(ctx, query, args, new(sql.Result)); err != nil {
-		return nil, rollback(tx, err)
-	}
-	if err := tx.Commit(); err != nil {
+	if err := sqlgraph.CreateNode(ctx, bc.driver, spec); err != nil {
+		if cerr, ok := isSQLConstraintError(err); ok {
+			err = cerr
+		}
 		return nil, err
 	}
 	return b, nil
--- a/entc/integration/customid/ent/ent.go
+++ b/entc/integration/customid/ent/ent.go
@@ -13,6 +13,7 @@ import (

 	"github.com/facebookincubator/ent/dialect"
 	"github.com/facebookincubator/ent/dialect/sql"
+	"github.com/facebookincubator/ent/dialect/sql/sqlgraph"
 	"github.com/google/uuid"
 )

@@ -160,6 +161,9 @@ func isSQLConstraintError(err error) (*ErrConstraintFailed, bool) {
 			"duplicate key value violates unique constraint", // PostgreSQL.
 		}
 	)
+	if _, ok := err.(*sqlgraph.ConstraintError); ok {
+		return &ErrConstraintFailed{msg, err}, true
+	}
 	for i := range errors {
 		if strings.Contains(msg, errors[i]) {
 			return &ErrConstraintFailed{msg, err}, true
--- a/entc/integration/customid/ent/group_create.go
+++ b/entc/integration/customid/ent/group_create.go
@@ -9,8 +9,10 @@ package ent
 import (
 	"context"

-	"github.com/facebookincubator/ent/dialect/sql"
+	"github.com/facebookincubator/ent/dialect/sql/sqlgraph"
 	"github.com/facebookincubator/ent/entc/integration/customid/ent/group"
+	"github.com/facebookincubator/ent/entc/integration/customid/ent/user"
+	"github.com/facebookincubator/ent/schema/field"
 )

 // GroupCreate is the builder for creating a Group entity.
@@ -62,39 +64,47 @@ func (gc *GroupCreate) SaveX(ctx context.Context) *Group {

 func (gc *GroupCreate) sqlSave(ctx context.Context) (*Group, error) {
 	var (
-		res     sql.Result
-		builder = sql.Dialect(gc.driver.Dialect())
-		gr      = &Group{config: gc.config}
-	)
-	tx, err := gc.driver.Tx(ctx)
-	if err != nil {
-		return nil, err
-	}
-	insert := builder.Insert(group.Table).Default()
-	if value := gc.id; value != nil {
-		insert.Set(group.FieldID, *value)
-		gr.ID = *value
-	}
-
-	id, err := insertLastID(ctx, tx, insert.Returning(group.FieldID))
-	if err != nil {
-		return nil, rollback(tx, err)
-	}
-	gr.ID = int(id)
-	if len(gc.users) > 0 {
-		for eid := range gc.users {
-
-			query, args := builder.Insert(group.UsersTable).
-				Columns(group.UsersPrimaryKey[0], group.UsersPrimaryKey[1]).
-				Values(id, eid).
-				Query()
-			if err := tx.Exec(ctx, query, args, &res); err != nil {
-				return nil, rollback(tx, err)
-			}
+		gr   = &Group{config: gc.config}
+		spec = &sqlgraph.CreateSpec{
+			Table: group.Table,
+			ID: &sqlgraph.FieldSpec{
+				Type:   field.TypeInt,
+				Column: group.FieldID,
+			},
 		}
+	)
+	if value := gc.id; value != nil {
+		gr.ID = *value
+		spec.ID.Value = *value
 	}
-	if err := tx.Commit(); err != nil {
+	if nodes := gc.users; len(nodes) > 0 {
+		edge := &sqlgraph.EdgeSpec{
+			Rel:     sqlgraph.M2M,
+			Inverse: false,
+			Table:   group.UsersTable,
+			Columns: group.UsersPrimaryKey,
+			Bidi:    false,
+			Target: &sqlgraph.EdgeTarget{
+				IDSpec: &sqlgraph.FieldSpec{
+					Type:   field.TypeInt,
+					Column: user.FieldID,
+				},
+			},
+		}
+		for k, _ := range nodes {
+			edge.Target.Nodes = append(edge.Target.Nodes, k)
+		}
+		spec.Edges = append(spec.Edges, edge)
+	}
+	if err := sqlgraph.CreateNode(ctx, gc.driver, spec); err != nil {
+		if cerr, ok := isSQLConstraintError(err); ok {
+			err = cerr
+		}
 		return nil, err
 	}
+	if gr.ID == 0 {
+		id := spec.ID.Value.(int64)
+		gr.ID = int(id)
+	}
 	return gr, nil
 }
--- a/entc/integration/customid/ent/user_create.go
+++ b/entc/integration/customid/ent/user_create.go
@@ -9,8 +9,10 @@ package ent
 import (
 	"context"

-	"github.com/facebookincubator/ent/dialect/sql"
+	"github.com/facebookincubator/ent/dialect/sql/sqlgraph"
+	"github.com/facebookincubator/ent/entc/integration/customid/ent/group"
 	"github.com/facebookincubator/ent/entc/integration/customid/ent/user"
+	"github.com/facebookincubator/ent/schema/field"
 )

 // UserCreate is the builder for creating a User entity.
@@ -62,39 +64,47 @@ func (uc *UserCreate) SaveX(ctx context.Context) *User {

 func (uc *UserCreate) sqlSave(ctx context.Context) (*User, error) {
 	var (
-		res     sql.Result
-		builder = sql.Dialect(uc.driver.Dialect())
-		u       = &User{config: uc.config}
-	)
-	tx, err := uc.driver.Tx(ctx)
-	if err != nil {
-		return nil, err
-	}
-	insert := builder.Insert(user.Table).Default()
-	if value := uc.id; value != nil {
-		insert.Set(user.FieldID, *value)
-		u.ID = *value
-	}
-
-	id, err := insertLastID(ctx, tx, insert.Returning(user.FieldID))
-	if err != nil {
-		return nil, rollback(tx, err)
-	}
-	u.ID = int(id)
-	if len(uc.groups) > 0 {
-		for eid := range uc.groups {
-
-			query, args := builder.Insert(user.GroupsTable).
-				Columns(user.GroupsPrimaryKey[1], user.GroupsPrimaryKey[0]).
-				Values(id, eid).
-				Query()
-			if err := tx.Exec(ctx, query, args, &res); err != nil {
-				return nil, rollback(tx, err)
-			}
+		u    = &User{config: uc.config}
+		spec = &sqlgraph.CreateSpec{
+			Table: user.Table,
+			ID: &sqlgraph.FieldSpec{
+				Type:   field.TypeInt,
+				Column: user.FieldID,
+			},
 		}
+	)
+	if value := uc.id; value != nil {
+		u.ID = *value
+		spec.ID.Value = *value
 	}
-	if err := tx.Commit(); err != nil {
+	if nodes := uc.groups; len(nodes) > 0 {
+		edge := &sqlgraph.EdgeSpec{
+			Rel:     sqlgraph.M2M,
+			Inverse: true,
+			Table:   user.GroupsTable,
+			Columns: user.GroupsPrimaryKey,
+			Bidi:    false,
+			Target: &sqlgraph.EdgeTarget{
+				IDSpec: &sqlgraph.FieldSpec{
+					Type:   field.TypeInt,
+					Column: group.FieldID,
+				},
+			},
+		}
+		for k, _ := range nodes {
+			edge.Target.Nodes = append(edge.Target.Nodes, k)
+		}
+		spec.Edges = append(spec.Edges, edge)
+	}
+	if err := sqlgraph.CreateNode(ctx, uc.driver, spec); err != nil {
+		if cerr, ok := isSQLConstraintError(err); ok {
+			err = cerr
+		}
 		return nil, err
 	}
+	if u.ID == 0 {
+		id := spec.ID.Value.(int64)
+		u.ID = int(id)
+	}
 	return u, nil
 }