fix prefix
This commit is contained in:
@@ -158,8 +158,8 @@ func (m *mysqlModel) getTableElement(orm *mysqldb.MySqlDB, tab string) (el []mod
|
|||||||
if v.NonUnique == 0 { // primary or unique
|
if v.NonUnique == 0 { // primary or unique
|
||||||
if strings.EqualFold(v.KeyName, "PRIMARY") { // PRI Set primary key.设置主键
|
if strings.EqualFold(v.KeyName, "PRIMARY") { // PRI Set primary key.设置主键
|
||||||
tmp.Index = append(tmp.Index, model.KList{
|
tmp.Index = append(tmp.Index, model.KList{
|
||||||
Key: model.ColumnsKeyPrimary,
|
Key: model.ColumnsKeyPrimary,
|
||||||
Multi: (keyNameCount[v.KeyName] > 1),
|
Multi: (keyNameCount[v.KeyName] > 1),
|
||||||
KeyType: v.IndexType,
|
KeyType: v.IndexType,
|
||||||
})
|
})
|
||||||
} else { // unique
|
} else { // unique
|
||||||
@@ -218,11 +218,6 @@ func (m *mysqlModel) getTables(orm *mysqldb.MySqlDB) map[string]string {
|
|||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var table string
|
var table string
|
||||||
rows.Scan(&table)
|
rows.Scan(&table)
|
||||||
tablePrefix := config.GetTablePrefix()
|
|
||||||
if tablePrefix != "" && !strings.Contains(table, tablePrefix) {
|
|
||||||
// 不包含前缀则跳过
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
tables = append(tables, table)
|
tables = append(tables, table)
|
||||||
tbDesc[table] = ""
|
tbDesc[table] = ""
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,11 +57,7 @@ func (m *_Model) GetPackage() genstruct.GenPackage {
|
|||||||
|
|
||||||
//如果设置了表前缀
|
//如果设置了表前缀
|
||||||
if tablePrefix != "" {
|
if tablePrefix != "" {
|
||||||
var hasPrefix = strings.Contains(tab.Name, tablePrefix)
|
tab.Name = strings.TrimLeft(tab.Name, tablePrefix)
|
||||||
if !hasPrefix {
|
|
||||||
// 不包含前缀则跳过
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sct.SetStructName(getCamelName(tab.Name)) // Big hump.大驼峰
|
sct.SetStructName(getCamelName(tab.Name)) // Big hump.大驼峰
|
||||||
@@ -105,9 +101,9 @@ func (m *_Model) genTableElement(cols []ColumnsInfo) (el []genstruct.GenElement)
|
|||||||
case ColumnsKeyUnique: // unique key.唯一索引
|
case ColumnsKeyUnique: // unique key.唯一索引
|
||||||
tmp.AddTag(_tagGorm, "unique")
|
tmp.AddTag(_tagGorm, "unique")
|
||||||
case ColumnsKeyIndex: // index key.复合索引
|
case ColumnsKeyIndex: // index key.复合索引
|
||||||
if v1.KeyType=="FULLTEXT" {
|
if v1.KeyType == "FULLTEXT" {
|
||||||
tmp.AddTag(_tagGorm, getUninStr("index", ":", v1.KeyName)+",class:FULLTEXT")
|
tmp.AddTag(_tagGorm, getUninStr("index", ":", v1.KeyName)+",class:FULLTEXT")
|
||||||
}else{
|
} else {
|
||||||
tmp.AddTag(_tagGorm, getUninStr("index", ":", v1.KeyName))
|
tmp.AddTag(_tagGorm, getUninStr("index", ":", v1.KeyName))
|
||||||
}
|
}
|
||||||
case ColumnsKeyUniqueIndex: // unique index key.唯一复合索引
|
case ColumnsKeyUniqueIndex: // unique index key.唯一复合索引
|
||||||
@@ -252,11 +248,6 @@ func (m *_Model) generateFunc() (genOut []GenOutInfo) {
|
|||||||
// -------end------
|
// -------end------
|
||||||
|
|
||||||
for _, tab := range m.info.TabList {
|
for _, tab := range m.info.TabList {
|
||||||
tablePrefix := config.GetTablePrefix()
|
|
||||||
if tablePrefix != "" && !strings.Contains(tab.Name, tablePrefix) {
|
|
||||||
// 不包含前缀则跳过
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
var pkg genstruct.GenPackage
|
var pkg genstruct.GenPackage
|
||||||
pkg.SetPackage(m.info.PackageName) //package name
|
pkg.SetPackage(m.info.PackageName) //package name
|
||||||
pkg.AddImport(`"fmt"`)
|
pkg.AddImport(`"fmt"`)
|
||||||
|
|||||||
Reference in New Issue
Block a user