template add generate TableName() func (#13)

template add table_name option: true or false

template add generate TableName() func

Co-authored-by: Jerry <85411418@qq.com>
Reviewed-on: https://gitea.com/xorm/reverse/pulls/13

README.md

@@ -70,6 +70,10 @@ targets:
     {{range .ColumnsSeq}}{{$col := $table.GetColumn .}}	{{ColumnMapper $col.Name}}	{{Type $col}} `{{Tag $table $col}}`
     {{end}}
     }
+
+    func (m *{{TableMapper .Name}}) TableName() string {
+    	return "{{$table.Name}}"
+    }
     {{end}}
   template_path: ./template/goxorm.tmpl # template path for code file, it has higher perior than template field on language
   output_dir: ./models # code output directory

cmd/reverse.go

@@ -67,6 +67,7 @@ type ReverseTarget struct {
 	OutputDir     string   `yaml:"output_dir"`
 	TablePrefix   string   `yaml:"table_prefix"`
 	Language      string   `yaml:"language"`
+	TableName     bool     `yaml:"table_name"`
 
 	Funcs     map[string]string `yaml:"funcs"`
 	Formatter string            `yaml:"formatter"`
@@ -178,7 +179,7 @@ func runReverse(source *ReverseSource, target *ReverseTarget) error {
 	tables = filterTables(tables, target)
 
 	// load configuration from language
-	lang := language.GetLanguage(target.Language)
+	lang := language.GetLanguage(target.Language, target.TableName)
 	funcs := newFuncs()
 	formatter := formatters[target.Formatter]
 	importter := importters[target.Importter]
@@ -196,6 +197,7 @@ func runReverse(source *ReverseSource, target *ReverseTarget) error {
 
 	if lang != nil {
 		if bs == nil {
+
 			bs = []byte(lang.Template)
 		}
 		for k, v := range lang.Funcs {

cmd/reverse_test.go

@@ -17,16 +17,26 @@ import (
 	"xorm.io/xorm"
 )
 
-var result = fmt.Sprintf(`package models
+var (
+	result = fmt.Sprintf(`package models
 
 type A struct {
-	Id int %sxorm:"integer"%s
+	Id int %sxorm:"'Id' integer"%s
+}
+
+func (m *A) TableName() string {
+	return "a"
 }
 
 type B struct {
-	Id int %sxorm:"INTEGER"%s
+	Id int %sxorm:"'Id' INTEGER"%s
+}
+
+func (m *B) TableName() string {
+	return "b"
 }
 `, "`", "`", "`", "`")
+)
 
 func TestReverse(t *testing.T) {
 	err := reverse("../example/goxorm.yml")

example/custom.yml

@@ -5,6 +5,7 @@ source:
   conn_str: ../testdata/test.db
 targets:
 - type: codes
+  language: golang
   include_tables:
     - a
     - b
@@ -14,6 +15,7 @@ targets:
   column_mapper: snake
   table_prefix: ""
   multiple_files: true
+  table_name: true
   template: |
     package models
 

example/goxorm.yml

@@ -11,4 +11,5 @@ targets:
   exclude_tables:
     - c
   language: golang
+  table_name: true
   output_dir: ../models

example/template/goxorm.tmpl

@@ -13,4 +13,5 @@ type {{TableMapper .Name}} struct {
 {{range .ColumnsSeq}}{{$col := $table.GetColumn .}}	{{ColumnMapper $col.Name}}	{{Type $col}} `{{Tag $table $col}}`
 {{end}}
 }
+
 {{end}}

example/template/goxorm_table.tmpl

@@ -0,0 +1,20 @@
+package models
+
+{{$ilen := len .Imports}}
+{{if gt $ilen 0}}
+import (
+	{{range .Imports}}"{{.}}"{{end}}
+)
+{{end}}
+
+{{range .Tables}}
+type {{TableMapper .Name}} struct {
+{{$table := .}}
+{{range .ColumnsSeq}}{{$col := $table.GetColumn .}}	{{ColumnMapper $col.Name}}	{{Type $col}} `{{Tag $table $col}}`
+{{end}}
+}
+
+func (m *{{TableMapper .Name}}) TableName() string {
+	return "{{$table.Name}}"
+}
+{{end}}

language/golang.go

@@ -50,6 +50,23 @@ type {{TableMapper .Name}} struct {
 {{end}}
 }
 {{end}}
+`, "`", "`")
+	defaultGolangTemplateTable = fmt.Sprintf(`package models
+
+{{$ilen := len .Imports}}{{if gt $ilen 0}}import (
+	{{range .Imports}}"{{.}}"{{end}}
+){{end}}
+
+{{range .Tables}}
+type {{TableMapper .Name}} struct {
+{{$table := .}}{{range .ColumnsSeq}}{{$col := $table.GetColumn .}}	{{ColumnMapper $col.Name}}	{{Type $col}} %s{{Tag $table $col}}%s
+{{end}}
+}
+
+func (m *{{TableMapper .Name}}) TableName() string {
+	return "{{$table.Name}}"
+}
+{{end}}
 `, "`", "`")
 )
 
@@ -127,6 +144,7 @@ func tag(table *schemas.Table, col *schemas.Column) template.HTML {
 	isIdPk := isNameId && typestring(col) == "int64"
 
 	var res []string
+	res = append(res, "'"+col.FieldName+"'")
 	if !col.Nullable {
 		if !isIdPk {
 			res = append(res, "not null")

language/language.go

@@ -31,6 +31,12 @@ func RegisterLanguage(l *Language) {
 }
 
 // GetLanguage returns a language if exists
-func GetLanguage(name string) *Language {
-	return languages[name]
+func GetLanguage(name string, tableName bool) *Language {
+	language := languages[name]
+	if tableName {
+		language = languages[name]
+		language.Template = defaultGolangTemplateTable
+		return language
+	}
+	return language
 }