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

examples/o2m2types/ent/client.go

@@ -130,6 +130,20 @@ func (c *PetClient) Query() *PetQuery {
 	return &PetQuery{config: c.config}
 }
 
+// Get returns a Pet entity by its id.
+func (c *PetClient) Get(ctx context.Context, id int) (*Pet, error) {
+	return c.Query().Where(pet.ID(id)).Only(ctx)
+}
+
+// GetX is like Get, but panics if an error occurs.
+func (c *PetClient) GetX(ctx context.Context, id int) *Pet {
+	pe, err := c.Get(ctx, id)
+	if err != nil {
+		panic(err)
+	}
+	return pe
+}
+
 // QueryOwner queries the owner edge of a Pet.
 func (c *PetClient) QueryOwner(pe *Pet) *UserQuery {
 	query := &UserQuery{config: c.config}
@@ -193,6 +207,20 @@ func (c *UserClient) Query() *UserQuery {
 	return &UserQuery{config: c.config}
 }
 
+// Get returns a User entity by its id.
+func (c *UserClient) Get(ctx context.Context, id int) (*User, error) {
+	return c.Query().Where(user.ID(id)).Only(ctx)
+}
+
+// GetX is like Get, but panics if an error occurs.
+func (c *UserClient) GetX(ctx context.Context, id int) *User {
+	u, err := c.Get(ctx, id)
+	if err != nil {
+		panic(err)
+	}
+	return u
+}
+
 // QueryPets queries the pets edge of a User.
 func (c *UserClient) QueryPets(u *User) *PetQuery {
 	query := &PetQuery{config: c.config}

examples/o2m2types/ent/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.

examples/o2m2types/ent/pet_query.go

@@ -68,20 +68,6 @@ func (pq *PetQuery) QueryOwner() *UserQuery {
 	return query
 }
 
-// Get returns a Pet entity by its id.
-func (pq *PetQuery) Get(ctx context.Context, id int) (*Pet, error) {
-	return pq.Where(pet.ID(id)).Only(ctx)
-}
-
-// GetX is like Get, but panics if an error occurs.
-func (pq *PetQuery) GetX(ctx context.Context, id int) *Pet {
-	pe, err := pq.Get(ctx, id)
-	if err != nil {
-		panic(err)
-	}
-	return pe
-}
-
 // First returns the first Pet entity in the query. Returns *ErrNotFound when no pet was found.
 func (pq *PetQuery) First(ctx context.Context) (*Pet, error) {
 	pes, err := pq.Limit(1).All(ctx)

examples/o2m2types/ent/pet_update.go

@@ -129,9 +129,9 @@ func (pu *PetUpdate) sqlSave(ctx context.Context) (n int, err error) {
 		res     sql.Result
 		builder = sql.Update(pet.Table).Where(sql.InInts(pet.FieldID, ids...))
 	)
-	if pu.name != nil {
+	if value := pu.name; value != nil {
 		update = true
-		builder.Set(pet.FieldName, *pu.name)
+		builder.Set(pet.FieldName, *value)
 	}
 	if update {
 		query, args := builder.Query()
@@ -273,10 +273,10 @@ func (puo *PetUpdateOne) sqlSave(ctx context.Context) (pe *Pet, err error) {
 		res     sql.Result
 		builder = sql.Update(pet.Table).Where(sql.InInts(pet.FieldID, ids...))
 	)
-	if puo.name != nil {
+	if value := puo.name; value != nil {
 		update = true
-		builder.Set(pet.FieldName, *puo.name)
-		pe.Name = *puo.name
+		builder.Set(pet.FieldName, *value)
+		pe.Name = *value
 	}
 	if update {
 		query, args := builder.Query()

examples/o2m2types/ent/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.

examples/o2m2types/ent/user_query.go

@@ -68,20 +68,6 @@ func (uq *UserQuery) QueryPets() *PetQuery {
 	return query
 }
 
-// Get returns a User entity by its id.
-func (uq *UserQuery) Get(ctx context.Context, id int) (*User, error) {
-	return uq.Where(user.ID(id)).Only(ctx)
-}
-
-// GetX is like Get, but panics if an error occurs.
-func (uq *UserQuery) GetX(ctx context.Context, id int) *User {
-	u, err := uq.Get(ctx, id)
-	if err != nil {
-		panic(err)
-	}
-	return u
-}
-
 // First returns the first User entity in the query. Returns *ErrNotFound when no user was found.
 func (uq *UserQuery) First(ctx context.Context) (*User, error) {
 	us, err := uq.Limit(1).All(ctx)

examples/o2m2types/ent/user_update.go

@@ -21,6 +21,7 @@ import (
 type UserUpdate struct {
 	config
 	age         *int
+	addage      *int
 	name        *string
 	pets        map[int]struct{}
 	removedPets map[int]struct{}
@@ -39,6 +40,12 @@ func (uu *UserUpdate) SetAge(i int) *UserUpdate {
 	return uu
 }
 
+// AddAge adds i to age.
+func (uu *UserUpdate) AddAge(i int) *UserUpdate {
+	uu.addage = &i
+	return uu
+}
+
 // SetName sets the name field.
 func (uu *UserUpdate) SetName(s string) *UserUpdate {
 	uu.name = &s
@@ -144,13 +151,17 @@ func (uu *UserUpdate) sqlSave(ctx context.Context) (n int, err error) {
 		res     sql.Result
 		builder = sql.Update(user.Table).Where(sql.InInts(user.FieldID, ids...))
 	)
-	if uu.age != nil {
+	if value := uu.age; value != nil {
 		update = true
-		builder.Set(user.FieldAge, *uu.age)
+		builder.Set(user.FieldAge, *value)
 	}
-	if uu.name != nil {
+	if value := uu.addage; value != nil {
 		update = true
-		builder.Set(user.FieldName, *uu.name)
+		builder.Add(user.FieldAge, *value)
+	}
+	if value := uu.name; value != nil {
+		update = true
+		builder.Set(user.FieldName, *value)
 	}
 	if update {
 		query, args := builder.Query()
@@ -205,6 +216,7 @@ type UserUpdateOne struct {
 	config
 	id          int
 	age         *int
+	addage      *int
 	name        *string
 	pets        map[int]struct{}
 	removedPets map[int]struct{}
@@ -216,6 +228,12 @@ func (uuo *UserUpdateOne) SetAge(i int) *UserUpdateOne {
 	return uuo
 }
 
+// AddAge adds i to age.
+func (uuo *UserUpdateOne) AddAge(i int) *UserUpdateOne {
+	uuo.addage = &i
+	return uuo
+}
+
 // SetName sets the name field.
 func (uuo *UserUpdateOne) SetName(s string) *UserUpdateOne {
 	uuo.name = &s
@@ -324,15 +342,20 @@ func (uuo *UserUpdateOne) sqlSave(ctx context.Context) (u *User, err error) {
 		res     sql.Result
 		builder = sql.Update(user.Table).Where(sql.InInts(user.FieldID, ids...))
 	)
-	if uuo.age != nil {
+	if value := uuo.age; value != nil {
 		update = true
-		builder.Set(user.FieldAge, *uuo.age)
-		u.Age = *uuo.age
+		builder.Set(user.FieldAge, *value)
+		u.Age = *value
 	}
-	if uuo.name != nil {
+	if value := uuo.addage; value != nil {
 		update = true
-		builder.Set(user.FieldName, *uuo.name)
-		u.Name = *uuo.name
+		builder.Add(user.FieldAge, *value)
+		u.Age += *value
+	}
+	if value := uuo.name; value != nil {
+		update = true
+		builder.Set(user.FieldName, *value)
+		u.Name = *value
 	}
 	if update {
 		query, args := builder.Query()