添加with where

Author: yumaojun03

sqlbuilder/builder.go

@@ -26,20 +26,30 @@ type Query struct {
 }
 
 // Where 添加参数
-func (q *Query) Where(stmt string, v ...interface{}) {
+func (q *Query) Where(stmt string, v ...interface{}) *Query {
 	q.whereStmt = append(q.whereStmt, stmt)
 	q.whereArgs = append(q.whereArgs, v...)
+	return q
+}
+
+// WithWhere 携带条件
+func (q *Query) WithWhere(stmts []string, args []interface{}) *Query {
+	q.whereStmt = append(q.whereStmt, stmts...)
+	q.whereArgs = append(q.whereArgs, args...)
+	return q
 }
 
 // Limit 这周Limit
-func (q *Query) Limit(offset int64, limit uint) {
+func (q *Query) Limit(offset int64, limit uint) *Query {
 	q.limitStmt = "LIMIT ?,? "
 	q.limitArgs = append(q.limitArgs, offset, limit)
+	return q
 }
 
 // Desc todo
-func (q *Query) Desc(d string) {
+func (q *Query) Desc(d string) *Query {
 	q.desc = fmt.Sprintf("ORDER BY %s DESC ", d)
+	return q
 }
 
 func (q *Query) whereBuild() string {

sqlbuilder/builder_test.go

@@ -10,12 +10,13 @@ import (
 func TestQueryBuild(t *testing.T) {
 	should := assert.New(t)
 	q := sqlbuilder.NewQuery("SELECT * FROM t")
-	q.Where("t.a = ? AND t.c = ? AND t.d LIKE ?", "one", "two", "three")
-	q.Desc("t.create_at")
-	q.Limit(0, 20)
-	stmt, args := q.Build()
-	should.Equal(stmt, "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").Desc("t.create_at").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 ?,? ;")
 	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"})
+
+	c := sqlbuilder.NewQuery("SELECT COUNT(*) FROM t")
+	cstmt, args := c.WithWhere(q.WhereStmt(), q.WhereArgs()).Build()
+	should.Equal(cstmt, "SELECT COUNT(*) FROM t WHERE t.a = ? AND t.c = ? AND t.d LIKE ? ;")
 }