From 193252dc5f1d76428f07e409c72b7fd64aaa4702 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Thu, 28 Jan 2016 20:13:25 +0100 Subject: [PATCH] PdoDriver::applyLimit() is the same as SqlsrvDriver --- src/Dibi/Drivers/PdoDriver.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php index 4f6ca0bc..2cab7fea 100644 --- a/src/Dibi/Drivers/PdoDriver.php +++ b/src/Dibi/Drivers/PdoDriver.php @@ -443,10 +443,11 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver case 'sqlsrv': case 'dblib': if (version_compare($this->serverVersion, '11.0') >= 0) { // 11 == SQL Server 2012 - if ($limit !== NULL || $offset) { - // requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx - $sql .= ' OFFSET ' . (int) $offset . ' ROWS ' - . 'FETCH NEXT ' . (int) $limit . ' ROWS ONLY'; + // requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx + if ($limit !== NULL) { + $sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit); + } elseif ($offset) { + $sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset); } break; }