diff --git a/entc/integration/integration_test.go b/entc/integration/integration_test.go index e0a4d4ce8..765e5a500 100644 --- a/entc/integration/integration_test.go +++ b/entc/integration/integration_test.go @@ -215,7 +215,7 @@ func Sanity(t *testing.T, client *ent.Client) { require.Equal("baz", usr.Name) require.NotEmpty(usr.QueryGroups().AllX(ctx)) // update unknown vertex. - _, err := client.User.UpdateOneID(usr.ID + math.MaxInt8).SetName("foo").Save(ctx) + err := client.User.UpdateOneID(usr.ID + math.MaxInt8).SetName("foo").Exec(ctx) require.Error(err) require.True(ent.IsNotFound(err)) @@ -648,7 +648,7 @@ func Relation(t *testing.T, client *ent.Client) { brat := client.User.Create().SetName("brat").SetAge(19).SetParent(usr).SaveX(ctx) require.Equal(2, usr.QueryChildren().CountX(ctx)) brat = client.User.UpdateOne(brat).ClearParent().SaveX(ctx) - _, err = client.User.UpdateOne(brat).ClearParent().Save(ctx) + err = client.User.UpdateOne(brat).ClearParent().Exec(ctx) require.NoError(err) require.False(brat.QueryParent().ExistX(ctx)) require.Equal(1, usr.QueryChildren().CountX(ctx)) @@ -684,21 +684,21 @@ func Relation(t *testing.T, client *ent.Client) { require.Nil(uid) t.Log("test validators") - _, err = client.Group.Create().SetInfo(info).SetType("a").SetName("Gituhb").SetExpire(time.Now().Add(time.Hour)).Save(ctx) + err = client.Group.Create().SetInfo(info).SetType("a").SetName("Gituhb").SetExpire(time.Now().Add(time.Hour)).Exec(ctx) require.Error(err, "type validator failed") - _, err = client.Group.Create().SetInfo(info).SetType("pass").SetName("failed").SetExpire(time.Now().Add(time.Hour)).Save(ctx) + err = client.Group.Create().SetInfo(info).SetType("pass").SetName("failed").SetExpire(time.Now().Add(time.Hour)).Exec(ctx) require.Error(err, "name validator failed") var checkerr schema.CheckError require.True(errors.As(err, &checkerr)) require.EqualError(err, "ent: validator failed for field \"name\": last name must begin with uppercase") require.EqualError(checkerr, "last name must begin with uppercase") - _, err = client.Group.Create().SetInfo(info).SetType("pass").SetName("Github20").SetExpire(time.Now().Add(time.Hour)).Save(ctx) + err = client.Group.Create().SetInfo(info).SetType("pass").SetName("Github20").SetExpire(time.Now().Add(time.Hour)).Exec(ctx) require.Error(err, "name validator failed") - _, err = client.Group.Create().SetInfo(info).SetType("pass").SetName("Github").SetMaxUsers(-1).SetExpire(time.Now().Add(time.Hour)).Save(ctx) + err = client.Group.Create().SetInfo(info).SetType("pass").SetName("Github").SetMaxUsers(-1).SetExpire(time.Now().Add(time.Hour)).Exec(ctx) require.Error(err, "max_users validator failed") - _, err = client.Group.Update().SetMaxUsers(-10).Save(ctx) + err = client.Group.Update().SetMaxUsers(-10).Exec(ctx) require.Error(err, "max_users validator failed") - _, err = client.Group.UpdateOne(grp).SetMaxUsers(-10).Save(ctx) + err = client.Group.UpdateOne(grp).SetMaxUsers(-10).Exec(ctx) require.Error(err, "max_users validator failed") _, err = client.Group.Query().Select("unknown_field").String(ctx) require.EqualError(err, "ent: invalid field \"unknown_field\" for query") @@ -992,42 +992,42 @@ func UniqueConstraint(t *testing.T, client *ent.Client) { bar := client.User.Create().SetAge(1).SetName("bar").SetNickname("bar").SetPhone("1").SaveX(ctx) t.Log("unique constraint violation on 2 fields") - _, err = client.User.Create().SetAge(1).SetName("baz").SetNickname("bar").SetPhone("1").Save(ctx) + err = client.User.Create().SetAge(1).SetName("baz").SetNickname("bar").SetPhone("1").Exec(ctx) require.True(ent.IsConstraintError(err)) - _, err = client.User.Create().SetAge(1).SetName("baz").SetNickname("qux").SetPhone("1").Save(ctx) + err = client.User.Create().SetAge(1).SetName("baz").SetNickname("qux").SetPhone("1").Exec(ctx) require.True(ent.IsConstraintError(err)) - _, err = client.User.Create().SetAge(1).SetName("baz").SetNickname("bar").SetPhone("2").Save(ctx) + err = client.User.Create().SetAge(1).SetName("baz").SetNickname("bar").SetPhone("2").Exec(ctx) require.True(ent.IsConstraintError(err)) - client.User.Create().SetAge(1).SetName("baz").SetNickname("qux").SetPhone("2").SaveX(ctx) - _, err = client.User.UpdateOne(foo).SetNickname("bar").SetPhone("1").Save(ctx) + client.User.Create().SetAge(1).SetName("baz").SetNickname("qux").SetPhone("2").ExecX(ctx) + err = client.User.UpdateOne(foo).SetNickname("bar").SetPhone("1").Exec(ctx) require.True(ent.IsConstraintError(err)) - _, err = client.User.UpdateOne(foo).SetNickname("bar").SetPhone("2").Save(ctx) + err = client.User.UpdateOne(foo).SetNickname("bar").SetPhone("2").Exec(ctx) require.True(ent.IsConstraintError(err)) t.Log("o2o unique constraint on creation") dan := client.User.Create().SetAge(1).SetName("dan").SetNickname("dan").SetSpouse(foo).SaveX(ctx) require.Equal(dan.Name, foo.QuerySpouse().OnlyX(ctx).Name) - _, err = client.User.Create().SetAge(1).SetName("b").SetSpouse(foo).Save(ctx) + err = client.User.Create().SetAge(1).SetName("b").SetSpouse(foo).Exec(ctx) require.True(ent.IsConstraintError(err)) t.Log("o2m/m2o unique constraint on creation") c1 := client.User.Create().SetAge(1).SetName("c1").SetNickname("c1").SetParent(foo).SaveX(ctx) c2 := client.User.Create().SetAge(1).SetName("c2").SetNickname("c2").SetParent(foo).SaveX(ctx) - _, err = client.User.Create().SetAge(10).SetName("z").SetNickname("z").AddChildren(c1).Save(ctx) + err = client.User.Create().SetAge(10).SetName("z").SetNickname("z").AddChildren(c1).Exec(ctx) require.True(ent.IsConstraintError(err), "c1 already has a parent") - _, err = client.User.Create().SetAge(10).SetName("z").SetNickname("z").AddChildren(c2).Save(ctx) + err = client.User.Create().SetAge(10).SetName("z").SetNickname("z").AddChildren(c2).Exec(ctx) require.True(ent.IsConstraintError(err), "c2 already has a parent") - _, err = client.User.Create().SetAge(10).SetName("z").SetNickname("z").AddChildren(c1, c2).Save(ctx) + err = client.User.Create().SetAge(10).SetName("z").SetNickname("z").AddChildren(c1, c2).Exec(ctx) require.True(ent.IsConstraintError(err)) inf := client.GroupInfo.Create().SetDesc("desc").SaveX(ctx) grp := client.Group.Create().SetName("Github").SetExpire(time.Now()).SetInfo(inf).SaveX(ctx) - _, err = client.GroupInfo.Create().SetDesc("desc").AddGroups(grp).Save(ctx) + err = client.GroupInfo.Create().SetDesc("desc").AddGroups(grp).Exec(ctx) require.True(ent.IsConstraintError(err)) p1 := client.Pet.Create().SetName("p1").SetOwner(foo).SaveX(ctx) p2 := client.Pet.Create().SetName("p2").SetOwner(foo).SaveX(ctx) - _, err = client.User.Create().SetAge(10).SetName("new-owner").AddPets(p1, p2).Save(ctx) + err = client.User.Create().SetAge(10).SetName("new-owner").AddPets(p1, p2).Exec(ctx) require.True(ent.IsConstraintError(err)) err = client.User.UpdateOne(c2).SetNickname(c1.Nickname).Exec(ctx) @@ -1045,9 +1045,9 @@ func UniqueConstraint(t *testing.T, client *ent.Client) { require.Equal(foo.Name, bar.QuerySpouse().OnlyX(ctx).Name) t.Log("o2m unique constraint on update") - _, err = client.User.UpdateOne(bar).SetAge(1).SetName("new-owner").AddPets(p1).Save(ctx) + err = client.User.UpdateOne(bar).SetAge(1).SetName("new-owner").AddPets(p1).Exec(ctx) require.True(ent.IsConstraintError(err)) - _, err = client.User.UpdateOne(bar).SetAge(1).SetName("new-owner").AddPets(p1, p2).Save(ctx) + err = client.User.UpdateOne(bar).SetAge(1).SetName("new-owner").AddPets(p1, p2).Exec(ctx) require.True(ent.IsConstraintError(err)) t.Log("unique constraint violation when updating more than 1 vertex") @@ -1060,11 +1060,11 @@ func UniqueConstraint(t *testing.T, client *ent.Client) { t.Log("unique constraint on numeric fields") cm1 := client.Comment.Create().SetUniqueInt(42).SetUniqueFloat(math.Pi).SaveX(ctx) - _, err = client.Comment.Create().SetUniqueInt(42).SetUniqueFloat(math.E).Save(ctx) + err = client.Comment.Create().SetUniqueInt(42).SetUniqueFloat(math.E).Exec(ctx) require.Error(err) - _, err = client.Comment.Create().SetUniqueInt(7).SetUniqueFloat(math.Pi).Save(ctx) + err = client.Comment.Create().SetUniqueInt(7).SetUniqueFloat(math.Pi).Exec(ctx) require.Error(err) - _ = client.Comment.Create().SetUniqueInt(7).SetUniqueFloat(math.E).SaveX(ctx) + client.Comment.Create().SetUniqueInt(7).SetUniqueFloat(math.E).ExecX(ctx) err = cm1.Update().SetUniqueInt(7).Exec(ctx) require.Error(err) err = cm1.Update().SetUniqueFloat(math.E).Exec(ctx) @@ -1140,7 +1140,7 @@ func Tx(t *testing.T, client *ent.Client) { m.On("onRollback", nil).Once() defer m.AssertExpectations(t) tx.OnRollback(m.rHook()) - _, err = tx.Item.Create().Save(ctx) + err = tx.Item.Create().Exec(ctx) require.Error(t, err) require.NoError(t, tx.Rollback()) }) @@ -1487,13 +1487,13 @@ func CreateBulk(t *testing.T, client *ent.Client) { func ConstraintChecks(t *testing.T, client *ent.Client) { var cerr *ent.ConstraintError - _, err := client.Pet.Create().SetName("orphan").SetOwnerID(0).Save(context.Background()) + err := client.Pet.Create().SetName("orphan").SetOwnerID(0).Exec(context.Background()) require.True(t, errors.As(err, &cerr)) require.True(t, sqlgraph.IsForeignKeyConstraintError(err)) require.False(t, sqlgraph.IsUniqueConstraintError(err)) client.FileType.Create().SetName("a unique name").SaveX(context.Background()) - _, err = client.FileType.Create().SetName("a unique name").Save(context.Background()) + err = client.FileType.Create().SetName("a unique name").Exec(context.Background()) require.True(t, errors.As(err, &cerr)) require.False(t, sqlgraph.IsForeignKeyConstraintError(err)) require.True(t, sqlgraph.IsUniqueConstraintError(err))