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

Fix bug

This commit is contained in:
Lunny Xiao 2023-10-19 15:55:30 +08:00
parent 30667e9d38
commit 3aca84268c
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/statements/insert.go
View File

@ -89,7 +89,7 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
} }
if statement.Conds().IsValid() { if statement.Conds().IsValid() {
if err := statement.writeString(" SELECT ")(buf); err != nil { if err := statement.writeStrings(" SELECT ")(buf); err != nil {
return "", nil, err return "", nil, err
} }

2
internal/statements/legacy_select.go
View File

@ -18,7 +18,7 @@ func (statement *Statement) isUsingLegacyLimitOffset() bool {
// write mssql legacy query sql // write mssql legacy query sql
func (statement *Statement) writeMssqlLegacySelect(buf *builder.BytesWriter, columnStr string) error { func (statement *Statement) writeMssqlLegacySelect(buf *builder.BytesWriter, columnStr string) error {
return statement.writeMultiple(buf, return statement.writeMultiple(buf,
statement.writeString("SELECT"), statement.writeStrings("SELECT"),
statement.writeDistinct, statement.writeDistinct,
statement.writeTop, statement.writeTop,
statement.writeFrom, statement.writeFrom,

4
internal/statements/query.go
View File

@ -249,9 +249,9 @@ func (statement *Statement) writeDistinct(w *builder.BytesWriter) error {
func (statement *Statement) writeSelectColumns(columnStr string) func(w *builder.BytesWriter) error { func (statement *Statement) writeSelectColumns(columnStr string) func(w *builder.BytesWriter) error {
return statement.groupWriteFns( return statement.groupWriteFns(
statement.writeString("SELECT"), statement.writeStrings("SELECT"),
statement.writeDistinct, statement.writeDistinct,
statement.writeString(columnStr), statement.writeStrings(" ", columnStr),
) )
} }

8
internal/statements/writer.go
View File

@ -10,19 +10,17 @@ import (
"xorm.io/builder" "xorm.io/builder"
) )
func (statement *Statement) writeString(str string) func(w *builder.BytesWriter) error { func (statement *Statement) writeStrings(strs ...string) func(w *builder.BytesWriter) error {
return func(w *builder.BytesWriter) error { return func(w *builder.BytesWriter) error {
for _, str := range strs {
if _, err := fmt.Fprint(w, str); err != nil { if _, err := fmt.Fprint(w, str); err != nil {
return err return err
} }
}
return nil return nil
} }
} }
func (statement *Statement) writeSpace(w *builder.BytesWriter) error {
return statement.writeString(" ")(w)
}
func (statement *Statement) groupWriteFns(writeFuncs ...func(*builder.BytesWriter) error) func(*builder.BytesWriter) error { func (statement *Statement) groupWriteFns(writeFuncs ...func(*builder.BytesWriter) error) func(*builder.BytesWriter) error {
return func(bw *builder.BytesWriter) error { return func(bw *builder.BytesWriter) error {
return statement.writeMultiple(bw, writeFuncs...) return statement.writeMultiple(bw, writeFuncs...)