增加template对time参数判空

Author: xfali

parsing/template/dynamic.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 	"text/template"
+	"time"
 )
 
 const (
@@ -23,18 +24,22 @@ type Dynamic interface {
 	format(string) (string, []interface{})
 }
 
-func dummyUpdateSet(b bool, column string, value interface{}, origin string) string {
+func dummyUpdateSet(b interface{}, column string, value interface{}, origin string) string {
 	return origin
 }
 
-func dummyWhere(b bool, cond, column string, value interface{}, origin string) string {
+func dummyWhere(b interface{}, cond, column string, value interface{}, origin string) string {
 	return origin
 }
 
 func dummyParam(p interface{}) string {
 	return fmt.Sprint(p)
 }
 
+func dummyNil(p interface{}) bool {
+	return true
+}
+
 func commonAdd(a, b int) int {
 	return a + b
 }
@@ -44,8 +49,9 @@ type DummyDynamic struct{}
 var dummyFuncMap = template.FuncMap{
 	"set":   dummyUpdateSet,
 	"where": dummyWhere,
-	"add":   commonAdd,
 	"arg":   dummyParam,
+
+	"add": commonAdd,
 }
 
 var gDummyDynamic = &DummyDynamic{}
@@ -72,17 +78,18 @@ func (d *MysqlDynamic) getFuncMap() template.FuncMap {
 	return template.FuncMap{
 		"set":   d.mysqlUpdateSet,
 		"where": d.mysqlWhere,
-		"add":   commonAdd,
 		"arg":   d.Param,
+
+		"add": commonAdd,
 	}
 }
 
 func (d *MysqlDynamic) getParam() []interface{} {
 	return nil
 }
 
-func (d *MysqlDynamic) mysqlUpdateSet(b bool, column string, value interface{}, origin string) string {
-	if !b {
+func (d *MysqlDynamic) mysqlUpdateSet(b interface{}, column string, value interface{}, origin string) string {
+	if !IsTrue(b) {
 		return origin
 	}
 
@@ -113,8 +120,8 @@ func (d *MysqlDynamic) mysqlUpdateSet(b bool, column string, value interface{},
 	return buf.String()
 }
 
-func (d *MysqlDynamic) mysqlWhere(b bool, cond, column string, value interface{}, origin string) string {
-	if !b {
+func (d *MysqlDynamic) mysqlWhere(b interface{}, cond, column string, value interface{}, origin string) string {
+	if !IsTrue(b) {
 		return origin
 	}
 
@@ -176,13 +183,14 @@ func (d *PostgresDynamic) getFuncMap() template.FuncMap {
 	return template.FuncMap{
 		"set":   d.postgresUpdateSet,
 		"where": d.postgresWhere,
-		"add":   commonAdd,
 		"arg":   d.Param,
+
+		"add": commonAdd,
 	}
 }
 
-func (d *PostgresDynamic) postgresUpdateSet(b bool, column string, value interface{}, origin string) string {
-	if !b {
+func (d *PostgresDynamic) postgresUpdateSet(b interface{}, column string, value interface{}, origin string) string {
+	if !IsTrue(b) {
 		return origin
 	}
 
@@ -214,8 +222,8 @@ func (d *PostgresDynamic) postgresUpdateSet(b bool, column string, value interfa
 	return buf.String()
 }
 
-func (d *PostgresDynamic) postgresWhere(b bool, cond, column string, value interface{}, origin string) string {
-	if !b {
+func (d *PostgresDynamic) postgresWhere(b interface{}, cond, column string, value interface{}, origin string) string {
+	if !IsTrue(b) {
 		return origin
 	}
 
@@ -326,3 +334,17 @@ func replace(s, old, new string, n int) (string, int) {
 	w += copy(t[w:], s[start:])
 	return string(t[0:w]), count
 }
+
+func IsTrue(i interface{}) bool {
+	t, _ := template.IsTrue(i)
+	if !t {
+		return t
+	}
+
+	if ti, ok := i.(time.Time); ok {
+		if ti.IsZero() {
+			return false
+		}
+	}
+	return t
+}

test/template/sql.tpl

@@ -1,7 +1,7 @@
 {{define "selectTestTable"}}
 {{$COLUMNS := "`id`, `username`, `password`"}}
 SELECT {{$COLUMNS}} FROM `TEST_TABLE`
-{{where (ne .UserName "") "AND" "username" (arg .UserName) "" | where (ne .Password "pw") "AND" "password" (arg .Password) | where (ne .Status -1) "AND" "status" (arg .Status) }}
+{{where (ne .UserName "") "AND" "username" (arg .UserName) "" | where (ne .Password "pw") "AND" "password" (arg .Password) | where (ne .Status -1) "AND" "status" (arg .Status) | where .Time "AND" "time" (arg .Time) }}
 {{end}}
 
 {{define "insertTestTable"}}

test/template/temp_test.go

@@ -11,13 +11,15 @@ import (
 	"os"
 	"testing"
 	"text/template"
+	"time"
 )
 
 type TestTable struct {
 	Id       int
 	UserName string
 	Password string
 	Status   int
+	Time     time.Time
 }
 
 var driverName = "mysql"
@@ -86,7 +88,7 @@ func TestTemplate(t *testing.T) {
 func TestParser(t *testing.T) {
 	mgr := tmp2.NewManager()
 	mgr.RegisterFile("./sql.tpl")
-	var param = TestTable{Id: 1, UserName: "user", Password: "pw"}
+	var param = TestTable{Id: 1, UserName: "user", Password: "pw", Time: time.Now()}
 	t.Run("select", func(t *testing.T) {
 		tmp, _ := mgr.FindSqlParser("selectTestTable")
 		md, err := tmp.ParseMetadata(driverName, param)
@@ -169,7 +171,7 @@ func TestParser2(t *testing.T) {
 		if !ok {
 			t.Fatal(ok)
 		}
-		md, err := p.ParseMetadata("mysql",[]TestTable{
+		md, err := p.ParseMetadata("mysql", []TestTable{
 			{Id: 11, UserName: "user11", Password: "pw11"},
 			{Id: 12, UserName: "user12", Password: "pw12"},
 		})