HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed backward compatibility because PR #387 caused

This commit is contained in:
Lunny Xiao 2016-05-13 23:55:14 +08:00
parent 040db3951c
commit b3bc4caf9f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine.go
View File

@ -960,10 +960,17 @@ func (engine *Engine) mapType(v reflect.Value) *core.Table {
case reflect.Struct: case reflect.Struct:
parentTable := engine.mapType(fieldValue) parentTable := engine.mapType(fieldValue)
for _, col := range parentTable.Columns() { for _, col := range parentTable.Columns() {
if t.Field(i).Anonymous { /*if t.Field(i).Anonymous {
col.TableName = parentTable.Name col.TableName = parentTable.Name
} else { } else {
col.TableName = engine.TableMapper.Obj2Table(t.Field(i).Name) col.TableName = engine.TableMapper.Obj2Table(t.Field(i).Name)
}*/
if len(col.TableName) <= 0 {
if _, ok := fieldValue.Interface().(TableName); ok {
col.TableName = fieldValue.Interface().(TableName).TableName()
} else {
col.TableName = engine.TableMapper.Obj2Table(fieldType.Name())
}
} }
col.FieldName = fmt.Sprintf("%v.%v", t.Field(i).Name, col.FieldName) col.FieldName = fmt.Sprintf("%v.%v", t.Field(i).Name, col.FieldName)
table.AddColumn(col) table.AddColumn(col)