bug fixed and update interface changed

Author: lunny

builder.go

@@ -23,7 +23,7 @@ type Builder struct {
 	selects   []string
 	joins     []join
 	inserts   Eq
-	updates   []Set
+	updates   []Eq
 }
 
 func Select(cols ...string) *Builder {
@@ -36,7 +36,7 @@ func Insert(eq Eq) *Builder {
 	return builder.Insert(eq)
 }
 
-func Update(updates ...Set) *Builder {
+func Update(updates ...Eq) *Builder {
 	builder := &Builder{cond: NewCond()}
 	return builder.Update(updates...)
 }
@@ -114,7 +114,7 @@ func (b *Builder) Insert(eq Eq) *Builder {
 	return b
 }
 
-func (b *Builder) Update(updates ...Set) *Builder {
+func (b *Builder) Update(updates ...Eq) *Builder {
 	b.updates = updates
 	b.optype = updateType
 	return b

builder_insert.go

@@ -54,5 +54,7 @@ func (b *Builder) insertWriteTo(w Writer) error {
 		return err
 	}
 
+	w.Append(args...)
+
 	return nil
 }

builder_test.go

@@ -149,6 +149,20 @@ func TestBuilderUpdate(t *testing.T) {
 		return
 	}
 	fmt.Println(sql, args)
+
+	sql, args, err = Update(Eq{"a": 2, "b": Incr(1)}).From("table2").Where(Eq{"a": 1}).ToSQL()
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	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()
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	fmt.Println(sql, args)
 }
 
 func TestBuilderDelete(t *testing.T) {

builder_update.go

@@ -18,7 +18,7 @@ func (b *Builder) updateWriteTo(w Writer) error {
 	}
 
 	for i, s := range b.updates {
-		if err := s.WriteTo(w); err != nil {
+		if err := s.opWriteTo(",", w); err != nil {
 			return err
 		}
 

cond_eq.go

@@ -2,11 +2,15 @@ package builder
 
 import "fmt"
 
+type Incr int
+
+type Decr int
+
 type Eq map[string]interface{}
 
 var _ Cond = Eq{}
 
-func (eq Eq) WriteTo(w Writer) error {
+func (eq Eq) opWriteTo(op string, w Writer) error {
 	var i = 0
 	for k, v := range eq {
 		switch v.(type) {
@@ -38,15 +42,24 @@ func (eq Eq) WriteTo(w Writer) error {
 			if _, err := fmt.Fprintf(w, ")"); err != nil {
 				return err
 			}
-
+		case Incr:
+			if _, err := fmt.Fprintf(w, "%s=%s+?", k, k); err != nil {
+				return err
+			}
+			w.Append(int(v.(Incr)))
+		case Decr:
+			if _, err := fmt.Fprintf(w, "%s=%s-?", k, k); err != nil {
+				return err
+			}
+			w.Append(int(v.(Decr)))
 		default:
 			if _, err := fmt.Fprintf(w, "%s=?", k); err != nil {
 				return err
 			}
 			w.Append(v)
 		}
 		if i != len(eq)-1 {
-			if _, err := fmt.Fprint(w, " AND "); err != nil {
+			if _, err := fmt.Fprint(w, op); err != nil {
 				return err
 			}
 		}
@@ -55,6 +68,10 @@ func (eq Eq) WriteTo(w Writer) error {
 	return nil
 }
 
+func (eq Eq) WriteTo(w Writer) error {
+	return eq.opWriteTo(" AND ", w)
+}
+
 func (eq Eq) And(conds ...Cond) Cond {
 	return And(eq, And(conds...))
 }