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

improve function

This commit is contained in:
Lunny Xiao 2023-07-21 23:17:09 +08:00
parent eb3426d323
commit 7eb219b368
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
internal/statements/delete.go
View File

@ -32,11 +32,11 @@ func (statement *Statement) writeDeleteOrder(w builder.Writer) error {
// ErrNotImplemented not implemented // ErrNotImplemented not implemented
var ErrNotImplemented = errors.New("Not implemented") var ErrNotImplemented = errors.New("Not implemented")
func (statement *Statement) writeOrderCond(orderCondWriter builder.Writer, condWriter, orderSQLWriter *builder.BytesWriter, tableName string) error { func (statement *Statement) writeOrderCond(orderCondWriter builder.Writer, orderSQLWriter *builder.BytesWriter, tableName string) error {
if orderSQLWriter.Len() > 0 { if orderSQLWriter.Len() > 0 {
switch statement.dialect.URI().DBType { switch statement.dialect.URI().DBType {
case schemas.POSTGRES: case schemas.POSTGRES:
if condWriter.Len() > 0 { if statement.cond.IsValid() {
fmt.Fprintf(orderCondWriter, " AND ") fmt.Fprintf(orderCondWriter, " AND ")
} else { } else {
fmt.Fprintf(orderCondWriter, " WHERE ") fmt.Fprintf(orderCondWriter, " WHERE ")
@ -44,7 +44,7 @@ func (statement *Statement) writeOrderCond(orderCondWriter builder.Writer, condW
fmt.Fprintf(orderCondWriter, "ctid IN (SELECT ctid FROM %s%s)", tableName, orderSQLWriter.String()) fmt.Fprintf(orderCondWriter, "ctid IN (SELECT ctid FROM %s%s)", tableName, orderSQLWriter.String())
orderCondWriter.Append(orderSQLWriter.Args()...) orderCondWriter.Append(orderSQLWriter.Args()...)
case schemas.SQLITE: case schemas.SQLITE:
if condWriter.Len() > 0 { if statement.cond.IsValid() {
fmt.Fprintf(orderCondWriter, " AND ") fmt.Fprintf(orderCondWriter, " AND ")
} else { } else {
fmt.Fprintf(orderCondWriter, " WHERE ") fmt.Fprintf(orderCondWriter, " WHERE ")
@ -62,22 +62,14 @@ func (statement *Statement) writeOrderCond(orderCondWriter builder.Writer, condW
} }
func (statement *Statement) WriteDelete(realSQLWriter, deleteSQLWriter *builder.BytesWriter, nowTime func(*schemas.Column) (interface{}, time.Time, error)) error { func (statement *Statement) WriteDelete(realSQLWriter, deleteSQLWriter *builder.BytesWriter, nowTime func(*schemas.Column) (interface{}, time.Time, error)) error {
var (
condWriter = builder.NewWriter()
err error
)
if err = statement.Conds().WriteTo(statement.QuoteReplacer(condWriter)); err != nil {
return err
}
tableNameNoQuote := statement.TableName() tableNameNoQuote := statement.TableName()
tableName := statement.dialect.Quoter().Quote(tableNameNoQuote) tableName := statement.dialect.Quoter().Quote(tableNameNoQuote)
table := statement.RefTable table := statement.RefTable
fmt.Fprintf(deleteSQLWriter, "DELETE FROM %v", tableName) if _, err := fmt.Fprint(deleteSQLWriter, "DELETE FROM ", tableName); err != nil {
if condWriter.Len() > 0 { return err
fmt.Fprintf(deleteSQLWriter, " WHERE %v", condWriter.String()) }
deleteSQLWriter.Append(condWriter.Args()...) if err := statement.writeWhere(deleteSQLWriter); err != nil {
return err
} }
orderSQLWriter := builder.NewWriter() orderSQLWriter := builder.NewWriter()
@ -86,22 +78,18 @@ func (statement *Statement) WriteDelete(realSQLWriter, deleteSQLWriter *builder.
} }
orderCondWriter := builder.NewWriter() orderCondWriter := builder.NewWriter()
if err := statement.writeOrderCond(orderCondWriter, condWriter, orderSQLWriter, tableName); err != nil { if err := statement.writeOrderCond(orderCondWriter, orderSQLWriter, tableName); err != nil {
return err return err
} }
argsForCache := make([]interface{}, 0, len(deleteSQLWriter.Args())*2)
copy(argsForCache, deleteSQLWriter.Args())
argsForCache = append(deleteSQLWriter.Args(), argsForCache...)
if statement.GetUnscoped() || table == nil || table.DeletedColumn() == nil { // tag "deleted" is disabled if statement.GetUnscoped() || table == nil || table.DeletedColumn() == nil { // tag "deleted" is disabled
return utils.WriteBuilder(realSQLWriter, deleteSQLWriter, orderCondWriter) return utils.WriteBuilder(realSQLWriter, deleteSQLWriter, orderCondWriter)
} }
deletedColumn := table.DeletedColumn() deletedColumn := table.DeletedColumn()
if _, err := fmt.Fprintf(realSQLWriter, "UPDATE %v SET %v = ? WHERE %v", if _, err := fmt.Fprintf(realSQLWriter, "UPDATE %v SET %v = ?",
statement.dialect.Quoter().Quote(statement.TableName()), statement.dialect.Quoter().Quote(statement.TableName()),
statement.dialect.Quoter().Quote(deletedColumn.Name), statement.dialect.Quoter().Quote(deletedColumn.Name)); err != nil {
condWriter.String()); err != nil {
return err return err
} }
@ -110,7 +98,10 @@ func (statement *Statement) WriteDelete(realSQLWriter, deleteSQLWriter *builder.
return err return err
} }
realSQLWriter.Append(val) realSQLWriter.Append(val)
realSQLWriter.Append(condWriter.Args()...)
if err := statement.writeWhere(realSQLWriter); err != nil {
return err
}
return utils.WriteBuilder(realSQLWriter, orderCondWriter) return utils.WriteBuilder(realSQLWriter, orderCondWriter)
} }