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 2022-05-30 18:23:53 +08:00
parent 5711ab9918
commit 5fa0a473c7
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/statements/cond.go
View File

@ -19,7 +19,7 @@ func (q *QuoteReplacer) Write(p []byte) (n int, err error) {
return q.BytesWriter.Builder.WriteString(c) return q.BytesWriter.Builder.WriteString(c)
} }
func (statement *Statement) quoteReplacer(w *builder.BytesWriter) *QuoteReplacer { func (statement *Statement) QuoteReplacer(w *builder.BytesWriter) *QuoteReplacer {
return &QuoteReplacer{ return &QuoteReplacer{
BytesWriter: w, BytesWriter: w,
quoter: statement.dialect.Quoter(), quoter: statement.dialect.Quoter(),
@ -35,7 +35,7 @@ func (statement *Statement) Where(query interface{}, args ...interface{}) *State
func (statement *Statement) And(query interface{}, args ...interface{}) *Statement { func (statement *Statement) And(query interface{}, args ...interface{}) *Statement {
switch qr := query.(type) { switch qr := query.(type) {
case string: case string:
cond := builder.Expr(statement.ReplaceQuote(qr), args...) cond := builder.Expr(qr, args...)
statement.cond = statement.cond.And(cond) statement.cond = statement.cond.And(cond)
case map[string]interface{}: case map[string]interface{}:
cond := make(builder.Eq) cond := make(builder.Eq)

12
internal/statements/query.go
View File

@ -231,7 +231,7 @@ func (statement *Statement) genSelectSQL(columnStr string, needLimit, needOrderB
} }
condWriter := builder.NewWriter() condWriter := builder.NewWriter()
if err := statement.cond.WriteTo(statement.quoteReplacer(condWriter)); err != nil { if err := statement.cond.WriteTo(statement.QuoteReplacer(condWriter)); err != nil {
return "", nil, err return "", nil, err
} }
@ -282,7 +282,7 @@ func (statement *Statement) genSelectSQL(columnStr string, needLimit, needOrderB
if _, err := fmt.Fprint(mssqlCondi, whereStr); err != nil { if _, err := fmt.Fprint(mssqlCondi, whereStr); err != nil {
return "", nil, err return "", nil, err
} }
if err := utils.WriteBuilder(mssqlCondi, statement.quoteReplacer(condWriter)); err != nil { if err := utils.WriteBuilder(mssqlCondi, statement.QuoteReplacer(condWriter)); err != nil {
return "", nil, err return "", nil, err
} }
} }
@ -311,7 +311,7 @@ func (statement *Statement) genSelectSQL(columnStr string, needLimit, needOrderB
if _, err := fmt.Fprint(buf, whereStr); err != nil { if _, err := fmt.Fprint(buf, whereStr); err != nil {
return "", nil, err return "", nil, err
} }
if err := utils.WriteBuilder(buf, statement.quoteReplacer(condWriter)); err != nil { if err := utils.WriteBuilder(buf, statement.QuoteReplacer(condWriter)); err != nil {
return "", nil, err return "", nil, err
} }
} }
@ -409,7 +409,7 @@ func (statement *Statement) GenExistSQL(bean ...interface{}) (string, []interfac
if _, err := fmt.Fprintf(buf, " WHERE "); err != nil { if _, err := fmt.Fprintf(buf, " WHERE "); err != nil {
return "", nil, err return "", nil, err
} }
if err := statement.Conds().WriteTo(buf); err != nil { if err := statement.Conds().WriteTo(statement.QuoteReplacer(buf)); err != nil {
return "", nil, err return "", nil, err
} }
} }
@ -424,7 +424,7 @@ func (statement *Statement) GenExistSQL(bean ...interface{}) (string, []interfac
return "", nil, err return "", nil, err
} }
if statement.Conds().IsValid() { if statement.Conds().IsValid() {
if err := statement.Conds().WriteTo(buf); err != nil { if err := statement.Conds().WriteTo(statement.QuoteReplacer(buf)); err != nil {
return "", nil, err return "", nil, err
} }
if _, err := fmt.Fprintf(buf, " AND "); err != nil { if _, err := fmt.Fprintf(buf, " AND "); err != nil {
@ -445,7 +445,7 @@ func (statement *Statement) GenExistSQL(bean ...interface{}) (string, []interfac
if _, err := fmt.Fprintf(buf, " WHERE "); err != nil { if _, err := fmt.Fprintf(buf, " WHERE "); err != nil {
return "", nil, err return "", nil, err
} }
if err := statement.Conds().WriteTo(buf); err != nil { if err := statement.Conds().WriteTo(statement.QuoteReplacer(buf)); err != nil {
return "", nil, err return "", nil, err
} }
} }

2
session_delete.go
View File

@ -122,7 +122,7 @@ func (session *Session) Delete(beans ...interface{}) (int64, error) {
} }
} }
if err = session.statement.Conds().WriteTo(condWriter); err != nil { if err = session.statement.Conds().WriteTo(session.statement.QuoteReplacer(condWriter)); err != nil {
return 0, err return 0, err
} }

2
session_update.go
View File

@ -348,7 +348,7 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
if cond.IsValid() { if cond.IsValid() {
fmt.Fprint(whereWriter, "WHERE ") fmt.Fprint(whereWriter, "WHERE ")
} }
if err := cond.WriteTo(whereWriter); err != nil { if err := cond.WriteTo(st.QuoteReplacer(whereWriter)); err != nil {
return 0, err return 0, err
} }
if err := st.WriteOrderBy(whereWriter); err != nil { if err := st.WriteOrderBy(whereWriter); err != nil {