Fixed OFFSET clause for SQLServer

cakephp · Apr 12, 2014 · d7213e0 · d7213e0
1 parent 3bf580d
commit d7213e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Database/Dialect/SqlserverDialectTrait.php b/src/Database/Dialect/SqlserverDialectTrait.php
@@ -64,7 +64,7 @@ protected function _selectQueryTranslator($query) {
 			$query->limit(null);
 
 			if (!$query->clause('order')) {
-				$query->order([(string)$query->connection()->newQuery()->select(['NULL'])]);
+				$query->order([$query->connection()->newQuery()->select(['NULL'])]);
 			}
 		}
 

diff --git a/src/Database/Expression/OrderByExpression.php b/src/Database/Expression/OrderByExpression.php
@@ -40,7 +40,7 @@ public function sql(ValueBinder $generator) {
 		$order = [];
 		foreach ($this->_conditions as $k => $direction) {
 			if ($direction instanceof ExpressionInterface) {
-				$direction = $direction->sql($generator);
+				$direction = sprintf('(%s)', $direction->sql($generator));
 			}
 			$order[] = is_numeric($k) ? $direction : sprintf('%s %s', $k, $direction);
 		}