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

Fix test

This commit is contained in:
Lunny Xiao 2023-10-25 13:45:02 +08:00
parent f58fb48eba
commit b538da1813
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/statements/query.go
View File

@ -33,7 +33,7 @@ func (statement *Statement) GenQuerySQL(sqlOrArgs ...interface{}) (string, []int
}
buf := builder.NewWriter()
if err := statement.writeSelect(buf, statement.genSelectColumnStr(), true); err != nil {
if err := statement.writeSelect(buf, statement.genSelectColumnStr(), false); err != nil {
return "", nil, err
}
return buf.String(), buf.Args(), nil
@ -120,7 +120,7 @@ func (statement *Statement) GenGetSQL(bean interface{}) (string, []interface{},
}
buf := builder.NewWriter()
if err := statement.writeSelect(buf, columnStr, true); err != nil {
if err := statement.writeSelect(buf, columnStr, false); err != nil {
return "", nil, err
}
return buf.String(), buf.Args(), nil
@ -240,7 +240,7 @@ func (statement *Statement) writeForUpdate(w *builder.BytesWriter) error {
return err
}
func (statement *Statement) writeSelect(buf *builder.BytesWriter, columnStr string, needLimit bool) error {
func (statement *Statement) writeSelect(buf *builder.BytesWriter, columnStr string, isCounting bool) error {
dbType := statement.dialect.URI().DBType
if statement.isUsingLegacyLimitOffset() {
if dbType == "mssql" {
@ -258,13 +258,13 @@ func (statement *Statement) writeSelect(buf *builder.BytesWriter, columnStr stri
statement.writeGroupBy,
statement.writeHaving,
func(bw *builder.BytesWriter) (err error) {
if dbType == "mssql" && len(statement.orderBy) == 0 && needLimit {
if dbType == "mssql" && len(statement.orderBy) == 0 {
// ORDER BY is mandatory to use OFFSET and FETCH clause (only in sqlserver)
if statement.LimitN == nil && statement.Start == 0 {
// no need to add
return
}
if statement.IsDistinct || len(statement.GroupByStr) > 0 {
if statement.IsDistinct || len(statement.GroupByStr) > 0 || isCounting {
// the order-by column should be one of distincts or group-bys
// order by the first column
_, err = bw.WriteString(" ORDER BY 1 ASC")
@ -405,7 +405,7 @@ func (statement *Statement) GenFindSQL(autoCond builder.Cond) (string, []interfa
statement.cond = statement.cond.And(autoCond)
buf := builder.NewWriter()
if err := statement.writeSelect(buf, statement.genSelectColumnStr(), true); err != nil {
if err := statement.writeSelect(buf, statement.genSelectColumnStr(), false); err != nil {
return "", nil, err
}
return buf.String(), buf.Args(), nil