entc/gen: returns affected rows in delete

Summary: Pull Request resolved: https://github.com/facebookexternal/fbc/pull/1455

Reviewed By: alexsn

Differential Revision: D17396880

fbshipit-source-id: 3a3a9849b816777bd0ef94cf55b2291705a37df6

entc/integration/migrate/entv1/user_delete.go

@@ -21,32 +21,41 @@ type UserDelete struct {
 	predicates []predicate.User
 }
 
-// Where adds a new predicate for the builder.
+// Where adds a new predicate to the delete builder.
 func (ud *UserDelete) Where(ps ...predicate.User) *UserDelete {
 	ud.predicates = append(ud.predicates, ps...)
 	return ud
 }
 
-// Exec executes the deletion query.
-func (ud *UserDelete) Exec(ctx context.Context) error {
+// Exec executes the deletion query and returns how many vertices were deleted.
+func (ud *UserDelete) Exec(ctx context.Context) (int, error) {
 	return ud.sqlExec(ctx)
 }
 
 // ExecX is like Exec, but panics if an error occurs.
-func (ud *UserDelete) ExecX(ctx context.Context) {
-	if err := ud.Exec(ctx); err != nil {
+func (ud *UserDelete) ExecX(ctx context.Context) int {
+	n, err := ud.Exec(ctx)
+	if err != nil {
 		panic(err)
 	}
+	return n
 }
 
-func (ud *UserDelete) sqlExec(ctx context.Context) error {
+func (ud *UserDelete) sqlExec(ctx context.Context) (int, error) {
 	var res sql.Result
 	selector := sql.Select().From(sql.Table(user.Table))
 	for _, p := range ud.predicates {
 		p(selector)
 	}
 	query, args := sql.Delete(user.Table).FromSelect(selector).Query()
-	return ud.driver.Exec(ctx, query, args, &res)
+	if err := ud.driver.Exec(ctx, query, args, &res); err != nil {
+		return 0, err
+	}
+	affected, err := res.RowsAffected()
+	if err != nil {
+		return 0, err
+	}
+	return int(affected), nil
 }
 
 // UserDeleteOne is the builder for deleting a single User entity.
@@ -56,7 +65,15 @@ type UserDeleteOne struct {
 
 // Exec executes the deletion query.
 func (udo *UserDeleteOne) Exec(ctx context.Context) error {
-	return udo.ud.Exec(ctx)
+	n, err := udo.ud.Exec(ctx)
+	switch {
+	case err != nil:
+		return err
+	case n == 0:
+		return &ErrNotFound{user.Label}
+	default:
+		return nil
+	}
 }
 
 // ExecX is like Exec, but panics if an error occurs.

entc/integration/migrate/entv2/group_delete.go

@@ -21,32 +21,41 @@ type GroupDelete struct {
 	predicates []predicate.Group
 }
 
-// Where adds a new predicate for the builder.
+// Where adds a new predicate to the delete builder.
 func (gd *GroupDelete) Where(ps ...predicate.Group) *GroupDelete {
 	gd.predicates = append(gd.predicates, ps...)
 	return gd
 }
 
-// Exec executes the deletion query.
-func (gd *GroupDelete) Exec(ctx context.Context) error {
+// Exec executes the deletion query and returns how many vertices were deleted.
+func (gd *GroupDelete) Exec(ctx context.Context) (int, error) {
 	return gd.sqlExec(ctx)
 }
 
 // ExecX is like Exec, but panics if an error occurs.
-func (gd *GroupDelete) ExecX(ctx context.Context) {
-	if err := gd.Exec(ctx); err != nil {
+func (gd *GroupDelete) ExecX(ctx context.Context) int {
+	n, err := gd.Exec(ctx)
+	if err != nil {
 		panic(err)
 	}
+	return n
 }
 
-func (gd *GroupDelete) sqlExec(ctx context.Context) error {
+func (gd *GroupDelete) sqlExec(ctx context.Context) (int, error) {
 	var res sql.Result
 	selector := sql.Select().From(sql.Table(group.Table))
 	for _, p := range gd.predicates {
 		p(selector)
 	}
 	query, args := sql.Delete(group.Table).FromSelect(selector).Query()
-	return gd.driver.Exec(ctx, query, args, &res)
+	if err := gd.driver.Exec(ctx, query, args, &res); err != nil {
+		return 0, err
+	}
+	affected, err := res.RowsAffected()
+	if err != nil {
+		return 0, err
+	}
+	return int(affected), nil
 }
 
 // GroupDeleteOne is the builder for deleting a single Group entity.
@@ -56,7 +65,15 @@ type GroupDeleteOne struct {
 
 // Exec executes the deletion query.
 func (gdo *GroupDeleteOne) Exec(ctx context.Context) error {
-	return gdo.gd.Exec(ctx)
+	n, err := gdo.gd.Exec(ctx)
+	switch {
+	case err != nil:
+		return err
+	case n == 0:
+		return &ErrNotFound{group.Label}
+	default:
+		return nil
+	}
 }
 
 // ExecX is like Exec, but panics if an error occurs.

entc/integration/migrate/entv2/pet_delete.go

@@ -21,32 +21,41 @@ type PetDelete struct {
 	predicates []predicate.Pet
 }
 
-// Where adds a new predicate for the builder.
+// Where adds a new predicate to the delete builder.
 func (pd *PetDelete) Where(ps ...predicate.Pet) *PetDelete {
 	pd.predicates = append(pd.predicates, ps...)
 	return pd
 }
 
-// Exec executes the deletion query.
-func (pd *PetDelete) Exec(ctx context.Context) error {
+// Exec executes the deletion query and returns how many vertices were deleted.
+func (pd *PetDelete) Exec(ctx context.Context) (int, error) {
 	return pd.sqlExec(ctx)
 }
 
 // ExecX is like Exec, but panics if an error occurs.
-func (pd *PetDelete) ExecX(ctx context.Context) {
-	if err := pd.Exec(ctx); err != nil {
+func (pd *PetDelete) ExecX(ctx context.Context) int {
+	n, err := pd.Exec(ctx)
+	if err != nil {
 		panic(err)
 	}
+	return n
 }
 
-func (pd *PetDelete) sqlExec(ctx context.Context) error {
+func (pd *PetDelete) sqlExec(ctx context.Context) (int, error) {
 	var res sql.Result
 	selector := sql.Select().From(sql.Table(pet.Table))
 	for _, p := range pd.predicates {
 		p(selector)
 	}
 	query, args := sql.Delete(pet.Table).FromSelect(selector).Query()
-	return pd.driver.Exec(ctx, query, args, &res)
+	if err := pd.driver.Exec(ctx, query, args, &res); err != nil {
+		return 0, err
+	}
+	affected, err := res.RowsAffected()
+	if err != nil {
+		return 0, err
+	}
+	return int(affected), nil
 }
 
 // PetDeleteOne is the builder for deleting a single Pet entity.
@@ -56,7 +65,15 @@ type PetDeleteOne struct {
 
 // Exec executes the deletion query.
 func (pdo *PetDeleteOne) Exec(ctx context.Context) error {
-	return pdo.pd.Exec(ctx)
+	n, err := pdo.pd.Exec(ctx)
+	switch {
+	case err != nil:
+		return err
+	case n == 0:
+		return &ErrNotFound{pet.Label}
+	default:
+		return nil
+	}
 }
 
 // ExecX is like Exec, but panics if an error occurs.

entc/integration/migrate/entv2/user_delete.go

@@ -21,32 +21,41 @@ type UserDelete struct {
 	predicates []predicate.User
 }
 
-// Where adds a new predicate for the builder.
+// Where adds a new predicate to the delete builder.
 func (ud *UserDelete) Where(ps ...predicate.User) *UserDelete {
 	ud.predicates = append(ud.predicates, ps...)
 	return ud
 }
 
-// Exec executes the deletion query.
-func (ud *UserDelete) Exec(ctx context.Context) error {
+// Exec executes the deletion query and returns how many vertices were deleted.
+func (ud *UserDelete) Exec(ctx context.Context) (int, error) {
 	return ud.sqlExec(ctx)
 }
 
 // ExecX is like Exec, but panics if an error occurs.
-func (ud *UserDelete) ExecX(ctx context.Context) {
-	if err := ud.Exec(ctx); err != nil {
+func (ud *UserDelete) ExecX(ctx context.Context) int {
+	n, err := ud.Exec(ctx)
+	if err != nil {
 		panic(err)
 	}
+	return n
 }
 
-func (ud *UserDelete) sqlExec(ctx context.Context) error {
+func (ud *UserDelete) sqlExec(ctx context.Context) (int, error) {
 	var res sql.Result
 	selector := sql.Select().From(sql.Table(user.Table))
 	for _, p := range ud.predicates {
 		p(selector)
 	}
 	query, args := sql.Delete(user.Table).FromSelect(selector).Query()
-	return ud.driver.Exec(ctx, query, args, &res)
+	if err := ud.driver.Exec(ctx, query, args, &res); err != nil {
+		return 0, err
+	}
+	affected, err := res.RowsAffected()
+	if err != nil {
+		return 0, err
+	}
+	return int(affected), nil
 }
 
 // UserDeleteOne is the builder for deleting a single User entity.
@@ -56,7 +65,15 @@ type UserDeleteOne struct {
 
 // Exec executes the deletion query.
 func (udo *UserDeleteOne) Exec(ctx context.Context) error {
-	return udo.ud.Exec(ctx)
+	n, err := udo.ud.Exec(ctx)
+	switch {
+	case err != nil:
+		return err
+	case n == 0:
+		return &ErrNotFound{user.Label}
+	default:
+		return nil
+	}
 }
 
 // ExecX is like Exec, but panics if an error occurs.