BUGFIX Fixing SortColumn alias to be recognised by MSSQL/PGSQL

silverstripe · May 3, 2012 · 37369ab · 37369ab
1 parent 521d436
commit 37369ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/model/DataQuery.php b/model/DataQuery.php
@@ -240,16 +240,16 @@ protected function ensureSelectContainsOrderbyColumns($query, $originalSelect =
 				// don't touch functions in the ORDER BY or function calls 
 				// selected as fields
 				if(strpos($k, '(') !== false) continue;
-
+
+				$col = str_replace('"', '', trim($k));
+				$parts = explode('.', $col);
+
 				// Pull through SortColumn references from the originalSelect variables
-				if(preg_match('/_SortColumn/', $k)) {
-					if(isset($originalSelect[$k])) $query->selectField($originalSelect[$k], $k);
+				if(preg_match('/_SortColumn/', $col)) {
+					if(isset($originalSelect[$col])) $query->selectField($originalSelect[$col], $col);
 					continue;
 				}
 
-				$col = str_replace('"', '', trim($k));
-				$parts = explode('.', $col);
-
 				if(count($parts) == 1) {
 					$databaseFields = DataObject::database_fields($baseClass);
 

diff --git a/model/SQLQuery.php b/model/SQLQuery.php
@@ -383,9 +383,9 @@ public function orderby($clauses = null, $direction = null, $clear = true) {
 
 					$clause = trim($clause);
 					$column = "_SortColumn{$i}";
-					
+
 					$this->selectField($clause, $column);
-					$this->orderby($column, $dir, false);
+					$this->orderby('"' . $column . '"', $dir, false);
 					$i++;
 				}
 			}