Add Scopes tests

callbacks/delete.go

@@ -1,7 +1,6 @@
 package callbacks
 
 import (
-	"fmt"
 	"reflect"
 
 	"github.com/jinzhu/gorm"
@@ -38,7 +37,6 @@ func Delete(db *gorm.DB) {
 	if db.Statement.Schema != nil && !db.Statement.Unscoped {
 		for _, c := range db.Statement.Schema.DeleteClauses {
 			db.Statement.AddClause(c)
-			fmt.Println(db.Statement.SQL.String())
 		}
 	}
 

clause/expression.go

@@ -1,5 +1,7 @@
 package clause
 
+import "reflect"
+
 // Expression expression interface
 type Expression interface {
 	Build(builder Builder)
@@ -18,12 +20,36 @@ type Expr struct {
 
 // Build build raw expression
 func (expr Expr) Build(builder Builder) {
-	var idx int
+	var (
+		afterParenthesis bool
+		idx              int
+	)
+
 	for _, v := range []byte(expr.SQL) {
 		if v == '?' {
+			if afterParenthesis {
+				switch rv := reflect.ValueOf(expr.Vars[idx]); rv.Kind() {
+				case reflect.Slice, reflect.Array:
+					for i := 0; i < rv.Len(); i++ {
+						if i > 0 {
+							builder.WriteByte(',')
+						}
+						builder.AddVar(builder, rv.Index(i).Interface())
+					}
+				default:
 					builder.AddVar(builder, expr.Vars[idx])
+				}
+			} else {
+				builder.AddVar(builder, expr.Vars[idx])
+			}
+
 			idx++
 		} else {
+			if v == '(' {
+				afterParenthesis = true
+			} else {
+				afterParenthesis = false
+			}
 			builder.WriteByte(v)
 		}
 	}

tests/scopes_test.go

@@ -0,0 +1,48 @@
+package tests_test
+
+import (
+	"testing"
+
+	"github.com/jinzhu/gorm"
+	. "github.com/jinzhu/gorm/tests"
+)
+
+func NameIn1And2(d *gorm.DB) *gorm.DB {
+	return d.Where("name in (?)", []string{"ScopeUser1", "ScopeUser2"})
+}
+
+func NameIn2And3(d *gorm.DB) *gorm.DB {
+	return d.Where("name in (?)", []string{"ScopeUser2", "ScopeUser3"})
+}
+
+func NameIn(names []string) func(d *gorm.DB) *gorm.DB {
+	return func(d *gorm.DB) *gorm.DB {
+		return d.Where("name in (?)", names)
+	}
+}
+
+func TestScopes(t *testing.T) {
+	var users = []*User{
+		GetUser("ScopeUser1", Config{}),
+		GetUser("ScopeUser2", Config{}),
+		GetUser("ScopeUser3", Config{}),
+	}
+
+	DB.Create(&users)
+
+	var users1, users2, users3 []User
+	DB.Scopes(NameIn1And2).Find(&users1)
+	if len(users1) != 2 {
+		t.Errorf("Should found two users's name in 1, 2, but got %v", len(users1))
+	}
+
+	DB.Scopes(NameIn1And2, NameIn2And3).Find(&users2)
+	if len(users2) != 1 {
+		t.Errorf("Should found one user's name is 2, but got %v", len(users2))
+	}
+
+	DB.Scopes(NameIn([]string{users[0].Name, users[2].Name})).Find(&users3)
+	if len(users3) != 2 {
+		t.Errorf("Should found two users's name in 1, 3, but got %v", len(users3))
+	}
+}

tests/utils.go

@@ -87,7 +87,7 @@ func AssertEqual(t *testing.T, got, expect interface{}) {
 				format := "2006-01-02T15:04:05Z07:00"
 
 				if curTime.Round(time.Second).Format(format) != expect.(time.Time).Round(time.Second).Format(format) {
-					t.Errorf("%v: expect: %v, got %v", utils.FileWithLineNum(), expect.(time.Time).Round(time.Second).Format(format), curTime.Round(time.Second).Format(format))
+					t.Errorf("%v: expect: %v, got %v after time round", utils.FileWithLineNum(), expect.(time.Time).Round(time.Second).Format(format), curTime.Round(time.Second).Format(format))
 				}
 			} else if got != expect {
 				t.Errorf("%v: expect: %#v, got %#v", utils.FileWithLineNum(), expect, got)