add more join tests (go-xorm#23)

Author: lunny

builder_select_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestBuilderSelect(t *testing.T) {
+func TestBuilder_Select(t *testing.T) {
 	sql, args, err := Select("c, d").From("table1").ToSQL()
 	assert.NoError(t, err)
 	fmt.Println(sql, args)
@@ -23,7 +23,30 @@ func TestBuilderSelect(t *testing.T) {
 	sql, args, err = Select("c, d").From("table1").LeftJoin("table2", Eq{"table1.id": 1}.And(Lt{"table2.id": 3})).
 		RightJoin("table3", "table2.id = table3.tid").Where(Eq{"a": 1}).ToSQL()
 	assert.NoError(t, err)
-	fmt.Println(sql, args)
+	assert.EqualValues(t, "SELECT c, d FROM table1 LEFT JOIN table2 ON table1.id=? AND table2.id<? RIGHT JOIN table3 ON table2.id = table3.tid WHERE a=?",
+		sql)
+	assert.EqualValues(t, []interface{}{1, 3, 1}, args)
+
+	sql, args, err = Select("c, d").From("table1").LeftJoin("table2", Eq{"table1.id": 1}.And(Lt{"table2.id": 3})).
+		FullJoin("table3", "table2.id = table3.tid").Where(Eq{"a": 1}).ToSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "SELECT c, d FROM table1 LEFT JOIN table2 ON table1.id=? AND table2.id<? FULL JOIN table3 ON table2.id = table3.tid WHERE a=?",
+		sql)
+	assert.EqualValues(t, []interface{}{1, 3, 1}, args)
+
+	sql, args, err = Select("c, d").From("table1").LeftJoin("table2", Eq{"table1.id": 1}.And(Lt{"table2.id": 3})).
+		CrossJoin("table3", "table2.id = table3.tid").Where(Eq{"a": 1}).ToSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "SELECT c, d FROM table1 LEFT JOIN table2 ON table1.id=? AND table2.id<? CROSS JOIN table3 ON table2.id = table3.tid WHERE a=?",
+		sql)
+	assert.EqualValues(t, []interface{}{1, 3, 1}, args)
+
+	sql, args, err = Select("c, d").From("table1").LeftJoin("table2", Eq{"table1.id": 1}.And(Lt{"table2.id": 3})).
+		InnerJoin("table3", "table2.id = table3.tid").Where(Eq{"a": 1}).ToSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "SELECT c, d FROM table1 LEFT JOIN table2 ON table1.id=? AND table2.id<? INNER JOIN table3 ON table2.id = table3.tid WHERE a=?",
+		sql)
+	assert.EqualValues(t, []interface{}{1, 3, 1}, args)
 }
 
 func TestBuilderSelectGroupBy(t *testing.T) {

builder_test.go

@@ -451,6 +451,13 @@ func TestExprCond(t *testing.T) {
 	b := Select("id").From("table1").Where(expr{sql: "a=? OR b=?", args: []interface{}{1, 2}}).Where(Or(Eq{"c": 3}, Eq{"d": 4}))
 	sql, args, err := b.ToSQL()
 	assert.NoError(t, err)
+	assert.EqualValues(t, "table1", b.TableName())
 	assert.EqualValues(t, "SELECT id FROM table1 WHERE (a=? OR b=?) AND (c=? OR d=?)", sql)
 	assert.EqualValues(t, []interface{}{1, 2, 3, 4}, args)
 }
+
+func TestBuilderToBindedSQL(t *testing.T) {
+	newSQL, err := Select("id").From("table").Where(In("a", 1, 2)).ToBindedSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "SELECT id FROM table WHERE a IN (1,2)", newSQL)
+}

sql.go

@@ -92,8 +92,8 @@ func noSQLQuoteNeeded(a interface{}) bool {
 // ConvertToBindedSQL will convert SQL and args to a binded SQL
 func ConvertToBindedSQL(sql string, args []interface{}) (string, error) {
 	buf := StringBuilder{}
-	var j, start = 0, 0
-	for i := 0; i < len(sql); i++ {
+	var i, j, start int
+	for ; i < len(sql); i++ {
 		if sql[i] == '?' {
 			_, err := buf.WriteString(sql[start:i])
 			if err != nil {
@@ -116,14 +116,18 @@ func ConvertToBindedSQL(sql string, args []interface{}) (string, error) {
 			j = j + 1
 		}
 	}
+	_, err := buf.WriteString(sql[start:])
+	if err != nil {
+		return "", err
+	}
 	return buf.String(), nil
 }
 
 // ConvertPlaceholder replaces ? to $1, $2 ... or :1, :2 ... according prefix
 func ConvertPlaceholder(sql, prefix string) (string, error) {
 	buf := StringBuilder{}
-	var j, start = 0, 0
-	for i := 0; i < len(sql); i++ {
+	var i, j, start int
+	for ; i < len(sql); i++ {
 		if sql[i] == '?' {
 			_, err := buf.WriteString(sql[start:i])
 			if err != nil {
@@ -143,5 +147,9 @@ func ConvertPlaceholder(sql, prefix string) (string, error) {
 			}
 		}
 	}
+	_, err := buf.WriteString(sql[start:])
+	if err != nil {
+		return "", err
+	}
 	return buf.String(), nil
 }

sql_test.go

@@ -35,6 +35,10 @@ func TestBindedSQLConverter(t *testing.T) {
 	assert.Error(t, err)
 	assert.EqualValues(t, ErrNeedMoreArguments, err)
 
+	newSQL, err = ToBindedSQL(Select("id").From("table").Where(In("a", 1, 2)))
+	assert.NoError(t, err)
+	assert.EqualValues(t, "SELECT id FROM table WHERE a IN (1,2)", newSQL)
+
 	newSQL, err = ToBindedSQL(1)
 	assert.Error(t, err)
 	assert.EqualValues(t, ErrNotSupportType, err)