Merge pull request #576 from kiwih/master

Add basic support for multiple HAVING clauses.

scope_private.go

@@ -265,10 +265,24 @@ func (scope *Scope) groupSql() string {
 }
 
 func (scope *Scope) havingSql() string {
-	if scope.Search.havingCondition == nil {
+	if scope.Search.havingConditions == nil {
 		return ""
 	}
-	return " HAVING " + scope.buildWhereCondition(scope.Search.havingCondition)
+
+	var andConditions []string
+
+	for _, clause := range scope.Search.havingConditions {
+		if sql := scope.buildWhereCondition(clause); sql != "" {
+			andConditions = append(andConditions, sql)
+		}
+	}
+
+	combinedSql := strings.Join(andConditions, " AND ")
+	if len(combinedSql) == 0 {
+		return ""
+	}
+
+	return " HAVING " + combinedSql
 }
 
 func (scope *Scope) joinsSql() string {

search.go

@@ -3,24 +3,24 @@ package gorm
 import "fmt"
 
 type search struct {
-	db              *DB
-	whereConditions []map[string]interface{}
-	orConditions    []map[string]interface{}
-	notConditions   []map[string]interface{}
-	havingCondition map[string]interface{}
-	initAttrs       []interface{}
-	assignAttrs     []interface{}
-	selects         map[string]interface{}
-	omits           []string
-	orders          []string
-	joins           string
-	preload         []searchPreload
-	offset          string
-	limit           string
-	group           string
-	tableName       string
-	raw             bool
-	Unscoped        bool
+	db               *DB
+	whereConditions  []map[string]interface{}
+	orConditions     []map[string]interface{}
+	notConditions    []map[string]interface{}
+	havingConditions []map[string]interface{}
+	initAttrs        []interface{}
+	assignAttrs      []interface{}
+	selects          map[string]interface{}
+	omits            []string
+	orders           []string
+	joins            string
+	preload          []searchPreload
+	offset           string
+	limit            string
+	group            string
+	tableName        string
+	raw              bool
+	Unscoped         bool
 }
 
 type searchPreload struct {
@@ -93,7 +93,7 @@ func (s *search) Group(query string) *search {
 }
 
 func (s *search) Having(query string, values ...interface{}) *search {
-	s.havingCondition = map[string]interface{}{"query": query, "args": values}
+	s.havingConditions = append(s.havingConditions, map[string]interface{}{"query": query, "args": values})
 	return s
 }