From 19d82ab62c3e96a5d7839e89fa7ebd29fd7bbb23 Mon Sep 17 00:00:00 2001
From: Pelle Johnsen <pelle.johnsen@gmail.com>
Date: Wed, 22 Jul 2015 18:12:57 +0200
Subject: [PATCH 1/2] Fix #1274: Add QuerySeter.Distinct()

---
 orm/db.go           |  6 +++++-
 orm/orm_queryset.go | 37 ++++++++++++++++++++++---------------
 orm/types.go        |  1 +
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/orm/db.go b/orm/db.go
index 20dc80f2..cefd5dfc 100644
--- a/orm/db.go
+++ b/orm/db.go
@@ -814,7 +814,11 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi
 		}
 	}
 
-	query := fmt.Sprintf("SELECT %s FROM %s%s%s T0 %s%s%s%s", sels, Q, mi.table, Q, join, where, orderBy, limit)
+	sqlSelect := "SELECT"
+	if qs.distinct {
+		sqlSelect += " DISTINCT"
+	}
+	query := fmt.Sprintf("%s %s FROM %s%s%s T0 %s%s%s%s", sqlSelect, sels, Q, mi.table, Q, join, where, orderBy, limit)
 
 	d.ins.ReplaceMarks(&query)
 
diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go
index 5cc47617..106b62e5 100644
--- a/orm/orm_queryset.go
+++ b/orm/orm_queryset.go
@@ -61,6 +61,7 @@ type querySet struct {
 	limit    int64
 	offset   int64
 	orders   []string
+	distinct bool
 	orm      *orm
 }
 
@@ -112,24 +113,30 @@ func (o querySet) OrderBy(exprs ...string) QuerySeter {
 	return &o
 }
 
+// add DISTINCT to SELECT
+func (o querySet) Distinct() QuerySeter {
+	o.distinct = true
+	return &o
+}
+
 // set relation model to query together.
 // it will query relation models and assign to parent model.
 func (o querySet) RelatedSel(params ...interface{}) QuerySeter {
-    if len(params) == 0 {
-        o.relDepth = DefaultRelsDepth
-    } else {
-        for _, p := range params {
-            switch val := p.(type) {
-            case string:
-                o.related = append(o.related, val)
-            case int:
-                o.relDepth = val
-            default:
-                panic(fmt.Errorf("<QuerySeter.RelatedSel> wrong param kind: %v", val))
-            }
-        }
-    }
-    return &o
+	if len(params) == 0 {
+		o.relDepth = DefaultRelsDepth
+	} else {
+		for _, p := range params {
+			switch val := p.(type) {
+			case string:
+				o.related = append(o.related, val)
+			case int:
+				o.relDepth = val
+			default:
+				panic(fmt.Errorf("<QuerySeter.RelatedSel> wrong param kind: %v", val))
+			}
+		}
+	}
+	return &o
 }
 
 // set condition to QuerySeter.
diff --git a/orm/types.go b/orm/types.go
index b46be4fc..4347e46f 100644
--- a/orm/types.go
+++ b/orm/types.go
@@ -67,6 +67,7 @@ type QuerySeter interface {
 	Limit(interface{}, ...interface{}) QuerySeter
 	Offset(interface{}) QuerySeter
 	OrderBy(...string) QuerySeter
+	Distinct() QuerySeter
 	RelatedSel(...interface{}) QuerySeter
 	Count() (int64, error)
 	Exist() bool

From 0c33673197f1ecdba5a77418798565db9e68a378 Mon Sep 17 00:00:00 2001
From: Pelle Johnsen <pelle.johnsen@gmail.com>
Date: Mon, 24 Aug 2015 09:41:10 +0200
Subject: [PATCH 2/2] Revert spaces > tabs change

---
 orm/orm_queryset.go | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go
index 106b62e5..ea236964 100644
--- a/orm/orm_queryset.go
+++ b/orm/orm_queryset.go
@@ -122,21 +122,21 @@ func (o querySet) Distinct() QuerySeter {
 // set relation model to query together.
 // it will query relation models and assign to parent model.
 func (o querySet) RelatedSel(params ...interface{}) QuerySeter {
-	if len(params) == 0 {
-		o.relDepth = DefaultRelsDepth
-	} else {
-		for _, p := range params {
-			switch val := p.(type) {
-			case string:
-				o.related = append(o.related, val)
-			case int:
-				o.relDepth = val
-			default:
-				panic(fmt.Errorf("<QuerySeter.RelatedSel> wrong param kind: %v", val))
-			}
-		}
-	}
-	return &o
+    if len(params) == 0 {
+        o.relDepth = DefaultRelsDepth
+    } else {
+        for _, p := range params {
+            switch val := p.(type) {
+            case string:
+                o.related = append(o.related, val)
+            case int:
+                o.relDepth = val
+            default:
+                panic(fmt.Errorf("<QuerySeter.RelatedSel> wrong param kind: %v", val))
+            }
+        }
+    }
+    return &o
 }
 
 // set condition to QuerySeter.