orm支持distinct

Author: c-wind

orm/orm.go

@@ -178,11 +178,25 @@ func (s *Stmt) SQLColumn(rt reflect.Type, table string) string {
 		case reflect.Slice:
 			continue
 		}
+
+		attr := ""
 		name := f.Tag.Get("db")
+
+		if kv := strings.Split(name, ","); len(kv) == 2 {
+			name = kv[0]
+			attr = kv[1]
+		}
+
 		if name == "" {
 			name = str.FieldEscape(f.Name)
 		}
-		if !strings.Contains(name, ".") {
+
+		switch attr {
+		case "distinct":
+			bs.WriteString("distinct ")
+		}
+
+		if !strings.Contains(name, ".") && !strings.Contains(name, "(") {
 			fmt.Fprintf(bs, "%s.", table)
 		}
 		fmt.Fprintf(bs, "%s, ", name)

orm/orm_test.go

@@ -10,6 +10,24 @@ import (
 	"gopkg.in/DATA-DOG/go-sqlmock.v1"
 )
 
+func TestORMStructDistinct(t *testing.T) {
+	expect := "select userinfo.id, distinct userinfo.user, avg(age), sum(size), userinfo.password from userinfo limit 1"
+	result := struct {
+		ID       int64
+		User     string `db:"user,distinct"`
+		Age      int    `db:"avg(age)"`
+		Size     int    `db:"sum(size)"`
+		Password string
+	}{}
+	sql, err := NewStmt(nil, "userinfo").SQLQueryBuilder(&result)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+	if sql != expect {
+		t.Fatalf("expect:%s,\n recv:%s.", expect, sql)
+	}
+}
+
 func TestORMStruct(t *testing.T) {
 	expect := "select userinfo.id, userinfo.user, userinfo.password from userinfo limit 1"
 	result := struct {