add more tests for update (go-xorm#24)

Author: lunny

builder.go

@@ -42,30 +42,6 @@ type Builder struct {
 	having    string
 }
 
-// Select creates a select Builder
-func Select(cols ...string) *Builder {
-	builder := &Builder{cond: NewCond()}
-	return builder.Select(cols...)
-}
-
-// Insert creates an insert Builder
-func Insert(eq Eq) *Builder {
-	builder := &Builder{cond: NewCond()}
-	return builder.Insert(eq)
-}
-
-// Update creates an update Builder
-func Update(updates ...Eq) *Builder {
-	builder := &Builder{cond: NewCond()}
-	return builder.Update(updates...)
-}
-
-// Delete creates a delete Builder
-func Delete(conds ...Cond) *Builder {
-	builder := &Builder{cond: NewCond()}
-	return builder.Delete(conds...)
-}
-
 // Where sets where SQL
 func (b *Builder) Where(cond Cond) *Builder {
 	b.cond = b.cond.And(cond)
@@ -182,7 +158,12 @@ func (b *Builder) Insert(eq Eq) *Builder {
 
 // Update sets update SQL
 func (b *Builder) Update(updates ...Eq) *Builder {
-	b.updates = updates
+	b.updates = make([]Eq, 0, len(updates))
+	for _, update := range updates {
+		if update.IsValid() {
+			b.updates = append(b.updates, update)
+		}
+	}
 	b.optype = updateType
 	return b
 }

builder_delete.go

@@ -8,6 +8,12 @@ import (
 	"fmt"
 )
 
+// Delete creates a delete Builder
+func Delete(conds ...Cond) *Builder {
+	builder := &Builder{cond: NewCond()}
+	return builder.Delete(conds...)
+}
+
 func (b *Builder) deleteWriteTo(w Writer) error {
 	if len(b.tableName) <= 0 {
 		return ErrNoTableName

builder_insert.go

@@ -10,6 +10,12 @@ import (
 	"fmt"
 )
 
+// Insert creates an insert Builder
+func Insert(eq Eq) *Builder {
+	builder := &Builder{cond: NewCond()}
+	return builder.Insert(eq)
+}
+
 func (b *Builder) insertWriteTo(w Writer) error {
 	if len(b.tableName) <= 0 {
 		return errors.New("no table indicated")

builder_select.go

@@ -9,6 +9,12 @@ import (
 	"fmt"
 )
 
+// Select creates a select Builder
+func Select(cols ...string) *Builder {
+	builder := &Builder{cond: NewCond()}
+	return builder.Select(cols...)
+}
+
 func (b *Builder) selectWriteTo(w Writer) error {
 	if len(b.tableName) <= 0 {
 		return errors.New("no table indicated")

builder_test.go

@@ -418,20 +418,6 @@ func TestBuilderInsert(t *testing.T) {
 	fmt.Println(sql, args)
 }
 
-func TestBuilderUpdate(t *testing.T) {
-	sql, args, err := Update(Eq{"a": 2}).From("table1").Where(Eq{"a": 1}).ToSQL()
-	assert.NoError(t, err)
-	fmt.Println(sql, args)
-
-	sql, args, err = Update(Eq{"a": 2, "b": Incr(1)}).From("table2").Where(Eq{"a": 1}).ToSQL()
-	assert.NoError(t, err)
-	fmt.Println(sql, args)
-
-	sql, args, err = Update(Eq{"a": 2, "b": Incr(1), "c": Decr(1), "d": Expr("select count(*) from table2")}).From("table2").Where(Eq{"a": 1}).ToSQL()
-	assert.NoError(t, err)
-	fmt.Println(sql, args)
-}
-
 func TestSubquery(t *testing.T) {
 	subb := Select("id").From("table_b").Where(Eq{"b": "a"})
 	b := Select("a, b").From("table_a").Where(

builder_update.go

@@ -5,16 +5,21 @@
 package builder
 
 import (
-	"errors"
 	"fmt"
 )
 
+// Update creates an update Builder
+func Update(updates ...Eq) *Builder {
+	builder := &Builder{cond: NewCond()}
+	return builder.Update(updates...)
+}
+
 func (b *Builder) updateWriteTo(w Writer) error {
 	if len(b.tableName) <= 0 {
-		return errors.New("no table indicated")
+		return ErrNoTableName
 	}
 	if len(b.updates) <= 0 {
-		return errors.New("no column to be update")
+		return ErrNoColumnToUpdate
 	}
 
 	if _, err := fmt.Fprintf(w, "UPDATE %s SET ", b.tableName); err != nil {

builder_update_test.go

@@ -0,0 +1,41 @@
+// Copyright 2018 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package builder
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBuilderUpdate(t *testing.T) {
+	sql, args, err := Update(Eq{"a": 2}).From("table1").Where(Eq{"a": 1}).ToSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "UPDATE table1 SET a=? WHERE a=?", sql)
+	assert.EqualValues(t, []interface{}{2, 1}, args)
+
+	sql, args, err = Update(Eq{"a": 2, "b": 1}).From("table1").Where(Eq{"a": 1}).ToSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "UPDATE table1 SET a=?,b=? WHERE a=?", sql)
+	assert.EqualValues(t, []interface{}{2, 1, 1}, args)
+
+	sql, args, err = Update(Eq{"a": 2, "b": Incr(1)}).From("table2").Where(Eq{"a": 1}).ToSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "UPDATE table2 SET a=?,b=b+? WHERE a=?", sql)
+	assert.EqualValues(t, []interface{}{2, 1, 1}, args)
+
+	sql, args, err = Update(Eq{"a": 2, "b": Incr(1), "c": Decr(1), "d": Expr("select count(*) from table2")}).From("table2").Where(Eq{"a": 1}).ToSQL()
+	assert.NoError(t, err)
+	assert.EqualValues(t, "UPDATE table2 SET a=?,b=b+?,c=c-?,d=(select count(*) from table2) WHERE a=?", sql)
+	assert.EqualValues(t, []interface{}{2, 1, 1, 1}, args)
+
+	sql, args, err = Update(Eq{"a": 2}).Where(Eq{"a": 1}).ToSQL()
+	assert.Error(t, err)
+	assert.EqualValues(t, ErrNoTableName, err)
+
+	sql, args, err = Update(Eq{}).From("table1").Where(Eq{"a": 1}).ToSQL()
+	assert.Error(t, err)
+	assert.EqualValues(t, ErrNoColumnToUpdate, err)
+}

error.go

@@ -17,4 +17,6 @@ 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")
 )