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

bug fixed for Sync2

This commit is contained in:
Lunny Xiao 2016-03-14 09:40:32 +08:00
parent bb8c5c04d7
commit 4d6d506dfb
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
xorm v0.5.2.0310
xorm v0.5.2.0314

14
session.go
View File

@ -4041,6 +4041,16 @@ func (session *Session) tbName(table *core.Table) string {
return tbName
}
// tbName get some table's table name
func (session *Session) tbNameNoSchema(table *core.Table) string {
if len(session.Statement.AltTableName) > 0 {
return session.Statement.AltTableName
}
return table.Name
}
// Sync2
func (s *Session) Sync2(beans ...interface{}) error {
engine := s.Engine
@ -4055,7 +4065,7 @@ func (s *Session) Sync2(beans ...interface{}) error {
v := rValue(bean)
table := engine.mapType(v)
structTables = append(structTables, table)
var tbName = s.tbName(table)
var tbName = s.tbNameNoSchema(table)
var oriTable *core.Table
for _, tb := range tables {
@ -4209,7 +4219,7 @@ func (s *Session) Sync2(beans ...interface{}) error {
for _, table := range tables {
var oriTable *core.Table
for _, structTable := range structTables {
if equalNoCase(table.Name, s.tbName(structTable)) {
if equalNoCase(table.Name, s.tbNameNoSchema(structTable)) {
oriTable = structTable
break
}

2
xorm.go
View File

@ -17,7 +17,7 @@ import (
)
const (
Version string = "0.5.2.0310"
Version string = "0.5.2.0314"
)
func regDrvsNDialects() bool {