Changed to proper format the order by in sqlserver

cakephp · Jan 20, 2014 · e9d46bf · e9d46bf
1 parent 2af86ad
commit e9d46bf
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Database/Dialect/SqlserverDialectTrait.php b/src/Database/Dialect/SqlserverDialectTrait.php
@@ -52,7 +52,6 @@ protected function _selectQueryTranslator($query) {
 
 		if ($limit && $offset === null) {
 			// @todo implement TOP
-			$query->clause('order') || $query->order([$query->connection()->newQuery()->select(['NULL'])]);
 			throw new \Cake\Error\NotImplementedException();
 		}
 
@@ -64,7 +63,9 @@ protected function _selectQueryTranslator($query) {
 			$query->offset($query->newExpr()->add($offsetSql));
 			$query->limit(null);
 
-			$query->clause('order') || $query->order([$query->connection()->newQuery()->select(['NULL'])]);
+			if (!$query->clause('order')) {
+				$query->order([(string)$query->connection()->newQuery()->select(['NULL'])]);
+			}
 		}
 
 		return $query;