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

Fix some problems

This commit is contained in:
Lunny Xiao 2023-07-11 13:24:55 +08:00
parent 324d21267c
commit 203ebdaab9
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
internal/statements/join.go
View File

@ -36,14 +36,16 @@ func (statement *Statement) writeJoins(w builder.Writer) error {
func (statement *Statement) writeJoin(buf builder.Writer, join join) error { func (statement *Statement) writeJoin(buf builder.Writer, join join) error {
// write join operator // write join operator
if _, err := fmt.Fprintf(buf, " %v JOIN ", join.op); err != nil { if _, err := fmt.Fprintf(buf, " %v JOIN", join.op); err != nil {
return err return err
} }
// write join table or subquery // write join table or subquery
switch tp := join.table.(type) { switch tp := join.table.(type) {
case builder.Builder: case builder.Builder:
fmt.Fprintf(buf, "(") if _, err := fmt.Fprintf(buf, " ("); err != nil {
return err
}
// statement.ReplaceQuote(subSQL), // statement.ReplaceQuote(subSQL),
if err := tp.WriteTo(buf); err != nil { if err := tp.WriteTo(buf); err != nil {
return err return err
@ -53,9 +55,13 @@ func (statement *Statement) writeJoin(buf builder.Writer, join join) error {
aliasName := statement.dialect.Quoter().Trim(fields[len(fields)-1]) aliasName := statement.dialect.Quoter().Trim(fields[len(fields)-1])
aliasName = schemas.CommonQuoter.Trim(aliasName) aliasName = schemas.CommonQuoter.Trim(aliasName)
fmt.Fprintf(buf, ") %s", statement.quote(aliasName)) if _, err := fmt.Fprintf(buf, ") %s", statement.quote(aliasName)); err != nil {
return err
}
case *builder.Builder: case *builder.Builder:
fmt.Fprintf(buf, "(") if _, err := fmt.Fprintf(buf, " ("); err != nil {
return err
}
// statement.ReplaceQuote(subSQL), // statement.ReplaceQuote(subSQL),
if err := tp.WriteTo(buf); err != nil { if err := tp.WriteTo(buf); err != nil {
return err return err
@ -65,17 +71,23 @@ func (statement *Statement) writeJoin(buf builder.Writer, join join) error {
aliasName := statement.dialect.Quoter().Trim(fields[len(fields)-1]) aliasName := statement.dialect.Quoter().Trim(fields[len(fields)-1])
aliasName = schemas.CommonQuoter.Trim(aliasName) aliasName = schemas.CommonQuoter.Trim(aliasName)
fmt.Fprintf(buf, ") %s", statement.quote(aliasName)) if _, err := fmt.Fprintf(buf, ") %s", statement.quote(aliasName)); err != nil {
return err
}
default: default:
tbName := dialects.FullTableName(statement.dialect, statement.tagParser.GetTableMapper(), join.table, true) tbName := dialects.FullTableName(statement.dialect, statement.tagParser.GetTableMapper(), join.table, true)
if !utils.IsSubQuery(tbName) { if !utils.IsSubQuery(tbName) {
var sb strings.Builder var sb strings.Builder
_ = statement.dialect.Quoter().QuoteTo(&sb, tbName) if err := statement.dialect.Quoter().QuoteTo(&sb, tbName); err != nil {
return err
}
tbName = sb.String() tbName = sb.String()
} else { } else {
tbName = statement.ReplaceQuote(tbName) tbName = statement.ReplaceQuote(tbName)
} }
fmt.Fprintf(buf, tbName) if _, err := fmt.Fprint(buf, " ", tbName); err != nil {
return err
}
} }
// write on condition // write on condition
@ -85,7 +97,9 @@ func (statement *Statement) writeJoin(buf builder.Writer, join join) error {
switch condTp := join.condition.(type) { switch condTp := join.condition.(type) {
case string: case string:
fmt.Fprint(buf, statement.ReplaceQuote(condTp)) if _, err := fmt.Fprint(buf, statement.ReplaceQuote(condTp)); err != nil {
return err
}
case builder.Cond: case builder.Cond:
if err := condTp.WriteTo(buf); err != nil { if err := condTp.WriteTo(buf); err != nil {
return err return err