增加关键字格式化函数

Author: xfali

cmd_test.go

@@ -0,0 +1,29 @@
+// Copyright (C) 2019-2020, Xiongfa Li.
+// @author xiongfa.li
+// @version V1.0
+// Description: 
+
+package common
+
+type KeyWordFormatter func(string) string
+
+var KwFormatter = MysqlKeyWordFormatter
+var kwFormatterMap = map[string]KeyWordFormatter{
+	"mysql":    MysqlKeyWordFormatter,
+	"postgres": PostgresKeyWordFormatter,
+}
+
+func MysqlKeyWordFormatter(src string) string {
+	return "`" + src + "`"
+}
+
+func PostgresKeyWordFormatter(src string) string {
+	return `"` + src + `"`
+}
+
+func SelectKeyWordFormatter(driver string) {
+	v := kwFormatterMap[driver]
+	if v != nil {
+		KwFormatter = v
+	}
+}

common/formatter.go

@@ -3,34 +3,34 @@
  * All right reserved.
  * @author xiongfa.li
  * @version V1.0
- * Description: 
+ * Description:
  */
 
 package common
 
 type ModelInfo struct {
-    ColumnName string
-    DataType   string
-    Nullable   string
-    ColumnKey  string
-    Comment    string
-    Tag        string
+	ColumnName string
+	DataType   string
+	Nullable   string
+	ColumnKey  string
+	Comment    string
+	Tag        string
 }
 
-
 const (
-    MethodFlag         = "method"
-    OutPutSuffixMethod = "output"
-    GenerateMethod     = "generate"
+	MethodFlag         = "method"
+	OutPutSuffixMethod = "output"
+	GenerateMethod     = "generate"
 )
 
 type GenerateInfo struct {
-    Package string             `json:"package"`
-    Table   string             `json:"table"`
-    Models  []ModelInfo `json:"models"`
+	Driver  string      `json:"driver"`
+	Package string      `json:"package"`
+	Table   string      `json:"table"`
+	Models  []ModelInfo `json:"models"`
 }
 
 type PluginResult struct {
-    Code    int    `json:"code"`
-    Message string `json:"message"`
+	Code    int    `json:"code"`
+	Message string `json:"message"`
 }

common/model.go

@@ -13,6 +13,7 @@ import (
     "github.com/xfali/gobatis-cmd/common"
     "github.com/xfali/gobatis-cmd/io"
     "strings"
+    "time"
 )
 
 func findTime(model []common.ModelInfo) bool {
@@ -41,6 +42,13 @@ func genModel(config Config, tableName string, model []common.ModelInfo) {
         modelName := common.TableName2ModelName(tableName)
         builder := strings.Builder{}
         if !exist {
+            builder.WriteString(fmt.Sprintf("//This file was generated by xfali/gobatis-cmd at"))
+            builder.WriteString(common.Newline())
+            builder.WriteString("//")
+            builder.WriteString(time.Now().String())
+            builder.WriteString(common.Newline())
+            builder.WriteString(common.Newline())
+
             builder.WriteString("package ")
             builder.WriteString(config.PackageName)
             builder.WriteString(common.Newline())

gen_model.go

@@ -13,6 +13,7 @@ import (
     "github.com/xfali/gobatis-cmd/common"
     "github.com/xfali/gobatis-cmd/io"
     "strings"
+    "time"
 )
 
 func genV2Proxy(config Config, tableName string, models []common.ModelInfo) {
@@ -26,6 +27,13 @@ func genV2Proxy(config Config, tableName string, models []common.ModelInfo) {
 
         modelName := common.TableName2ModelName(tableName)
         builder := strings.Builder{}
+        builder.WriteString(fmt.Sprintf("//This file was generated by xfali/gobatis-cmd at"))
+        builder.WriteString(common.Newline())
+        builder.WriteString("//")
+        builder.WriteString(time.Now().String())
+        builder.WriteString(common.Newline())
+        builder.WriteString(common.Newline())
+
         builder.WriteString("package ")
         builder.WriteString(config.PackageName)
         builder.WriteString(common.Newline())

gen_proxy_v2.go

@@ -13,9 +13,11 @@ import (
 	"github.com/xfali/gobatis-cmd/common"
 	"github.com/xfali/gobatis-cmd/io"
 	"strings"
+    "time"
 )
 
 func genTemplate(config Config, tableName string, model []common.ModelInfo) {
+    common.SelectKeyWordFormatter(config.Driver)
 	targetDir := config.Path + "template/"
 	if !io.IsPathExists(targetDir) {
 		io.Mkdir(targetDir)
@@ -33,16 +35,19 @@ func genTemplate(config Config, tableName string, model []common.ModelInfo) {
 func buildTmplMapper(builder *strings.Builder, config Config, tableName string, model []common.ModelInfo) {
 	modelName := common.TableName2ModelName(tableName)
     columns := formatXmlColumns(tableName, model)
-    tableName = formatBackQuoteXml(tableName)
+    tableName = common.KwFormatter(tableName)
+
+    builder.WriteString("{{/*This file was generated by xfali/gobatis-cmd at*/}}")
+    builder.WriteString(common.Newline())
+    builder.WriteString(fmt.Sprintf("{{/*%s*/}}", time.Now().String()))
+    builder.WriteString(common.Newline())
+    builder.WriteString(common.Newline())
 
     //select
 	builder.WriteString(fmt.Sprintf(`{{define "select%s"}}`, modelName))
 	builder.WriteString(common.Newline())
 
-    builder.WriteString(fmt.Sprintf(`{{$COLUMNS := "%s"}}`, columns))
-    builder.WriteString(common.Newline())
-
-    builder.WriteString(fmt.Sprintf(`SELECT {{$COLUMNS}} FROM %s`, tableName))
+    builder.WriteString(fmt.Sprintf(`SELECT %s FROM %s`, columns, tableName))
     builder.WriteString(common.Newline())
 
     builder.WriteString(genTmplWhere(modelName, model))
@@ -56,10 +61,7 @@ func buildTmplMapper(builder *strings.Builder, config Config, tableName string,
     builder.WriteString(fmt.Sprintf(`{{define "insert%s"}}`, modelName))
     builder.WriteString(common.Newline())
 
-    builder.WriteString(fmt.Sprintf(`{{$COLUMNS := "%s"}}`, columns))
-    builder.WriteString(common.Newline())
-
-    builder.WriteString(fmt.Sprintf(`INSERT INTO %s({{$COLUMNS}})`, tableName))
+    builder.WriteString(fmt.Sprintf(`INSERT INTO %s(%s)`, tableName, columns))
     builder.WriteString(common.Newline())
 
     builder.WriteString("VALUES(")

gen_template.go

@@ -13,9 +13,11 @@ import (
     "github.com/xfali/gobatis-cmd/common"
     "github.com/xfali/gobatis-cmd/io"
     "strings"
+    "time"
 )
 
 func genXml(config Config, tableName string, model []common.ModelInfo) {
+    common.SelectKeyWordFormatter(config.Driver)
     if config.MapperFile == "xml" {
         xmlDir := config.Path + "xml/"
         if !io.IsPathExists(xmlDir) {
@@ -27,7 +29,7 @@ func genXml(config Config, tableName string, model []common.ModelInfo) {
 
             builder := strings.Builder{}
             buildMapper(&builder, config, tableName, model,
-                formatXmlColumns, formatBackQuoteXml, formatBackQuoteXml)
+                formatXmlColumns, common.KwFormatter, common.KwFormatter)
             io.Write(xmlFile, []byte(builder.String()))
         }
     } else if config.MapperFile == "go" {
@@ -64,6 +66,12 @@ type fomatter func(string) string
 func buildMapper(builder *strings.Builder, config Config, tableName string, model []common.ModelInfo,
         columnsFunc func (string, []common.ModelInfo) string, tableFunc, columnFunc fomatter) {
     modelName := common.TableName2ModelName(tableName)
+    builder.WriteString(fmt.Sprintf("<!--This file was generated by xfali/gobatis-cmd at -->"))
+    builder.WriteString(common.Newline())
+    builder.WriteString(fmt.Sprintf("<!--%s-->", time.Now().String()))
+    builder.WriteString(common.Newline())
+    builder.WriteString(common.Newline())
+
     builder.WriteString(fmt.Sprintf("<mapper namespace=\"%s.%s\">", config.PackageName, modelName))
     builder.WriteString(common.Newline())
 
@@ -254,38 +262,29 @@ func getIfStr(ctype, name string) string {
     return strings.Replace(sqlType2IfFormatMap[ctype], "%s", fmt.Sprintf("{%s}", name), -1)
 }
 
-func formatGoColumns(tableName string, model []common.ModelInfo) string {
-    columns := "` + \""
+func formatXmlColumns(tableName string, model []common.ModelInfo) string {
+    columns := ""
     for i := range model {
-        columns += formatColumnName(tableName, model[i].ColumnName)
+        columns += common.KwFormatter(model[i].ColumnName)
         if i < len(model)-1 {
             columns += ","
         }
     }
-    columns += "\" + `"
     return columns
 }
 
-func formatXmlColumns(tableName string, model []common.ModelInfo) string {
-    columns := ""
-    tableName = fmt.Sprintf("`%s`", tableName)
+func formatGoColumns(tableName string, model []common.ModelInfo) string {
+    columns := "` + \""
     for i := range model {
-        columns += formatColumnName(tableName, model[i].ColumnName)
+        columns += common.KwFormatter(model[i].ColumnName)
         if i < len(model)-1 {
             columns += ","
         }
     }
+    columns += "\" + `"
     return columns
 }
 
 func formatBackQuoteGo(src string) string {
     return "` + \"`" + src + "`\" + `"
 }
-
-func formatBackQuoteXml(src string) string {
-    return fmt.Sprintf("`%s`", src)
-}
-
-func formatColumnName(tableName, columnName string) string {
-    return fmt.Sprintf("`%s`", columnName)
-}