add raw WhereClause support for condition (#11)

* add raw WhereClause support for condition

* rename Raw* to WhereClare to distinguish between sqlbuilder whereclause and raw sql

Author: litecy

condition/chain.go

@@ -165,3 +165,10 @@ func (c Chain) Join(option sqlbuilder.JoinOption, table string, onExpr ...string
 func (c Chain) Build() []Condition {
 	return c.conditions
 }
+
+func (c Chain) WhereClause(whereClause *sqlbuilder.WhereClause) Chain {
+	c.conditions = append(c.conditions, Condition{
+		WhereClause: whereClause,
+	})
+	return c
+}

condition/condition.go

@@ -61,6 +61,8 @@ type Condition struct {
 
 	// JoinCondition
 	JoinCondition
+
+	WhereClause *sqlbuilder.WhereClause
 }
 
 type JoinCondition struct {
@@ -116,6 +118,10 @@ func whereClause(conditions ...Condition) *sqlbuilder.WhereClause {
 		if c.Skip {
 			continue
 		}
+		if c.WhereClause != nil {
+			clause.AddWhereClause(c.WhereClause)
+			continue
+		}
 		if c.Or {
 			if c.OrValuesFunc != nil {
 				c.OrValues = c.OrValuesFunc()

condition/condition_test.go

@@ -135,3 +135,37 @@ func TestWhereClause(t *testing.T) {
 	fmt.Println(statement)
 	fmt.Println(args)
 }
+
+func TestRawWhereClause(t *testing.T) {
+	sqlbuilder.DefaultFlavor = sqlbuilder.MySQL
+
+	rawWhereClause := sqlbuilder.NewWhereClause()
+
+	cond := sqlbuilder.NewCond()
+	rawWhereClause.AddWhereExpr(cond.Args,
+		cond.Or(
+			cond.And(
+				cond.EQ("a", 1),
+				cond.EQ("b", 2),
+			),
+			cond.And(
+				cond.EQ("c", 3),
+				cond.EQ("d", 4),
+			),
+		))
+
+	cds := New(Condition{
+		WhereClause: rawWhereClause,
+	}, Condition{
+		Field:    "field_with_jzero",
+		Value:    123,
+		Operator: Equal,
+	})
+
+	sb := sqlbuilder.NewSelectBuilder().Select("name", "age", "height").From("user")
+	builder := Select(*sb, cds...)
+
+	sql, args := builder.Build()
+	fmt.Println(sql)
+	fmt.Println(args)
+}