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

Fix tests

This commit is contained in:
Lunny Xiao 2023-07-24 15:32:35 +08:00
parent 01b903f996
commit 6c9528c6c9
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/statements/query.go
View File

@ -244,7 +244,7 @@ func (statement *Statement) writeSelectColumns(w *builder.BytesWriter, columnStr
}
func (statement *Statement) writeWhereCond(w *builder.BytesWriter, cond builder.Cond) error {
if !statement.cond.IsValid() {
if !cond.IsValid() {
return nil
}

5
internal/statements/update.go
View File

@ -427,8 +427,8 @@ func (statement *Statement) writeUpdateLimit(updateWriter *builder.BytesWriter,
}
}
func (statement *Statement) WriteUpdate(updateWriter *builder.BytesWriter, cond builder.Cond, colNames []string) error {
if _, err := fmt.Fprintf(updateWriter, "UPDATE "); err != nil {
func (statement *Statement) WriteUpdate(updateWriter *builder.BytesWriter, cond builder.Cond, colNames []string, args []interface{}) error {
if _, err := fmt.Fprintf(updateWriter, "UPDATE"); err != nil {
return err
}
@ -454,6 +454,7 @@ func (statement *Statement) WriteUpdate(updateWriter *builder.BytesWriter, cond
return err
}
}
updateWriter.Append(args...)
// write from
if err := statement.writeUpdateFrom(updateWriter); err != nil {

4
session_update.go
View File

@ -227,14 +227,14 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
}
updateWriter := builder.NewWriter()
if err := session.statement.WriteUpdate(updateWriter, cond, colNames); err != nil {
if err := session.statement.WriteUpdate(updateWriter, cond, colNames, args); err != nil {
return 0, err
}
tableName := session.statement.TableName() // table name must been get before exec because statement will be reset
useCache := session.statement.UseCache
res, err := session.exec(updateWriter.String(), append(args, updateWriter.Args()...)...)
res, err := session.exec(updateWriter.String(), updateWriter.Args()...)
if err != nil {
return 0, err
} else if doIncVer {