From 4ea5fd2791df59bd46bc6ff8f073e18d31b2fb1c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 2 Sep 2013 10:06:32 +0800 Subject: [PATCH] improved Asc & Desc --- engine.go | 8 ++++---- session.go | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/engine.go b/engine.go index 0645ac35..c54e7aa9 100644 --- a/engine.go +++ b/engine.go @@ -179,16 +179,16 @@ func (engine *Engine) Limit(limit int, start ...int) *Session { return session.Limit(limit, start...) } -func (engine *Engine) Desc(colName string) *Session { +func (engine *Engine) Desc(colNames ...string) *Session { session := engine.NewSession() session.IsAutoClose = true - return session.Desc(colName) + return session.Desc(colNames...) } -func (engine *Engine) Asc(colName string) *Session { +func (engine *Engine) Asc(colNames ...string) *Session { session := engine.NewSession() session.IsAutoClose = true - return session.Asc(colName) + return session.Asc(colNames...) } func (engine *Engine) OrderBy(order string) *Session { diff --git a/session.go b/session.go index bfc1798b..582e0464 100644 --- a/session.go +++ b/session.go @@ -85,19 +85,21 @@ func (session *Session) OrderBy(order string) *Session { return session } -func (session *Session) Desc(colName string) *Session { +func (session *Session) Desc(colNames ...string) *Session { if session.Statement.OrderStr != "" { session.Statement.OrderStr += ", " } - session.Statement.OrderStr += colName + " desc" + sql := strings.Join(colNames, " desc, ") + session.Statement.OrderStr += sql + " desc" return session } -func (session *Session) Asc(colName string) *Session { +func (session *Session) Asc(colNames ...string) *Session { if session.Statement.OrderStr != "" { session.Statement.OrderStr += ", " } - session.Statement.OrderStr += colName + " asc" + sql := strings.Join(colNames, " asc, ") + session.Statement.OrderStr += sql + " asc" return session }