Merge branch 'master' into impr/row2bean

This commit is contained in:
Lunny Xiao 2016-11-23 23:16:52 +08:00 committed by GitHub
commit 24ed99afc1
2 changed files with 4 additions and 4 deletions

View File

@ -2249,7 +2249,7 @@ func (session *Session) Insert(beans ...interface{}) (int64, error) {
if size > 0 { if size > 0 {
if session.Engine.SupportInsertMany() { if session.Engine.SupportInsertMany() {
cnt, err := session.innerInsertMulti(bean) cnt, err := session.innerInsertMulti(bean)
session.resetStatement() //session.resetStatement()
if err != nil { if err != nil {
return affected, err return affected, err
} }
@ -2257,7 +2257,7 @@ func (session *Session) Insert(beans ...interface{}) (int64, error) {
} else { } else {
for i := 0; i < size; i++ { for i := 0; i < size; i++ {
cnt, err := session.innerInsert(sliceValue.Index(i).Interface()) cnt, err := session.innerInsert(sliceValue.Index(i).Interface())
session.resetStatement() //session.resetStatement()
if err != nil { if err != nil {
return affected, err return affected, err
} }
@ -2267,7 +2267,7 @@ func (session *Session) Insert(beans ...interface{}) (int64, error) {
} }
} else { } else {
cnt, err := session.innerInsert(bean) cnt, err := session.innerInsert(bean)
session.resetStatement() //session.resetStatement()
if err != nil { if err != nil {
return affected, err return affected, err
} }

View File

@ -258,7 +258,7 @@ func buildUpdates(engine *Engine, table *core.Table, bean interface{},
if col.IsDeleted && !unscoped { if col.IsDeleted && !unscoped {
continue continue
} }
if use, ok := columnMap[col.Name]; ok && !use { if use, ok := columnMap[strings.ToLower(col.Name)]; ok && !use {
continue continue
} }