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

Merge pull request #93 from admpub/dev 

bug fixed
This commit is contained in:
S.W.H 2014-04-13 12:41:24 +08:00
parent a8b9f5d8b8 ad33a0be49
commit cee1c951b5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine.go
View File

@ -457,8 +457,10 @@ func (engine *Engine) mapType(v reflect.Value) *core.Table {
table := engine.newTable() table := engine.newTable()
method := v.MethodByName("TableName") method := v.MethodByName("TableName")
if !method.IsValid() { if !method.IsValid() {
if v.CanAddr() {
method = v.Addr().MethodByName("TableName") method = v.Addr().MethodByName("TableName")
} }
}
if method.IsValid() { if method.IsValid() {
params := []reflect.Value{} params := []reflect.Value{}
results := method.Call(params) results := method.Call(params)

3
statement.go
View File

@ -539,6 +539,9 @@ func (statement *Statement) Cols(columns ...string) *Statement {
statement.columnMap[strings.ToLower(nc)] = true statement.columnMap[strings.ToLower(nc)] = true
} }
statement.ColumnStr = statement.Engine.Quote(strings.Join(newColumns, statement.Engine.Quote(", "))) statement.ColumnStr = statement.Engine.Quote(strings.Join(newColumns, statement.Engine.Quote(", ")))
if strings.Contains(statement.ColumnStr, ".") {
statement.ColumnStr = strings.Replace(statement.ColumnStr, ".", statement.Engine.Quote("."), -1)
}
return statement return statement
} }