github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-03 00:38:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(goctl): fix redundant import (#2551)

Browse Source
This commit is contained in:
anqiansong 2022-10-25 06:58:51 +08:00 committed by GitHub
parent ce73b9a85c
commit 9504d30049
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/goctl/internal/version/version.go
View File

@ -6,7 +6,7 @@ import (
)
// BuildVersion is the version of goctl.
const BuildVersion = "1.4.2"
const BuildVersion = "1.4.3"
var tag = map[string]int{"pre-alpha": 0, "alpha": 1, "pre-bata": 2, "beta": 3, "released": 4, "": 5}

9
tools/goctl/model/sql/converter/types.go
View File

@ -153,17 +153,18 @@ func ConvertDataType(dataBaseType int, isDefaultNull, unsigned, strict bool) (st
}
// ConvertStringDataType converts mysql column type into golang type
func ConvertStringDataType(dataBaseType string, isDefaultNull, unsigned, strict bool) (string, error) {
func ConvertStringDataType(dataBaseType string, isDefaultNull, unsigned, strict bool) (
goType string, isPQArray bool, err error) {
tp, ok := commonMysqlDataTypeMapString[strings.ToLower(dataBaseType)]
if !ok {
return "", fmt.Errorf("unsupported database type: %s", dataBaseType)
return "", false, fmt.Errorf("unsupported database type: %s", dataBaseType)
}
if strings.HasPrefix(dataBaseType, "_") {
return tp, nil
return tp, true, nil
}
return mayConvertNullType(tp, isDefaultNull, unsigned, strict), nil
return mayConvertNullType(tp, isDefaultNull, unsigned, strict), false, nil
}
func mayConvertNullType(goDataType string, isDefaultNull, unsigned, strict bool) string {

10
tools/goctl/model/sql/gen/imports.go
View File

@ -14,8 +14,9 @@ func genImports(table Table, withCache, timeImport bool) (string, error) {
}
buffer, err := util.With("import").Parse(text).Execute(map[string]interface{}{
"time": timeImport,
"data": table,
"time": timeImport,
"containsPQ": table.ContainsPQ,
"data": table,
})
if err != nil {
return "", err
@ -30,8 +31,9 @@ func genImports(table Table, withCache, timeImport bool) (string, error) {
}
buffer, err := util.With("import").Parse(text).Execute(map[string]interface{}{
"time": timeImport,
"data": table,
"time": timeImport,
"containsPQ": table.ContainsPQ,
"data": table,
})
if err != nil {
return "", err

11
tools/goctl/model/sql/parser/parser.go
View File

@ -26,6 +26,7 @@ type (
PrimaryKey Primary
UniqueIndex map[string][]*Field
Fields []*Field
ContainsPQ bool
}
// Primary describes a primary key
@ -42,6 +43,7 @@ type (
Comment string
SeqInIndex int
OrdinalPosition int
ContainsPQ bool
}
// KeyType types alias of int
@ -268,12 +270,13 @@ func (t *Table) ContainsTime() bool {
func ConvertDataType(table *model.Table, strict bool) (*Table, error) {
isPrimaryDefaultNull := table.PrimaryKey.ColumnDefault == nil && table.PrimaryKey.IsNullAble == "YES"
isPrimaryUnsigned := strings.Contains(table.PrimaryKey.DbColumn.ColumnType, "unsigned")
primaryDataType, err := converter.ConvertStringDataType(table.PrimaryKey.DataType, isPrimaryDefaultNull, isPrimaryUnsigned, strict)
primaryDataType, containsPQ, err := converter.ConvertStringDataType(table.PrimaryKey.DataType, isPrimaryDefaultNull, isPrimaryUnsigned, strict)
if err != nil {
return nil, err
}
var reply Table
reply.ContainsPQ = containsPQ
reply.UniqueIndex = map[string][]*Field{}
reply.Name = stringx.From(table.Table)
reply.Db = stringx.From(table.Db)
@ -299,6 +302,9 @@ func ConvertDataType(table *model.Table, strict bool) (*Table, error) {
}
for _, each := range fieldM {
if each.ContainsPQ {
reply.ContainsPQ = true
}
reply.Fields = append(reply.Fields, each)
}
sort.Slice(reply.Fields, func(i, j int) bool {
@ -348,7 +354,7 @@ func getTableFields(table *model.Table, strict bool) (map[string]*Field, error)
for _, each := range table.Columns {
isDefaultNull := each.ColumnDefault == nil && each.IsNullAble == "YES"
isPrimaryUnsigned := strings.Contains(each.ColumnType, "unsigned")
dt, err := converter.ConvertStringDataType(each.DataType, isDefaultNull, isPrimaryUnsigned, strict)
dt, containsPQ, err := converter.ConvertStringDataType(each.DataType, isDefaultNull, isPrimaryUnsigned, strict)
if err != nil {
return nil, err
}
@ -364,6 +370,7 @@ func getTableFields(table *model.Table, strict bool) (map[string]*Field, error)
Comment: each.Comment,
SeqInIndex: columnSeqInIndex,
OrdinalPosition: each.OrdinalPosition,
ContainsPQ: containsPQ,
}
fieldM[each.Name] = field
}

2
tools/goctl/model/sql/template/import.go
View File

@ -9,6 +9,7 @@ const (
"strings"
{{if .time}}"time"{{end}}
{{if .containsPQ}}"github.com/lib/pq"{{end}}
"github.com/zeromicro/go-zero/core/stores/builder"
"github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/sqlc"
@ -24,6 +25,7 @@ const (
"strings"
{{if .time}}"time"{{end}}
{{if .containsPQ}}"github.com/lib/pq"{{end}}
"github.com/zeromicro/go-zero/core/stores/builder"
"github.com/zeromicro/go-zero/core/stores/sqlc"
"github.com/zeromicro/go-zero/core/stores/sqlx"

6
tools/goctl/model/sql/template/model.go
View File

@ -10,16 +10,12 @@ import (
const ModelCustom = `package {{.pkg}}
{{if .withCache}}
import (
"github.com/lib/pq"
"github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/sqlx"
)
{{else}}
import (
"github.com/lib/pq"
"github.com/zeromicro/go-zero/core/stores/sqlx"
)
import "github.com/zeromicro/go-zero/core/stores/sqlx"
{{end}}
var _ {{.upperStartCamelObject}}Model = (*custom{{.upperStartCamelObject}}Model)(nil)