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

Merge branch 'main' into lunny/interface_any

This commit is contained in:
Lunny Xiao 2023-10-28 18:45:02 +08:00
parent 6e78cff477 65977c35a4
commit 58e0c0445c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
delete.go
View File

@ -63,13 +63,12 @@ func (session *Session) delete(beans []any, mustHaveConditions bool) (int64, err
table := session.statement.RefTable
realSQLWriter := builder.NewWriter()
deleteSQLWriter := builder.NewWriter()
if err := session.statement.WriteDelete(realSQLWriter, deleteSQLWriter, session.engine.nowTime); err != nil {
if err := session.statement.WriteDelete(realSQLWriter, session.engine.nowTime); err != nil {
return 0, err
}
if session.statement.GetUnscoped() || table == nil || table.DeletedColumn() == nil { // tag "deleted" is disabled
} else {
// if tag "deleted" is enabled, then set the field as deleted value
if !session.statement.GetUnscoped() && table != nil && table.DeletedColumn() != nil {
deletedColumn := table.DeletedColumn()
_, t, err := session.engine.nowTime(deletedColumn)
if err != nil {

2
insert.go
View File

@ -23,7 +23,7 @@ import (
var ErrNoElementsOnSlice = errors.New("no element on slice when insert")
// ErrPtrSliceType represents a type error
var ErrPtrSliceType = errors.New("A point to a slice is needed")
var ErrPtrSliceType = errors.New("a point to a slice is needed")
// Insert insert one or more beans
func (session *Session) Insert(beans ...any) (int64, error) {

3
internal/statements/delete.go
View File

@ -84,10 +84,11 @@ func (statement *Statement) writeOrderCond(orderCondWriter *builder.BytesWriter,
}
}
func (statement *Statement) WriteDelete(realSQLWriter, deleteSQLWriter *builder.BytesWriter, nowTime func(*schemas.Column) (any, time.Time, error)) error {
func (statement *Statement) WriteDelete(realSQLWriter *builder.BytesWriter, nowTime func(*schemas.Column) (any, time.Time, error)) error {
tableNameNoQuote := statement.TableName()
tableName := statement.dialect.Quoter().Quote(tableNameNoQuote)
table := statement.RefTable
deleteSQLWriter := builder.NewWriter()
if _, err := fmt.Fprint(deleteSQLWriter, "DELETE FROM ", tableName); err != nil {
return err
}