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

Fix test

This commit is contained in:
Lunny Xiao 2023-07-11 16:43:19 +08:00
parent 203ebdaab9
commit 1e75fd8799
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/statements/join.go
View File

@ -25,7 +25,7 @@ func (statement *Statement) Join(joinOP string, joinTable interface{}, condition
return statement
}
func (statement *Statement) writeJoins(w builder.Writer) error {
func (statement *Statement) writeJoins(w *builder.BytesWriter) error {
for _, join := range statement.joins {
if err := statement.writeJoin(w, join); err != nil {
return err
@ -34,7 +34,7 @@ func (statement *Statement) writeJoins(w builder.Writer) error {
return nil
}
func (statement *Statement) writeJoin(buf builder.Writer, join join) error {
func (statement *Statement) writeJoin(buf *builder.BytesWriter, join join) error {
// write join operator
if _, err := fmt.Fprintf(buf, " %v JOIN", join.op); err != nil {
return err
@ -101,7 +101,7 @@ func (statement *Statement) writeJoin(buf builder.Writer, join join) error {
return err
}
case builder.Cond:
if err := condTp.WriteTo(buf); err != nil {
if err := condTp.WriteTo(statement.QuoteReplacer(buf)); err != nil {
return err
}
default:

6
internal/statements/query.go
View File

@ -188,7 +188,7 @@ func (statement *Statement) GenCountSQL(beans ...interface{}) (string, []interfa
return sqlStr, condArgs, nil
}
func (statement *Statement) writeFrom(w builder.Writer) error {
func (statement *Statement) writeFrom(w *builder.BytesWriter) error {
if _, err := fmt.Fprint(w, " FROM "); err != nil {
return err
}
@ -291,7 +291,7 @@ func (statement *Statement) genSelectSQL(columnStr string, needLimit, needOrderB
return "", nil, err
}
}
if err := statement.WriteGroupBy(mssqlCondi); err != nil {
if err := statement.writeGroupBy(mssqlCondi); err != nil {
return "", nil, err
}
if _, err := fmt.Fprint(mssqlCondi, "))"); err != nil {
@ -331,7 +331,7 @@ func (statement *Statement) genSelectSQL(columnStr string, needLimit, needOrderB
}
}
if err := statement.WriteGroupBy(buf); err != nil {
if err := statement.writeGroupBy(buf); err != nil {
return "", nil, err
}
if err := statement.writeHaving(buf); err != nil {

2
internal/statements/statement.go
View File

@ -295,7 +295,7 @@ func (statement *Statement) GroupBy(keys string) *Statement {
return statement
}
func (statement *Statement) WriteGroupBy(w builder.Writer) error {
func (statement *Statement) writeGroupBy(w builder.Writer) error {
if statement.GroupByStr == "" {
return nil
}