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

Fix build

This commit is contained in:
Lunny Xiao 2021-06-08 17:34:13 +08:00
parent 4552e26d7b
commit c4f8c17d71
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine.go
View File

@ -1212,10 +1212,10 @@ func (engine *Engine) Update(bean interface{}, condiBeans ...interface{}) (int64
} }
// Delete records, bean's non-empty fields are conditions // Delete records, bean's non-empty fields are conditions
func (engine *Engine) Delete(bean interface{}) (int64, error) { func (engine *Engine) Delete(beans ...interface{}) (int64, error) {
session := engine.NewSession() session := engine.NewSession()
defer session.Close() defer session.Close()
return session.Delete(bean) return session.Delete(beans...)
} }
// Get retrieve one record from table, bean's non-empty fields // Get retrieve one record from table, bean's non-empty fields

2
interface.go
View File

@ -30,7 +30,7 @@ type Interface interface {
CreateUniques(bean interface{}) error CreateUniques(bean interface{}) error
Decr(column string, arg ...interface{}) *Session Decr(column string, arg ...interface{}) *Session
Desc(...string) *Session Desc(...string) *Session
Delete(interface{}) (int64, error) Delete(...interface{}) (int64, error)
Distinct(columns ...string) *Session Distinct(columns ...string) *Session
DropIndexes(bean interface{}) error DropIndexes(bean interface{}) error
Exec(sqlOrArgs ...interface{}) (sql.Result, error) Exec(sqlOrArgs ...interface{}) (sql.Result, error)

43
session_delete.go
View File

@ -96,9 +96,10 @@ func (session *Session) Delete(beans ...interface{}) (int64, error) {
condSQL string condSQL string
condArgs []interface{} condArgs []interface{}
err error err error
bean interface{}
) )
if len(beans) > 0 { if len(beans) > 0 {
bean := beans[0] bean = beans[0]
if err = session.statement.SetRefBean(bean); err != nil { if err = session.statement.SetRefBean(bean); err != nil {
return 0, err return 0, err
} }
@ -231,27 +232,29 @@ func (session *Session) Delete(beans ...interface{}) (int64, error) {
return 0, err return 0, err
} }
// handle after delete processors if bean != nil {
if session.isAutoCommit { // handle after delete processors
for _, closure := range session.afterClosures { if session.isAutoCommit {
closure(bean) for _, closure := range session.afterClosures {
} closure(bean)
if processor, ok := interface{}(bean).(AfterDeleteProcessor); ok { }
processor.AfterDelete() if processor, ok := interface{}(bean).(AfterDeleteProcessor); ok {
} processor.AfterDelete()
} else {
lenAfterClosures := len(session.afterClosures)
if lenAfterClosures > 0 && len(beans) > 0 {
if value, has := session.afterDeleteBeans[beans[0]]; has && value != nil {
*value = append(*value, session.afterClosures...)
} else {
afterClosures := make([]func(interface{}), lenAfterClosures)
copy(afterClosures, session.afterClosures)
session.afterDeleteBeans[bean] = &afterClosures
} }
} else { } else {
if _, ok := interface{}(bean).(AfterDeleteProcessor); ok { lenAfterClosures := len(session.afterClosures)
session.afterDeleteBeans[bean] = nil if lenAfterClosures > 0 && len(beans) > 0 {
if value, has := session.afterDeleteBeans[beans[0]]; has && value != nil {
*value = append(*value, session.afterClosures...)
} else {
afterClosures := make([]func(interface{}), lenAfterClosures)
copy(afterClosures, session.afterClosures)
session.afterDeleteBeans[bean] = &afterClosures
}
} else {
if _, ok := interface{}(bean).(AfterDeleteProcessor); ok {
session.afterDeleteBeans[bean] = nil
}
} }
} }
} }