more tests (#32)

Author: lunny

builder_insert.go

@@ -36,7 +36,7 @@ func (b *Builder) insertWriteTo(w Writer) error {
 		value := b.inserts[col]
 		fmt.Fprint(w, col)
 		if e, ok := value.(expr); ok {
-			fmt.Fprint(valBuffer, e.sql)
+			fmt.Fprintf(valBuffer, "(%s)", e.sql)
 			args = append(args, e.args...)
 		} else {
 			fmt.Fprint(valBuffer, "?")

builder_test.go

@@ -601,6 +601,10 @@ func TestBuilderInsert(t *testing.T) {
 	assert.NoError(t, err)
 	assert.EqualValues(t, "INSERT INTO table1 (c,d) Values (1,2)", sql)
 
+	sql, err = Insert(Eq{"c": 1, "d": Expr("SELECT b FROM t WHERE d=? LIMIT 1", 2)}).Into("table1").ToBoundSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "INSERT INTO table1 (c,d) Values (1,(SELECT b FROM t WHERE d=2 LIMIT 1))", sql)
+
 	sql, err = Insert(Eq{"c": 1, "d": 2}).ToBoundSQL()
 	assert.Error(t, err)
 	assert.EqualValues(t, ErrNoTableName, err)
@@ -646,6 +650,12 @@ func TestBuilder_From2(t *testing.T) {
 	assert.NoError(t, err)
 	assert.EqualValues(t, "SELECT id FROM table_b tb WHERE b=?", sql)
 	assert.EqualValues(t, []interface{}{"a"}, args)
+
+	b = Select().From("table_b", "tb").Where(Eq{"b": "a"})
+	sql, args, err = b.ToSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "SELECT * FROM table_b tb WHERE b=?", sql)
+	assert.EqualValues(t, []interface{}{"a"}, args)
 }
 
 func TestBuilder_And(t *testing.T) {

string_builder_test.go

@@ -23,6 +23,7 @@ func TestStringBuilderWriteByte(t *testing.T) {
 		_, err = b.WriteRune(c)
 		assert.NoError(t, err)
 	}
+	assert.EqualValues(t, 6, b.Len())
 	assert.EqualValues(t, content, b.String())
 
 	for i := 0; i < 100; i++ {