feat(tml):better support nullable field

陈奎 · 陈奎 · commit 78256901d3d0 · 2020-06-27T14:20:49.000+08:00
diff --git a/template.go b/template.go
@@ -302,6 +302,9 @@ func getTag(mapper names.Mapper, genJson bool, genXorm bool, otherTags []string)
 		if genJson {
 			tags = append(tags, "json:\""+jsonName+"\"")
 		}
+		if len(res) > 0 && genXorm {
+			tags = append(tags, "xorm:\""+strings.Join(res, " ")+"\"")
+		}
 		if len(otherTags) != 0 {
 			for _, t := range otherTags {
 				if t == "json" {
@@ -310,9 +313,6 @@ func getTag(mapper names.Mapper, genJson bool, genXorm bool, otherTags []string)
 				tags = append(tags, fmt.Sprintf("%s:\"%s\"", t, jsonName))
 			}
 		}
-		if len(res) > 0 && genXorm {
-			tags = append(tags, "xorm:\""+strings.Join(res, " ")+"\"")
-		}
 		if len(tags) > 0 {
 			return "`" + strings.Join(tags, " ") + "`"
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,9 @@ func getTag(mapper names.Mapper, genJson bool, genXorm bool, otherTags []string)`
`302`	`302`	`if genJson {`
`303`	`303`	`tags = append(tags, "json:\""+jsonName+"\"")`
`304`	`304`	`}`
	`305`	`+ if len(res) > 0 && genXorm {`
	`306`	`+ tags = append(tags, "xorm:\""+strings.Join(res, " ")+"\"")`
	`307`	`+ }`
`305`	`308`	`if len(otherTags) != 0 {`
`306`	`309`	`for _, t := range otherTags {`
`307`	`310`	`if t == "json" {`
`@@ -310,9 +313,6 @@ func getTag(mapper names.Mapper, genJson bool, genXorm bool, otherTags []string)`
`310`	`313`	`tags = append(tags, fmt.Sprintf("%s:\"%s\"", t, jsonName))`
`311`	`314`	`}`
`312`	`315`	`}`
`313`		`- if len(res) > 0 && genXorm {`
`314`		`- tags = append(tags, "xorm:\""+strings.Join(res, " ")+"\"")`
`315`		`- }`
`316`	`316`	`if len(tags) > 0 {`
`317`	`317`	return "`" + strings.Join(tags, " ") + "`"
`318`	`318`	`} else {`