From beedfa1b53d1847f6cb1f31b0cafac184fbee156 Mon Sep 17 00:00:00 2001
From: jianzhiyao <zhiyao.jian@dreampix.cn>
Date: Mon, 26 Oct 2020 19:52:21 +0800
Subject: [PATCH] add UT

---
 client/orm/orm_test.go              | 34 +++++++++++++++++++++++++++++
 client/orm/structs/clauses/order.go |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/client/orm/orm_test.go b/client/orm/orm_test.go
index 565f6c60..8f057df1 100644
--- a/client/orm/orm_test.go
+++ b/client/orm/orm_test.go
@@ -21,6 +21,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"github.com/astaxie/beego/client/orm/structs/clauses"
 	"io/ioutil"
 	"math"
 	"os"
@@ -1077,6 +1078,26 @@ func TestOrderBy(t *testing.T) {
 	num, err = qs.OrderBy("-profile__age").Filter("user_name", "astaxie").Count()
 	throwFail(t, err)
 	throwFail(t, AssertIs(num, 1))
+
+	num, err = qs.OrderClauses(
+		clauses.OrderClause(
+			clauses.OrderColumn(`profile__age`),
+			clauses.OrderSortDescending(),
+		),
+	).Filter("user_name", "astaxie").Count()
+	throwFail(t, err)
+	throwFail(t, AssertIs(num, 1))
+
+	if IsMysql {
+		num, err = qs.OrderClauses(
+			clauses.OrderClause(
+				clauses.OrderColumn(`rand()`),
+				clauses.OrderRaw(),
+			),
+		).Filter("user_name", "astaxie").Count()
+		throwFail(t, err)
+		throwFail(t, AssertIs(num, 1))
+	}
 }
 
 func TestAll(t *testing.T) {
@@ -1163,6 +1184,19 @@ func TestValues(t *testing.T) {
 		throwFail(t, AssertIs(maps[2]["Profile"], nil))
 	}
 
+	num, err = qs.OrderClauses(
+		clauses.OrderClause(
+			clauses.OrderColumn("Id"),
+			clauses.OrderSortAscending(),
+		),
+	).Values(&maps)
+	throwFail(t, err)
+	throwFail(t, AssertIs(num, 3))
+	if num == 3 {
+		throwFail(t, AssertIs(maps[0]["UserName"], "slene"))
+		throwFail(t, AssertIs(maps[2]["Profile"], nil))
+	}
+
 	num, err = qs.OrderBy("Id").Values(&maps, "UserName", "Profile__Age")
 	throwFail(t, err)
 	throwFail(t, AssertIs(num, 3))
diff --git a/client/orm/structs/clauses/order.go b/client/orm/structs/clauses/order.go
index e1110eec..432bb8f4 100644
--- a/client/orm/structs/clauses/order.go
+++ b/client/orm/structs/clauses/order.go
@@ -71,7 +71,7 @@ func ParseOrder(expressions ...string) []*Order {
 
 func OrderColumn(column string) OrderOption {
 	return func(order *Order) {
-		order.column = column
+		order.column = strings.ReplaceAll(column, ExprSep, ExprDot)
 	}
 }