fix test problems

golobby · Mar 9, 2022 · 0ea025a · 0ea025a
1 parent 84438a7
commit 0ea025a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/orm.go b/orm.go
@@ -248,12 +248,11 @@ func Update(obj Entity) error {
 func Delete(obj Entity) error {
 	s := getSchemaFor(obj)
 
-	q, args, err := NewQueryBuilder[Entity]().SetDialect(s.dialect).Table(s.Table).Where(s.pkName(), genericGetPKValue(obj)).Delete().ToSql()
+	query, args, err := NewQueryBuilder[Entity]().SetDialect(s.dialect).Table(s.Table).Where(s.pkName(), genericGetPKValue(obj)).SetDelete().ToSql()
 	if err != nil {
 		return err
 	}
-
-	_, err = getSchemaFor(obj).getSQLDB().Exec(q, args...)
+	_, err = getSchemaFor(obj).getSQLDB().Exec(query, args...)
 	return err
 }
 

diff --git a/orm_test.go b/orm_test.go
@@ -401,8 +401,9 @@ func TestExec(t *testing.T) {
 		assert.NoError(t, orm.Save(&Post{
 			Body: "first post",
 		}))
-
-		_, affected, err := orm.Exec[Post](orm.NewQueryBuilder[Post]().Where("id", 1).Delete())
+		res, err := orm.Query[Post]().Where("id", 1).Delete()
+		assert.NoError(t, err)
+		affected, err := res.RowsAffected()
 		assert.NoError(t, err)
 		assert.EqualValues(t, 1, affected)
 	})

diff --git a/query_test.go b/query_test.go
@@ -116,14 +116,14 @@ func TestUpdate(t *testing.T) {
 }
 func TestDelete(t *testing.T) {
 	t.Run("delete without whereClause", func(t *testing.T) {
-		d := NewQueryBuilder[Dummy]().Table("users").Delete()
+		d := NewQueryBuilder[Dummy]().Table("users").SetDelete()
 		sql, args, err := d.ToSql()
 		assert.NoError(t, err)
 		assert.Equal(t, `DELETE FROM users`, sql)
 		assert.Empty(t, args)
 	})
 	t.Run("delete with whereClause", func(t *testing.T) {
-		d := NewQueryBuilder[Dummy]().Table("users").SetDialect(Dialects.MySQL).Where("created_at", ">", "2012-01-10").Delete()
+		d := NewQueryBuilder[Dummy]().Table("users").SetDialect(Dialects.MySQL).Where("created_at", ">", "2012-01-10").SetDelete()
 		sql, args, err := d.ToSql()
 		assert.NoError(t, err)
 		assert.Equal(t, `DELETE FROM users WHERE created_at > ?`, sql)