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
commit cee1c951b5
2 changed files with 6 additions and 1 deletions

View File

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

View File

@ -539,6 +539,9 @@ func (statement *Statement) Cols(columns ...string) *Statement {
statement.columnMap[strings.ToLower(nc)] = true
}
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
}