添加Group 和 Having支持

Author: yumaojun03

sqlbuilder/builder.go

@@ -17,12 +17,15 @@ func NewQuery(querySQL string) *Query {
 
 // Query 查询mysql数据库
 type Query struct {
-	query     string
-	whereStmt []string
-	whereArgs []interface{}
-	limitStmt string
-	limitArgs []interface{}
-	order     string
+	query      string
+	whereStmt  []string
+	whereArgs  []interface{}
+	limitStmt  string
+	limitArgs  []interface{}
+	order      string
+	groupBy    string
+	havingStmt []string
+	havingArgs []interface{}
 }
 
 // Where 添加参数
@@ -39,7 +42,21 @@ func (q *Query) WithWhere(stmts []string, args []interface{}) *Query {
 	return q
 }
 
-// Limit 这周Limit
+// Having 添加参数
+func (q *Query) Having(stmt string, v ...interface{}) *Query {
+	q.havingStmt = append(q.havingStmt, stmt)
+	q.havingArgs = append(q.havingArgs, v...)
+	return q
+}
+
+// WithHaving 携带条件
+func (q *Query) WithHaving(stmts []string, args []interface{}) *Query {
+	q.havingStmt = append(q.havingStmt, stmts...)
+	q.havingArgs = append(q.havingArgs, args...)
+	return q
+}
+
+// Limit Limit
 func (q *Query) Limit(offset int64, limit uint) *Query {
 	q.limitStmt = "LIMIT ?,? "
 	q.limitArgs = append(q.limitArgs, offset, limit)
@@ -58,7 +75,17 @@ func (q *Query) Desc() *Query {
 	return q
 }
 
+// GroupBy todo
+func (q *Query) GroupBy(d string) *Query {
+	q.groupBy = fmt.Sprintf("GROUP BY %s ", strings.TrimSpace(d))
+	return q
+}
+
 func (q *Query) whereBuild() string {
+	if len(q.whereStmt) == 0 {
+		return ""
+	}
+
 	return "WHERE " + strings.Join(q.whereStmt, " AND ") + " "
 }
 
@@ -72,9 +99,27 @@ func (q *Query) WhereStmt() []string {
 	return q.whereStmt
 }
 
+func (q *Query) havingBuild() string {
+	if len(q.havingStmt) == 0 {
+		return ""
+	}
+
+	return "HAVING " + strings.Join(q.havingStmt, " AND ") + " "
+}
+
+// HavingArgs where 语句的参数
+func (q *Query) HavingArgs() []interface{} {
+	return q.havingArgs
+}
+
+// HavingStmt where条件列表
+func (q *Query) HavingStmt() []string {
+	return q.havingStmt
+}
+
 // Build 组件SQL
 func (q *Query) Build() (stmt string, args []interface{}) {
-	stmt = q.query + " " + q.whereBuild() + q.order + q.limitStmt + ";"
+	stmt = q.query + " " + q.whereBuild() + q.groupBy + q.havingBuild() + q.order + q.limitStmt + ";"
 
 	args = append(args, q.whereArgs...)
 	args = append(args, q.limitArgs...)

sqlbuilder/builder_test.go

@@ -10,8 +10,8 @@ import (
 func TestQueryBuild(t *testing.T) {
 	should := assert.New(t)
 	q := sqlbuilder.NewQuery("SELECT * FROM t")
-	qstmt, args := q.Where("t.a = ? AND t.c = ? AND t.d LIKE ?", "one", "two", "three").Order("t.create_at").Desc().Limit(0, 20).Build()
-	should.Equal(qstmt, "SELECT * FROM t WHERE t.a = ? AND t.c = ? AND t.d LIKE ? ORDER BY t.create_at DESC LIMIT ?,? ;")
+	qstmt, args := q.Where("t.a = ? AND t.c = ? AND t.d LIKE ?", "one", "two", "three").GroupBy("t.group").Having("MAX(t.salary) > ?", 10).Order("t.create_at").Desc().Limit(0, 20).Build()
+	should.Equal(qstmt, "SELECT * FROM t WHERE t.a = ? AND t.c = ? AND t.d LIKE ? GROUP BY t.group HAVING MAX(t.salary) > ? ORDER BY t.create_at DESC LIMIT ?,? ;")
 	should.Equal(args, []interface{}{"one", "two", "three", int64(0), uint(20)})
 	should.Equal(q.WhereStmt(), []string{"t.a = ? AND t.c = ? AND t.d LIKE ?"})
 	should.Equal(q.WhereArgs(), []interface{}{"one", "two", "three"})