From d7213e0dddd8c56130e486d70b0f26534b7e1537 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Sat, 12 Apr 2014 10:39:57 +0200 Subject: [PATCH] Fixed OFFSET clause for SQLServer --- src/Database/Dialect/SqlserverDialectTrait.php | 2 +- src/Database/Expression/OrderByExpression.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Database/Dialect/SqlserverDialectTrait.php b/src/Database/Dialect/SqlserverDialectTrait.php index 15965cfd0f5..35cf26ef4ad 100644 --- 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 index 55cc44aaafd..5d598383014 100644 --- 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); }