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

resolved merge

This commit is contained in:
Nash Tsai 2014-04-13 11:18:23 +08:00
parent e7d83f6fb5 40890e4d16
commit 9f288b6e27
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine.go
View File

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

2
session.go
View File

@ -2934,7 +2934,7 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
session.Engine.Quote(table.Version)+" = "+session.Engine.Quote(table.Version)+" + 1", session.Engine.Quote(table.Version)+" = "+session.Engine.Quote(table.Version)+" + 1",
condition) condition)
verValue = table.VersionColumn().ValueOf(bean) verValue = table.VersionColumn().ValueOf(bean)
//if err != nil { //if err != nil {
// return 0, err // return 0, err
//} //}

3
statement.go
View File

@ -523,6 +523,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
} }