bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-03 03:39:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix issue in unnacessary quoting of fields in select statement of gdb.Model

Browse Source
This commit is contained in:
John
2020-04-27 16:30:53 +08:00
parent fa66bf5d9d
commit 5db10add4a
5 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
database/gdb/gdb_model_select.go
View File

@ -42,10 +42,12 @@ func (m *Model) All(where ...interface{}) (Result, error) {
}
conditionWhere += softDeletingCondition
}
// DO NOT quote the m.fields where, in case of fields like:
// DISTINCT t.user_id uid
return m.doGetAll(
fmt.Sprintf(
"SELECT %s FROM %s%s",
m.db.QuoteString(m.fields),
m.fields,
m.tables,
conditionWhere+conditionExtra,
),
@ -249,7 +251,9 @@ func (m *Model) Count(where ...interface{}) (int, error) {
}
countFields := "COUNT(1)"
if m.fields != "" && m.fields != "*" {
countFields = fmt.Sprintf(`COUNT(%s)`, m.db.QuoteString(m.fields))
// DO NOT quote the m.fields here, in case of fields like:
// DISTINCT t.user_id uid
countFields = fmt.Sprintf(`COUNT(%s)`, m.fields)
}
var (
softDeletingCondition = m.getConditionForSoftDeleting()