delete all only accepts query chain (#53)

* delete all only accepts query chain

* remove unnecessary close before return

Author: Fs02

docs/instrumentation.md

@@ -1,6 +1,6 @@
 # Instrumentation
 
-REL provides hooks that can be used to log or instrument your queries. It can be used for the this operations:
+REL provides hooks that can be used to log or instrument your queries. This is the list for available operations:
 
 - `rel-aggregate`
 - `rel-count`

docs/query.go

@@ -34,7 +34,6 @@ func Iteration(ctx context.Context, repo rel.Repository) error {
 			}
 
 			// handle error
-			iter.Close()
 			return err
 		}
 

reltest/delete_all.go

@@ -16,17 +16,17 @@ func (eda *DeleteAll) Unsafe() {
 }
 
 // ExpectDeleteAll to be called with given field and queries.
-func ExpectDeleteAll(r *Repository, queriers []rel.Querier) *DeleteAll {
+func ExpectDeleteAll(r *Repository, query rel.Query) *DeleteAll {
 	eda := &DeleteAll{
 		Expect: newExpect(r, "DeleteAll",
-			[]interface{}{queriers},
+			[]interface{}{query},
 			[]interface{}{nil},
 		),
 	}
 
 	// validation
 	eda.Run(func(args mock.Arguments) {
-		query := rel.Build("", args[0].([]rel.Querier)...)
+		query := args[0].(rel.Query)
 
 		if query.Table == "" {
 			panic("reltest: cannot call DeleteAll without specifying table name. use rel.From(tableName)")

reltest/delete_all_test.go

@@ -44,12 +44,13 @@ func TestDeleteAll_error(t *testing.T) {
 
 func TestDeleteAll_noTable(t *testing.T) {
 	var (
-		repo = New()
+		repo  = New()
+		query = rel.Where(where.Eq("id", 1))
 	)
 
-	repo.ExpectDeleteAll()
+	repo.ExpectDeleteAll(query)
 	assert.Panics(t, func() {
-		repo.MustDeleteAll(context.TODO())
+		repo.MustDeleteAll(context.TODO(), query)
 	})
 	repo.AssertExpectations(t)
 }

reltest/repository.go

@@ -213,19 +213,19 @@ func (r *Repository) ExpectDelete() *Delete {
 	return ExpectDelete(r)
 }
 
-// DeleteAll provides a mock function with given fields: queriers
-func (r *Repository) DeleteAll(ctx context.Context, queriers ...rel.Querier) error {
-	return r.mock.Called(queriers).Error(0)
+// DeleteAll provides a mock function with given fields: query
+func (r *Repository) DeleteAll(ctx context.Context, query rel.Query) error {
+	return r.mock.Called(query).Error(0)
 }
 
-// MustDeleteAll provides a mock function with given fields: queriers
-func (r *Repository) MustDeleteAll(ctx context.Context, queriers ...rel.Querier) {
-	must(r.DeleteAll(ctx, queriers...))
+// MustDeleteAll provides a mock function with given fields: query
+func (r *Repository) MustDeleteAll(ctx context.Context, query rel.Query) {
+	must(r.DeleteAll(ctx, query))
 }
 
 // ExpectDeleteAll apply mocks and expectations for DeleteAll
-func (r *Repository) ExpectDeleteAll(queriers ...rel.Querier) *DeleteAll {
-	return ExpectDeleteAll(r, queriers)
+func (r *Repository) ExpectDeleteAll(query rel.Query) *DeleteAll {
+	return ExpectDeleteAll(r, query)
 }
 
 // Preload provides a mock function with given fields: records, field, queriers

repository.go

@@ -33,8 +33,8 @@ type Repository interface {
 	MustUpdate(ctx context.Context, record interface{}, modifiers ...Modifier)
 	Delete(ctx context.Context, record interface{}) error
 	MustDelete(ctx context.Context, record interface{})
-	DeleteAll(ctx context.Context, queriers ...Querier) error
-	MustDeleteAll(ctx context.Context, queriers ...Querier)
+	DeleteAll(ctx context.Context, query Query) error
+	MustDeleteAll(ctx context.Context, query Query)
 	Preload(ctx context.Context, records interface{}, field string, queriers ...Querier) error
 	MustPreload(ctx context.Context, records interface{}, field string, queriers ...Querier)
 	Transaction(ctx context.Context, fn func(Repository) error) error
@@ -664,19 +664,15 @@ func (r repository) MustDelete(ctx context.Context, record interface{}) {
 	must(r.Delete(ctx, record))
 }
 
-func (r repository) DeleteAll(ctx context.Context, queriers ...Querier) error {
+func (r repository) DeleteAll(ctx context.Context, query Query) error {
 	finish := r.instrument(ctx, "rel-delete-all", "deleting multiple records")
 	defer finish(nil)
 
-	var (
-		q = Build("", queriers...)
-	)
-
-	return r.deleteAll(ctx, Invalid, q)
+	return r.deleteAll(ctx, Invalid, query)
 }
 
-func (r repository) MustDeleteAll(ctx context.Context, queriers ...Querier) {
-	must(r.DeleteAll(ctx, queriers...))
+func (r repository) MustDeleteAll(ctx context.Context, query Query) {
+	must(r.DeleteAll(ctx, query))
 }
 
 func (r repository) deleteAll(ctx context.Context, flag DocumentFlag, query Query) error {