more tests (#29)

Author: lunny

builder_test.go

@@ -198,6 +198,21 @@ func TestBuilderCond(t *testing.T) {
 "d BETWEEN ? AND ? OR e BETWEEN ? AND ?",
 []interface{}{0, 2, 3, 4},
 },
+{
+Expr("a < ?", 1),
+"a < ?",
+[]interface{}{1},
+},
+{
+Expr("a < ?", 1).And(Eq{"b": 2}),
+"(a < ?) AND b=?",
+[]interface{}{1, 2},
+},
+{
+Expr("a < ?", 1).Or(Neq{"b": 2}),
+"(a < ?) OR b<>?",
+[]interface{}{1, 2},
+},
 {
 IsNull{"d"},
 "d IS NULL",
@@ -488,6 +503,11 @@ func TestBuilderCond(t *testing.T) {
 "NOT (a=? AND b=?)",
 []interface{}{1, 2},
 },
+{
+Not{Neq{"a": 1, "b": 2}},
+"NOT (a<>? AND b<>?)",
+[]interface{}{1, 2},
+},
 {
 Not{Eq{"a": 1}.And(Eq{"b": 2})},
 "NOT (a=? AND b=?)",

cond_or.go

@@ -27,10 +27,12 @@ func (o condOr) WriteTo(w Writer) error {
 for i, cond := range o {
 var needQuote bool
 switch cond.(type) {
-case condAnd:
+case condAnd, expr:
 needQuote = true
 case Eq:
 needQuote = (len(cond.(Eq)) > 1)
+case Neq:
+needQuote = (len(cond.(Neq)) > 1)
 }
 
 if needQuote {