jager/gormt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort tables by name

Browse Source 
fix typo
This commit is contained in:
Nemo
2020-04-06 17:05:34 +08:00
parent 79eba1ca61
commit 034506e602
10 changed files with 75 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
data/view/model/genmysql/genmysql.go
View File

@@ -2,6 +2,7 @@ package genmysql
import (
"fmt"
"sort"
"strings"
"github.com/xxjwxc/gormt/data/config"
@@ -59,8 +60,9 @@ func (m *mysqlModel) GetPkgName() string {
}
func getPackageInfo(orm *mysqldb.MySqlDB, info *model.DBInfo) {
tabls := getTables(orm) // get table and notes
for tabName, notes := range tabls {
tables := getTables(orm) // get table and notes
for tabName, notes := range tables {
var tab model.TabInfo
tab.Name = tabName
tab.Notes = notes
@@ -86,10 +88,14 @@ func getPackageInfo(orm *mysqldb.MySqlDB, info *model.DBInfo) {
info.TabList = append(info.TabList, tab)
}
// sort tables
sort.Slice(info.TabList, func(i, j int) bool {
return info.TabList[i].Name < info.TabList[j].Name
})
}
// getTableElement Get table columns and comments.获取表列及注释
func getTableElement(orm *mysqldb.MySqlDB, tab string) (el []model.ColumusInfo) {
func getTableElement(orm *mysqldb.MySqlDB, tab string) (el []model.ColumnsInfo) {
keyNums := make(map[string]int)
// get keys
var Keys []keys
@@ -104,7 +110,7 @@ func getTableElement(orm *mysqldb.MySqlDB, tab string) (el []model.ColumusInfo)
orm.Raw("show FULL COLUMNS from " + tab).Scan(&list)
// filter gorm.Model.过滤 gorm.Model
if filterModel(&list) {
el = append(el, model.ColumusInfo{
el = append(el, model.ColumnsInfo{
Type: "gorm.Model",
})
}
@@ -119,7 +125,7 @@ func getTableElement(orm *mysqldb.MySqlDB, tab string) (el []model.ColumusInfo)
// ------------------end
for _, v := range list {
var tmp model.ColumusInfo
var tmp model.ColumnsInfo
tmp.Name = v.Field
tmp.Notes = v.Desc
tmp.Type = v.Type
@@ -127,20 +133,20 @@ func getTableElement(orm *mysqldb.MySqlDB, tab string) (el []model.ColumusInfo)
// keys
if strings.EqualFold(v.Key, "PRI") { // Set primary key.设置主键
tmp.Index = append(tmp.Index, model.KList{
Key: model.ColumusKeyPrimary,
Key: model.ColumnsKeyPrimary,
})
} else if strings.EqualFold(v.Key, "UNI") { // unique
tmp.Index = append(tmp.Index, model.KList{
Key: model.ColumusKeyUnique,
Key: model.ColumnsKeyUnique,
})
} else {
for _, v1 := range Keys {
if strings.EqualFold(v1.ColumnName, v.Field) {
var k model.KList
if v1.NonUnique == 1 { // index
k.Key = model.ColumusKeyIndex
k.Key = model.ColumnsKeyIndex
} else {
k.Key = model.ColumusKeyUniqueIndex
k.Key = model.ColumnsKeyUniqueIndex
}
if keyNums[v1.KeyName] > 1 { // Composite index.复合索引
k.KeyName = v1.KeyName