add more test cases & replace some err in errors.New(...) style & add some built-in err types

Author: BetaCat0

builder_insert.go

@@ -6,7 +6,6 @@ package builder
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 )
 
@@ -18,10 +17,10 @@ func Insert(eq Eq) *Builder {
 
 func (b *Builder) insertWriteTo(w Writer) error {
 	if len(b.tableName) <= 0 {
-		return errors.New("no table indicated")
+		return ErrNoTableName
 	}
 	if len(b.inserts) <= 0 {
-		return errors.New("no column to be insert")
+		return ErrNoColumnToInsert
 	}
 
 	if _, err := fmt.Fprintf(w, "INSERT INTO %s (", b.tableName); err != nil {

builder_select.go

@@ -17,7 +17,7 @@ func Select(cols ...string) *Builder {
 
 func (b *Builder) selectWriteTo(w Writer) error {
 	if len(b.tableName) <= 0 {
-		return errors.New("no table indicated")
+		return ErrNoTableName
 	}
 
 	// perform limit before writing to writer when b.dialect between ORACLE and MSSQL

builder_select_test.go

@@ -14,11 +14,12 @@ import (
 func TestBuilder_Select(t *testing.T) {
 	sql, args, err := Select("c, d").From("table1").ToSQL()
 	assert.NoError(t, err)
-	fmt.Println(sql, args)
+	assert.EqualValues(t, "SELECT c, d FROM table1", sql)
 
 	sql, args, err = Select("c, d").From("table1").Where(Eq{"a": 1}).ToSQL()
 	assert.NoError(t, err)
-	fmt.Println(sql, args)
+	assert.EqualValues(t, "SELECT c, d FROM table1 WHERE a=?", sql)
+	assert.EqualValues(t, []interface{}{1}, args)
 
 	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()
@@ -47,6 +48,10 @@ func TestBuilder_Select(t *testing.T) {
 	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)
+
+	_, _, err = Select("c, d").ToSQL()
+	assert.Error(t, err)
+	assert.EqualValues(t, ErrNoTableName, err)
 }
 
 func TestBuilderSelectGroupBy(t *testing.T) {

builder_test.go

@@ -5,7 +5,6 @@
 package builder
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -413,9 +412,17 @@ func TestBuilderCond(t *testing.T) {
 }
 
 func TestBuilderInsert(t *testing.T) {
-	sql, args, err := Insert(Eq{"c": 1, "d": 2}).Into("table1").ToSQL()
+	sql, err := Insert(Eq{"c": 1, "d": 2}).Into("table1").ToBoundSQL()
 	assert.NoError(t, err)
-	fmt.Println(sql, args)
+	assert.EqualValues(t, "INSERT INTO table1 (c,d) Values (1,2)", sql)
+
+	sql, err = Insert(Eq{"c": 1, "d": 2}).ToBoundSQL()
+	assert.Error(t, err)
+	assert.EqualValues(t, ErrNoTableName, err)
+
+	sql, err = Insert(Eq{}).Into("table1").ToBoundSQL()
+	assert.Error(t, err)
+	assert.EqualValues(t, ErrNoColumnToInsert, err)
 }
 
 func TestSubquery(t *testing.T) {

builder_union.go

@@ -5,21 +5,20 @@
 package builder
 
 import (
-	"errors"
 	"fmt"
 	"strings"
 )
 
 func (b *Builder) unionWriteTo(w Writer) error {
 	if b.limitation != nil || b.cond != NewCond() ||
 		b.orderBy != "" || b.having != "" || b.groupBy != "" {
-		return errors.New("builder in unionType should not have any conditional fields in it(like Where or Limit)")
+		return ErrNotUnexpectedUnionConditions
 	}
 
 	for idx, u := range b.unions {
 		current := u.builder
 		if current.optype != selectType {
-			return errors.New("UNION is only allowed among SELECT operations")
+			return ErrUnsupportedUnionMembers
 		}
 
 		if len(b.unions) == 1 {

builder_union_test.go

@@ -27,13 +27,13 @@ func TestBuilder_Union(t *testing.T) {
 		Where(Eq{"a": 2}).Limit(5, 10).
 		ToSQL()
 	assert.Error(t, err)
-	fmt.Println(err)
+	assert.EqualValues(t, ErrNotUnexpectedUnionConditions, err)
 
 	// will raise error
 	sql, args, err = Delete(Eq{"a": 1}).From("t1").
 		Union("all", Select("*").From("t2").Where(Eq{"status": "2"})).ToSQL()
 	assert.Error(t, err)
-	fmt.Println(err)
+	assert.EqualValues(t, ErrUnsupportedUnionMembers, err)
 
 	// will be overwrote by SELECT op
 	sql, args, err = Select("*").From("t1").Where(Eq{"status": "1"}).

error.go

@@ -17,8 +17,14 @@ var (
 	ErrNeedMoreArguments = errors.New("Need more sql arguments")
 	// ErrNoTableName no table name
 	ErrNoTableName = errors.New("No table indicated")
-	// ErrNoColumnToUpdate no column to update
-	ErrNoColumnToUpdate = errors.New("No column to be update")
+	// ErrNoColumnToInsert no column to update
+	ErrNoColumnToUpdate = errors.New("No column(s) to update")
+	// ErrNoColumnToInsert no column to update
+	ErrNoColumnToInsert = errors.New("No column(s) to insert")
 	// ErrNotSupportDialectType not supported dialect type error
 	ErrNotSupportDialectType = errors.New("Not supported dialect type")
+	// ErrNotUnexpectedUnionConditions using union in a wrong way
+	ErrNotUnexpectedUnionConditions = errors.New("Unexpected conditional fields in UNION query")
+	// ErrUnsupportedUnionMembers unexpected members in UNION query
+	ErrUnsupportedUnionMembers = errors.New("Unexpected members in UNION query")
 )