between support Expr and more tests (#28)

Author: lunny

builder_test.go

@@ -43,6 +43,16 @@ func TestBuilderCond(t *testing.T) {
 "e=(SELECT id FROM f WHERE g=?)",
 []interface{}{1},
 },
+{
+Like{"a", "%1"}.And(Like{"b", "%2"}),
+"a LIKE ? AND b LIKE ?",
+[]interface{}{"%1", "%2"},
+},
+{
+Like{"a", "%1"}.Or(Like{"b", "%2"}),
+"a LIKE ? OR b LIKE ?",
+[]interface{}{"%1", "%2"},
+},
 {
 Neq{"d": []string{"e", "f"}},
 "d NOT IN (?,?)",
@@ -63,6 +73,16 @@ func TestBuilderCond(t *testing.T) {
 "d<?",
 []interface{}{3},
 },
+{
+Lt{"d": 3}.And(Lt{"e": 4}),
+"d<? AND e<?",
+[]interface{}{3, 4},
+},
+{
+Lt{"d": 3}.Or(Lt{"e": 4}),
+"d<? OR e<?",
+[]interface{}{3, 4},
+},
 {
 Lt{"e": Select("id").From("f").Where(Eq{"g": 1})},
 "e<(SELECT id FROM f WHERE g=?)",
@@ -78,6 +98,16 @@ func TestBuilderCond(t *testing.T) {
 "d<=?",
 []interface{}{3},
 },
+{
+Lte{"d": 3}.And(Lte{"e": 4}),
+"d<=? AND e<=?",
+[]interface{}{3, 4},
+},
+{
+Lte{"d": 3}.Or(Lte{"e": 4}),
+"d<=? OR e<=?",
+[]interface{}{3, 4},
+},
 {
 Lte{"e": Select("id").From("f").Where(Eq{"g": 1})},
 "e<=(SELECT id FROM f WHERE g=?)",
@@ -93,6 +123,16 @@ func TestBuilderCond(t *testing.T) {
 "d>?",
 []interface{}{3},
 },
+{
+Gt{"d": 3}.And(Gt{"e": 4}),
+"d>? AND e>?",
+[]interface{}{3, 4},
+},
+{
+Gt{"d": 3}.Or(Gt{"e": 4}),
+"d>? OR e>?",
+[]interface{}{3, 4},
+},
 {
 Gt{"e": Select("id").From("f").Where(Eq{"g": 1})},
 "e>(SELECT id FROM f WHERE g=?)",
@@ -108,6 +148,16 @@ func TestBuilderCond(t *testing.T) {
 "d>=?",
 []interface{}{3},
 },
+{
+Gte{"d": 3}.And(Gte{"e": 4}),
+"d>=? AND e>=?",
+[]interface{}{3, 4},
+},
+{
+Gte{"d": 3}.Or(Gte{"e": 4}),
+"d>=? OR e>=?",
+[]interface{}{3, 4},
+},
 {
 Gte{"e": Select("id").From("f").Where(Eq{"g": 1})},
 "e>=(SELECT id FROM f WHERE g=?)",
@@ -123,11 +173,61 @@ func TestBuilderCond(t *testing.T) {
 "d BETWEEN ? AND ?",
 []interface{}{0, 2},
 },
+{
+Between{"d", 0, Expr("CAST('2003-01-01' AS DATE)")},
+"d BETWEEN ? AND CAST('2003-01-01' AS DATE)",
+[]interface{}{0},
+},
+{
+Between{"d", Expr("CAST('2003-01-01' AS DATE)"), 2},
+"d BETWEEN CAST('2003-01-01' AS DATE) AND ?",
+[]interface{}{2},
+},
+{
+Between{"d", Expr("CAST('2003-01-01' AS DATE)"), Expr("CAST('2003-01-01' AS DATE)")},
+"d BETWEEN CAST('2003-01-01' AS DATE) AND CAST('2003-01-01' AS DATE)",
+[]interface{}{},
+},
+{
+Between{"d", 0, 2}.And(Between{"e", 3, 4}),
+"d BETWEEN ? AND ? AND e BETWEEN ? AND ?",
+[]interface{}{0, 2, 3, 4},
+},
+{
+Between{"d", 0, 2}.Or(Between{"e", 3, 4}),
+"d BETWEEN ? AND ? OR e BETWEEN ? AND ?",
+[]interface{}{0, 2, 3, 4},
+},
 {
 IsNull{"d"},
 "d IS NULL",
 []interface{}{},
 },
+{
+IsNull{"d"}.And(IsNull{"e"}),
+"d IS NULL AND e IS NULL",
+[]interface{}{},
+},
+{
+IsNull{"d"}.Or(IsNull{"e"}),
+"d IS NULL OR e IS NULL",
+[]interface{}{},
+},
+{
+NotNull{"d"},
+"d IS NOT NULL",
+[]interface{}{},
+},
+{
+NotNull{"d"}.And(NotNull{"e"}),
+"d IS NOT NULL AND e IS NOT NULL",
+[]interface{}{},
+},
+{
+NotNull{"d"}.Or(NotNull{"e"}),
+"d IS NOT NULL OR e IS NOT NULL",
+[]interface{}{},
+},
 {
 NotIn("a", 1, 2).And(NotIn("b", "c", "d")),
 "a NOT IN (?,?) AND b NOT IN (?,?)",
@@ -388,6 +488,26 @@ func TestBuilderCond(t *testing.T) {
 "NOT (a=? AND b=?)",
 []interface{}{1, 2},
 },
+{
+Not{Eq{"a": 1}.And(Eq{"b": 2})},
+"NOT (a=? AND b=?)",
+[]interface{}{1, 2},
+},
+{
+Not{Neq{"a": 1}.And(Neq{"b": 2})},
+"NOT (a<>? AND b<>?)",
+[]interface{}{1, 2},
+},
+{
+Not{Eq{"a": 1}}.And(Neq{"b": 2}),
+"NOT a=? AND b<>?",
+[]interface{}{1, 2},
+},
+{
+Not{Eq{"a": 1}}.Or(Neq{"b": 2}),
+"NOT a=? OR b<>?",
+[]interface{}{1, 2},
+},
 }
 
 for _, k := range cases {

cond_between.go

@@ -17,10 +17,35 @@ var _ Cond = Between{}
 
 // WriteTo write data to Writer
 func (between Between) WriteTo(w Writer) error {
-if _, err := fmt.Fprintf(w, "%s BETWEEN ? AND ?", between.Col); err != nil {
+if _, err := fmt.Fprintf(w, "%s BETWEEN ", between.Col); err != nil {
 return err
 }
-w.Append(between.LessVal, between.MoreVal)
+if lv, ok := between.LessVal.(expr); ok {
+if err := lv.WriteTo(w); err != nil {
+return err
+}
+} else {
+if _, err := fmt.Fprint(w, "?"); err != nil {
+return err
+}
+w.Append(between.LessVal)
+}
+
+if _, err := fmt.Fprint(w, " AND "); err != nil {
+return err
+}
+
+if mv, ok := between.MoreVal.(expr); ok {
+if err := mv.WriteTo(w); err != nil {
+return err
+}
+} else {
+if _, err := fmt.Fprint(w, "?"); err != nil {
+return err
+}
+w.Append(between.MoreVal)
+}
+
 return nil
 }