Skip to content

Refactor SQL formatting with db.QuoteWord #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Refactor SQL formatting with db.QuoteWord #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions server/internal/library/hgorm/dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ func LeftJoin(m *gdb.Model, masterTable, masterField, joinTable, alias, onField

// GenJoinOnRelation 生成关联表关联条件
func GenJoinOnRelation(masterTable, masterField, joinTable, alias, onField string) []string {
db := g.DB().GetCore()
masterTable = db.QuoteWord(masterTable)
masterField = db.QuoteWord(masterField)
joinTable = db.QuoteWord(joinTable)
alias = db.QuoteWord(alias)
onField = db.QuoteWord(onField)

relation := fmt.Sprintf("`%s`.`%s` = `%s`.`%s`", alias, onField, masterTable, masterField)
return []string{joinTable, alias, relation}
}
Expand All @@ -55,14 +62,15 @@ func JoinFields(ctx context.Context, entity interface{}, dao daoInstance, as str
}

var columns []string
db := g.DB().GetCore()
for _, v := range entityFs {
if !gstr.HasPrefix(v, as) {
continue
}

field := gstr.CaseSnakeFirstUpper(gstr.StrEx(v, as))
if _, ok := fields[field]; ok {
columns = append(columns, fmt.Sprintf("`%s`.`%s` as `%s`", dao.Table(), field, v))
columns = append(columns, fmt.Sprintf("%s.%s as %s", db.QuoteWord(dao.Table()), db.QuoteWord(field), db.QuoteWord(v)))
}
}

Expand Down Expand Up @@ -111,21 +119,21 @@ func GenJoinSelect(ctx context.Context, entity interface{}, dao daoInstance, joi
}
return nil, ""
}

db := g.DB().GetCore()
for _, field := range entityFields {
// 关联表
jd, joinField := getJoinAttribute(field)
if jd != nil {
if _, ok := jd.fields[joinField]; ok {
tmpFields = append(tmpFields, fmt.Sprintf("`%s`.`%s` as `%s`", jd.Alias, joinField, field))
tmpFields = append(tmpFields, fmt.Sprintf("%s.%s as %s", db.QuoteWord(jd.Alias), db.QuoteWord(joinField), db.QuoteWord(field)))
continue
}
}

// 主表
originalField := gstr.CaseSnakeFirstUpper(field)
if _, ok := masterFields[originalField]; ok {
tmpFields = append(tmpFields, fmt.Sprintf("`%s`.`%s`", dao.Table(), originalField))
tmpFields = append(tmpFields, fmt.Sprintf("%s.%s", db.QuoteWord(dao.Table()), db.QuoteWord(originalField)))
continue
}
}
Expand Down