fix sqlbuilder testing

Author: free1139

sqlbuilder.go

@@ -68,7 +68,7 @@ func (b *SqlBuilder) AddIf(ok bool, key string, args ...interface{}) *SqlBuilder
 	return b.Add(key, args...)
 }
 
-func (b *SqlBuilder) In(in []interface{}) string {
+func (b *SqlBuilder) AddIn(in []interface{}) string {
 	if len(in) == 0 {
 		panic("need arguments of in condition")
 	}
@@ -103,5 +103,6 @@ func (b *SqlBuilder) Args() []interface{} {
 }
 
 func (b *SqlBuilder) Sql() []interface{} {
-	return append([]interface{}{b.String()}, b.args...)
+	result := []interface{}{b.String()}
+	return append(result, b.args...)
 }

sqlbuilder_test.go

@@ -1,7 +1,6 @@
 package qsql
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -14,22 +13,33 @@ func TestSqlBuilder(t *testing.T) {
 	bd.Add("WHERE")
 	bd.AddTab("1=1")
 	bd.AddIf(true, "AND (1=?)", 0)
-	bd.AddIf(true, "OR (tb1 IN ("+bd.In([]interface{}{1, 2})+"))")
+	bd.AddIf(true, "OR (tb1 IN ("+bd.AddIn([]interface{}{1, 2})+"))")
 	bd.Add("GROUP BY tb1.id")
 	bd.Add("HAVING count(*)>?", 1)
-	fmt.Println(bd)
+	if bd.String() !=
+		`SELECT count(*) FROM tmp tb1 INNER JOIN tmp1 tb2 ON tb2.id=tb2.tmp_id WHERE 1=1 AND (1=?) OR (tb1 IN (:2,:3)) GROUP BY tb1.id HAVING count(*)>?` {
+		t.Fatal(bd)
+	}
 
 	bd1 := bd.Copy()
 	bd1.Add("ORDER BY tb1.id DESC")
 	bd1.Add("OFFSET ?", 1)
 	bd1.Add("LIMIT ?", 1)
 	bd1.Select("tb1.id", "count(*)")
-	fmt.Println(bd1)
+	if bd1.String() !=
+		`SELECT tb1.id, count(*) FROM tmp tb1 INNER JOIN tmp1 tb2 ON tb2.id=tb2.tmp_id WHERE 1=1 AND (1=?) OR (tb1 IN (:2,:3)) GROUP BY tb1.id HAVING count(*)>? ORDER BY tb1.id DESC OFFSET ? LIMIT ?` {
+		t.Fatal(bd1)
+	}
 
 	bd2 := NewSqlBuilder(DRV_NAME_POSTGRES)
 	bd2.Select("*")
-	bd2.Add("FROM ("+bd.String()+") tmp", bd1.Args())
-	fmt.Println(bd2)
+	bd2.Add("FROM ("+bd.String()+") tmp", bd1.Args()...)
+	if bd2.String() !=
+		`SELECT * FROM (SELECT count(*) FROM tmp tb1 INNER JOIN tmp1 tb2 ON tb2.id=tb2.tmp_id WHERE 1=1 AND (1=?) OR (tb1 IN (:2,:3)) GROUP BY tb1.id HAVING count(*)>?) tmp` {
+		t.Fatal(bd2)
+	}
 
-	fmt.Println(bd2.Sql())
+	if len(bd2.Sql()) != 7 {
+		t.Fatal(bd2.Sql())
+	}
 }