From 1e75fd8799484a6cd2502239733f11a56b960047 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 11 Jul 2023 16:43:19 +0800 Subject: [PATCH] Fix test --- internal/statements/join.go | 6 +++--- internal/statements/query.go | 6 +++--- internal/statements/statement.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/statements/join.go b/internal/statements/join.go index 9be98ae9..798aa002 100644 --- a/internal/statements/join.go +++ b/internal/statements/join.go @@ -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: diff --git a/internal/statements/query.go b/internal/statements/query.go index 54cb5a40..ca106208 100644 --- a/internal/statements/query.go +++ b/internal/statements/query.go @@ -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 { diff --git a/internal/statements/statement.go b/internal/statements/statement.go index 516adff1..ae38ca27 100644 --- a/internal/statements/statement.go +++ b/internal/statements/statement.go @@ -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 }