From 5f576b4bbda32008ad6dc2efab447b929463c37b Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 19 Jan 2020 16:16:31 +0800 Subject: [PATCH] fix lint --- .gitignore | 3 ++- cmd/reverse.go | 31 ++++++++++++++----------------- cmd/reverse_test.go | 1 + 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index c2f63e9..001cbd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -reverse \ No newline at end of file +reverse +models/ \ No newline at end of file diff --git a/cmd/reverse.go b/cmd/reverse.go index 63305b8..9625281 100644 --- a/cmd/reverse.go +++ b/cmd/reverse.go @@ -147,6 +147,17 @@ func newFuncs() template.FuncMap { return m } +func convertMapper(mapname string) core.IMapper { + switch mapname { + case "gonic": + return core.LintGonicMapper + case "same": + return core.SameMapper{} + default: + return core.SnakeMapper{} + } +} + func runReverse(source *ReverseSource, target *ReverseTarget) error { orm, err := xorm.NewEngine(source.Database, source.ConnStr) if err != nil { @@ -197,23 +208,9 @@ func runReverse(source *ReverseSource, target *ReverseTarget) error { target.ExtName = "." + target.ExtName } - var tableMapper, colMapper core.IMapper - switch target.TableMapper { - case "gonic": - tableMapper = core.LintGonicMapper - case "same": - tableMapper = core.SameMapper{} - default: - tableMapper = core.SnakeMapper{} - } - switch target.ColumnMapper { - case "gonic": - colMapper = core.LintGonicMapper - case "same": - colMapper = core.SameMapper{} - default: - colMapper = core.SnakeMapper{} - } + var tableMapper = convertMapper(target.TableMapper) + var colMapper = convertMapper(target.ColumnMapper) + funcs["TableMapper"] = tableMapper.Table2Obj funcs["ColumnMapper"] = colMapper.Table2Obj diff --git a/cmd/reverse_test.go b/cmd/reverse_test.go index 85326fe..f8818ea 100644 --- a/cmd/reverse_test.go +++ b/cmd/reverse_test.go @@ -10,6 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + _ "github.com/mattn/go-sqlite3" ) var result = fmt.Sprintf(`package models