Renaming Remove() into Delete().

db.go

@@ -446,9 +446,9 @@ type Result interface {
 	// or columns.
 	Group(...interface{}) Result
 
-	// Remove deletes all items within the result set. `Offset()` and `Limit()` are
-	// not honoured by `Remove()`.
-	Remove() error
+	// Delete deletes all items within the result set. `Offset()` and `Limit()` are
+	// not honoured by `Delete()`.
+	Delete() error
 
 	// Update modifies all items within the result set. `Offset()` and `Limit()`
 	// are not honoured by `Update()`.

db_test.go

@@ -638,7 +638,7 @@ func TestSimpleCRUD(t *testing.T) {
 				t.Fatalf("Struct is different with wrapper %s.", wrapper)
 			}
 
-			err = res.Remove()
+			err = res.Delete()
 
 			if err != nil {
 				t.Fatalf(`Could not remove with wrapper %s: %q`, wrapper, err)
@@ -806,7 +806,7 @@ func TestFibonacci(t *testing.T) {
 				}
 			}
 
-			if err = res.Remove(); err != nil {
+			if err = res.Delete(); err != nil {
 				t.Fatalf(`%s: %q`, wrapper, err)
 			}
 
@@ -974,7 +974,7 @@ func TestEven(t *testing.T) {
 				}
 			}
 
-			if err = res.Remove(); err != nil {
+			if err = res.Delete(); err != nil {
 				t.Fatalf(`Could not remove with wrapper %s: %q`, wrapper, err)
 			}
 

internal/sqladapter/result.go

@@ -115,8 +115,8 @@ func (r *Result) Next(dst interface{}) (err error) {
 	return nil
 }
 
-// Remove deletes all matching items from the collection.
-func (r *Result) Remove() error {
+// Delete deletes all matching items from the collection.
+func (r *Result) Delete() error {
 	q := r.b.DeleteFrom(r.table).
 		Where(filter(r.conds)...).
 		Limit(r.limit)

internal/sqladapter/testing/adapter.go.tpl

@@ -775,7 +775,7 @@ func TestGroup(t *testing.T) {
 	assert.Equal(t, 5, len(results))
 }
 
-func TestRemove(t *testing.T) {
+func TestDelete(t *testing.T) {
 	sess := mustOpen()
 	defer sess.Close()
 
@@ -786,7 +786,7 @@ func TestRemove(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, uint64(4), total)
 
-	err = res.Remove()
+	err = res.Delete()
 	assert.NoError(t, err)
 
 	total, err = res.Count()

internal/sqladapter/testing/adapter_benchmark.go.tpl

@@ -233,8 +233,8 @@ func BenchmarkUpperUpdate(b *testing.B) {
 	}
 }
 
-// BenchmarkUpperRemove benchmarks
-func BenchmarkUpperRemove(b *testing.B) {
+// BenchmarkUpperDelete benchmarks
+func BenchmarkUpperDelete(b *testing.B) {
 	sess, err := connectAndAddFakeRows()
 	if err != nil {
 		b.Fatal(err)
@@ -246,7 +246,7 @@ func BenchmarkUpperRemove(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		res := artist.Find(db.Cond{"name": artistN(i)})
-		if err = res.Remove(); err != nil {
+		if err = res.Delete(); err != nil {
 			b.Fatal(err)
 		}
 	}

mongo/benchmark_test.go

@@ -310,8 +310,8 @@ func BenchmarkMgoDelete(b *testing.B) {
 	}
 }
 
-// BenchmarkUpperRemove benchmarks
-func BenchmarkUpperRemove(b *testing.B) {
+// BenchmarkUpperDelete benchmarks
+func BenchmarkUpperDelete(b *testing.B) {
 	var err error
 	var sess db.Database
 
@@ -326,7 +326,7 @@ func BenchmarkUpperRemove(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		res := artist.Find(db.Cond{"name": artistN(i)})
-		if err = res.Remove(); err != nil {
+		if err = res.Delete(); err != nil {
 			b.Fatal(err)
 		}
 	}

mongo/database_test.go

@@ -762,7 +762,7 @@ func TestOperators(t *testing.T) {
 }
 
 // This test tries to remove some previously added rows.
-func TestRemove(t *testing.T) {
+func TestDelete(t *testing.T) {
 
 	var err error
 
@@ -795,7 +795,7 @@ func TestRemove(t *testing.T) {
 	res = artist.Find(db.Cond{"_id": first.ID})
 
 	// Trying to remove the row.
-	err = res.Remove()
+	err = res.Delete()
 
 	if err != nil {
 		t.Fatal(err)

mongo/result.go

@@ -177,8 +177,8 @@ func (r *result) Next(dst interface{}) error {
 	return nil
 }
 
-// Remove deletes the matching items from the collection.
-func (r *result) Remove() (err error) {
+// Delete remove the matching items from the collection.
+func (r *result) Delete() (err error) {
 	if db.Debug {
 		var start, end int64
 		start = time.Now().UnixNano()