xorm/xorm
xorm/xorm
64
359
Fork 208
Code Issues 373 Pull Requests 18 Actions Releases 35 Activity

Refactor orderby and support arguments #2150

Merged
lunny merged 14 commits from lunny/orderby into master 2022-05-31 03:00:29 +00:00
Conversation 8 Commits 14 Files Changed 18 +14 -14
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09156d1ecb - Show all commits

26
internal/statements/order_by.go
View File

@ -12,19 +12,19 @@ import (
)
func (statement *Statement) HasOrderBy() bool {
return statement.OrderStr != ""
return statement.orderStr != ""
}
// ResetOrderBy reset ordery conditions
func (statement *Statement) ResetOrderBy() {
statement.OrderStr = ""
statement.orderStr = ""
statement.orderArgs = nil
}
// WriteOrderBy write order by to writer
func (statement *Statement) WriteOrderBy(w builder.Writer) error {
if len(statement.OrderStr) > 0 {
if _, err := fmt.Fprintf(w, " ORDER BY %s", statement.OrderStr); err != nil {
if len(statement.orderStr) > 0 {
if _, err := fmt.Fprintf(w, " ORDER BY %s", statement.orderStr); err != nil {
return err
}
w.Append(statement.orderArgs...)
@ -34,10 +34,10 @@ func (statement *Statement) WriteOrderBy(w builder.Writer) error {
// OrderBy generate "Order By order" statement
func (statement *Statement) OrderBy(order string, args ...interface{}) *Statement {
if len(statement.OrderStr) > 0 {
statement.OrderStr += ", "
if len(statement.orderStr) > 0 {
statement.orderStr += ", "
}
statement.OrderStr += statement.ReplaceQuote(order)
statement.orderStr += statement.ReplaceQuote(order)
if len(args) > 0 {
statement.orderArgs = append(statement.orderArgs, args...)
}
@ -47,8 +47,8 @@ func (statement *Statement) OrderBy(order string, args ...interface{}) *Statemen
// Desc generate `ORDER BY xx DESC`
func (statement *Statement) Desc(colNames ...string) *Statement {
var buf strings.Builder
if len(statement.OrderStr) > 0 {
fmt.Fprint(&buf, statement.OrderStr, ", ")
if len(statement.orderStr) > 0 {
fmt.Fprint(&buf, statement.orderStr, ", ")
}
for i, col := range colNames {
if i > 0 {
@ -57,15 +57,15 @@ func (statement *Statement) Desc(colNames ...string) *Statement {
_ = statement.dialect.Quoter().QuoteTo(&buf, col)
fmt.Fprint(&buf, " DESC")
}
statement.OrderStr = buf.String()
statement.orderStr = buf.String()
return statement
}
// Asc provide asc order by query condition, the input parameters are columns.
func (statement *Statement) Asc(colNames ...string) *Statement {
var buf strings.Builder
if len(statement.OrderStr) > 0 {
fmt.Fprint(&buf, statement.OrderStr, ", ")
if len(statement.orderStr) > 0 {
fmt.Fprint(&buf, statement.orderStr, ", ")
}
for i, col := range colNames {
if i > 0 {
@ -74,6 +74,6 @@ func (statement *Statement) Asc(colNames ...string) *Statement {
_ = statement.dialect.Quoter().QuoteTo(&buf, col)
fmt.Fprint(&buf, " ASC")
}
statement.OrderStr = buf.String()
statement.orderStr = buf.String()
return statement
}

2
internal/statements/statement.go
View File

@ -43,7 +43,7 @@ type Statement struct {
Start int
LimitN *int
idParam schemas.PK
OrderStr string
orderStr string
orderArgs []interface{}
JoinStr string
joinArgs []interface{}