增加keyword参数支持

Author: xfali

README.md

@@ -38,6 +38,8 @@ gobatis-cmd -driver=mysql -host=localhost -port=3306 -user=test -pw=test -db=tes
         数据库的用户名
   -mapper string
         mapper文件类型: xml | template | go （默认xml）
+  -keyword bool
+        是否自动添加转义符，默认false，如果为true则会根据driver名称辨识添加
 ```
 
 会在当前目录下生成1个目录及3个文件，分别为：

cmd_test.go

@@ -129,12 +129,24 @@ func TestMode(t *testing.T) {
 }
 
 func TestXml(t *testing.T) {
+	t.Run("no keyword", func(t *testing.T) {
+		config := Config{
+			PackageName: "test_package",
+			Path:        "c:/tmp/",
+			TagName:     "xfield",
+			MapperFile:  "xml",
+		}
+		genXml(config, "test_table", *createModeInfo())
+	})
+
 	t.Run("mysql", func(t *testing.T) {
 		config := Config{
 			PackageName: "test_package",
 			Path:        "c:/tmp/",
 			TagName:     "xfield",
 			MapperFile:  "xml",
+			Driver:      "mysql",
+			Keyword:     true,
 		}
 		genXml(config, "test_table", *createModeInfo())
 	})
@@ -146,18 +158,43 @@ func TestXml(t *testing.T) {
 			TagName:     "xfield",
 			MapperFile:  "xml",
 			Driver:      "postgres",
+			Keyword:     true,
+		}
+		genXml(config, "test_table", *createModeInfo())
+	})
+
+	t.Run("sqlserver", func(t *testing.T) {
+		config := Config{
+			PackageName: "test_package",
+			Path:        "c:/tmp/",
+			TagName:     "xfield",
+			MapperFile:  "xml",
+			Driver:      "mssql",
+			Keyword:     true,
 		}
 		genXml(config, "test_table", *createModeInfo())
 	})
 }
 
 func TestTemplate(t *testing.T) {
+	t.Run("no keyword", func(t *testing.T) {
+		config := Config{
+			PackageName: "test_package",
+			Path:        "c:/tmp/",
+			TagName:     "xfield",
+			MapperFile:  "template",
+		}
+		genTemplate(config, "test_table", *createModeInfo())
+	})
+
 	t.Run("mysql", func(t *testing.T) {
 		config := Config{
 			PackageName: "test_package",
 			Path:        "c:/tmp/",
 			TagName:     "xfield",
 			MapperFile:  "template",
+			Driver:      "mysql",
+			Keyword:     true,
 		}
 		genTemplate(config, "test_table", *createModeInfo())
 	})
@@ -169,6 +206,19 @@ func TestTemplate(t *testing.T) {
 			TagName:     "xfield",
 			MapperFile:  "template",
 			Driver:      "postgres",
+			Keyword:     true,
+		}
+		genTemplate(config, "test_table", *createModeInfo())
+	})
+
+	t.Run("sqlserver", func(t *testing.T) {
+		config := Config{
+			PackageName: "test_package",
+			Path:        "c:/tmp/",
+			TagName:     "xfield",
+			MapperFile:  "template",
+			Driver:      "mssql",
+			Keyword:     true,
 		}
 		genTemplate(config, "test_table", *createModeInfo())
 	})

common/formatter.go

@@ -6,34 +6,59 @@
 package common
 
 const (
-	MysqlKeywordEscapeChar    = "`"
-	PostgresKeywordEscapeChar = `"`
+	MysqlKeywordEscapeCharStart       = "`"
+	MysqlKeywordEscapeCharEnd         = "`"
+	MysqlEscapeKeywordEscapeCharStart = "`"
+	MysqlEscapeKeywordEscapeCharEnd   = "`"
 
-	MysqlEscapeKeywordEscapeChar    = "`"
-	PostgresEscapeKeywordEscapeChar = `\"`
+	PostgresKeywordEscapeCharStart       = `"`
+	PostgresKeywordEscapeCharEnd         = `"`
+	PostgresEscapeKeywordEscapeCharStart = `\"`
+	PostgresEscapeKeywordEscapeCharEnd   = `\"`
+
+	SqlServerKeywordEscapeCharStart       = `[`
+	SqlServerKeywordEscapeCharEnd         = `]`
+	SqlServerEscapeKeywordEscapeCharStart = `[`
+	SqlServerEscapeKeywordEscapeCharEnd   = `]`
+
+	DummyKeywordEscapeCharStart       = ""
+	DummyKeywordEscapeCharEnd         = ""
+	DummyEscapeKeywordEscapeCharStart = ""
+	DummyEscapeKeywordEscapeCharEnd   = ""
 )
 
-var KeywordEscapeChar = MysqlKeywordEscapeChar
-var EscapeKeywordEscapeChar = MysqlEscapeKeywordEscapeChar
+var KeywordEscapeCharStart = DummyKeywordEscapeCharStart
+var KeywordEscapeCharEnd = DummyKeywordEscapeCharEnd
+var EscapeKeywordEscapeCharStart = DummyEscapeKeywordEscapeCharStart
+var EscapeKeywordEscapeCharEnd = DummyEscapeKeywordEscapeCharEnd
 
 type KeywordFormatter func(string) string
 
 var KwFormatter = CommonKeywordFormatter
 
 func CommonKeywordFormatter(src string) string {
-	return KeywordEscapeChar + src + KeywordEscapeChar
+	return KeywordEscapeCharStart + src + KeywordEscapeCharEnd
 }
 
 func CommonEscapeKeywordFormatter(src string) string {
-	return EscapeKeywordEscapeChar + src + EscapeKeywordEscapeChar
+	return EscapeKeywordEscapeCharStart + src + EscapeKeywordEscapeCharEnd
 }
 
 func SelectKeywordFormatter(driver string) {
-	if driver == "postgres" {
-		KeywordEscapeChar = PostgresKeywordEscapeChar
-		EscapeKeywordEscapeChar = PostgresEscapeKeywordEscapeChar
+	if driver == "mysql" {
+		KeywordEscapeCharStart = MysqlKeywordEscapeCharStart
+		KeywordEscapeCharEnd = MysqlKeywordEscapeCharEnd
+		EscapeKeywordEscapeCharStart = MysqlEscapeKeywordEscapeCharStart
+		EscapeKeywordEscapeCharEnd = MysqlEscapeKeywordEscapeCharEnd
+	} else if driver == "mssql" || driver == "adodb" {
+		KeywordEscapeCharStart = SqlServerKeywordEscapeCharStart
+		KeywordEscapeCharEnd = SqlServerKeywordEscapeCharEnd
+		EscapeKeywordEscapeCharStart = SqlServerEscapeKeywordEscapeCharStart
+		EscapeKeywordEscapeCharEnd = SqlServerEscapeKeywordEscapeCharEnd
 	} else {
-		KeywordEscapeChar = MysqlKeywordEscapeChar
-		EscapeKeywordEscapeChar = MysqlEscapeKeywordEscapeChar
+		KeywordEscapeCharStart = PostgresKeywordEscapeCharStart
+		KeywordEscapeCharEnd = PostgresKeywordEscapeCharEnd
+		EscapeKeywordEscapeCharStart = PostgresEscapeKeywordEscapeCharStart
+		EscapeKeywordEscapeCharEnd = PostgresEscapeKeywordEscapeCharEnd
 	}
 }

gen_template.go

@@ -17,7 +17,9 @@ import (
 )
 
 func genTemplate(config Config, tableName string, model []common.ModelInfo) {
-	common.SelectKeywordFormatter(config.Driver)
+	if config.Keyword {
+		common.SelectKeywordFormatter(config.Driver)
+	}
 	targetDir := config.Path + "template/"
 	if !io.IsPathExists(targetDir) {
 		io.Mkdir(targetDir)

gen_xml.go

@@ -17,7 +17,9 @@ import (
 )
 
 func genXml(config Config, tableName string, model []common.ModelInfo) {
-    common.SelectKeywordFormatter(config.Driver)
+    if config.Keyword {
+        common.SelectKeywordFormatter(config.Driver)
+    }
     if config.MapperFile == "xml" {
         xmlDir := config.Path + "xml/"
         if !io.IsPathExists(xmlDir) {

main.go

@@ -24,6 +24,7 @@ type Config struct {
 	TagName     string
 	MapperFile  string
 	Plugin      string
+	Keyword     bool
 }
 
 func main() {
@@ -40,6 +41,7 @@ func main() {
 	tagName := flag.String("tag", "xfield", "the name of field tag,eg: xfield,json  xfield,json,yaml")
 	mapper := flag.String("mapper", "xml", "generate mapper file: xml | template | go")
 	plugin := flag.String("plugin", "", "path of plugin")
+	keyword := flag.Bool("keyword", false, "with Keyword escape")
 	flag.Parse()
 
 	db := buildinDrivers[*driver]
@@ -65,6 +67,7 @@ func main() {
 		TagName:     *tagName,
 		MapperFile:  *mapper,
 		Plugin:      *plugin,
+		Keyword:     *keyword,
 	}
 
 	if *tableName == "" {