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

bug resolved for #364 & #365

This commit is contained in:
Lunny Xiao 2016-03-04 17:38:05 +08:00
parent 4fec1167de
commit d92dc9d373
4 changed files with 8 additions and 7 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.0303 xorm v0.5.2.0304

8
session.go
View File

@ -2204,12 +2204,12 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
continue continue
} }
if session.Statement.ColumnStr != "" { if session.Statement.ColumnStr != "" {
if _, ok := session.Statement.columnMap[col.Name]; !ok { if _, ok := session.Statement.columnMap[strings.ToLower(col.Name)]; !ok {
continue continue
} }
} }
if session.Statement.OmitStr != "" { if session.Statement.OmitStr != "" {
if _, ok := session.Statement.columnMap[col.Name]; ok { if _, ok := session.Statement.columnMap[strings.ToLower(col.Name)]; ok {
continue continue
} }
} }
@ -2252,12 +2252,12 @@ func (session *Session) innerInsertMulti(rowsSlicePtr interface{}) (int64, error
continue continue
} }
if session.Statement.ColumnStr != "" { if session.Statement.ColumnStr != "" {
if _, ok := session.Statement.columnMap[col.Name]; !ok { if _, ok := session.Statement.columnMap[strings.ToLower(col.Name)]; !ok {
continue continue
} }
} }
if session.Statement.OmitStr != "" { if session.Statement.OmitStr != "" {
if _, ok := session.Statement.columnMap[col.Name]; ok { if _, ok := session.Statement.columnMap[strings.ToLower(col.Name)]; ok {
continue continue
} }
} }

3
statement.go
View File

@ -867,7 +867,8 @@ func (statement *Statement) Cols(columns ...string) *Statement {
} }
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, ".") { if strings.Contains(statement.ColumnStr, ".") {
statement.ColumnStr = strings.Replace(statement.ColumnStr, ".", statement.Engine.Quote("."), -1) statement.ColumnStr = strings.Replace(statement.ColumnStr, ".",
statement.Engine.dialect.QuoteStr()+"."+statement.Engine.dialect.QuoteStr(), -1)
} }
statement.ColumnStr = strings.Replace(statement.ColumnStr, statement.Engine.Quote("*"), "*", -1) statement.ColumnStr = strings.Replace(statement.ColumnStr, statement.Engine.Quote("*"), "*", -1)
return statement return statement

2
xorm.go
View File

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