From 2530dcbccd9c9ff7ce5a903e01bbf8601b726112 Mon Sep 17 00:00:00 2001
From: Jinzhu <wosmvp@gmail.com>
Date: Wed, 23 Mar 2016 10:29:52 +0800
Subject: [PATCH] Quote order column name, fix #918

---
 scope.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scope.go b/scope.go
index 65a438cf..c5660681 100644
--- a/scope.go
+++ b/scope.go
@@ -441,8 +441,10 @@ func (scope *Scope) callMethod(methodName string, reflectValue reflect.Value) {
 	}
 }
 
+var columnRegexp = regexp.MustCompile("^[a-zA-Z]+(\\.[a-zA-Z]+)*$") // only match string like `name`, `users.name`
+
 func (scope *Scope) quoteIfPossible(str string) string {
-	if regexp.MustCompile("^[a-zA-Z]+(.[a-zA-Z]+)*$").MatchString(str) {
+	if columnRegexp.MatchString(str) {
 		return scope.Quote(str)
 	}
 	return str
@@ -724,7 +726,12 @@ func (scope *Scope) orderSQL() string {
 	if len(scope.Search.orders) == 0 || scope.Search.countingQuery {
 		return ""
 	}
-	return " ORDER BY " + strings.Join(scope.Search.orders, ",")
+
+	var orders []string
+	for _, order := range scope.Search.orders {
+		orders = append(orders, scope.quoteIfPossible(order))
+	}
+	return " ORDER BY " + strings.Join(orders, ",")
 }
 
 func (scope *Scope) limitAndOffsetSQL() string {