From 879b2331e11ff90030c514aa5eb1459004ff14c3 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 4 Mar 2013 11:50:06 +0100 Subject: Generate simpler query for MSSQL when offset in limit clause is not set --- program/lib/Roundcube/rcube_db_mssql.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/program/lib/Roundcube/rcube_db_mssql.php b/program/lib/Roundcube/rcube_db_mssql.php index 84fe22bbc..a1ce80a87 100644 --- a/program/lib/Roundcube/rcube_db_mssql.php +++ b/program/lib/Roundcube/rcube_db_mssql.php @@ -110,6 +110,10 @@ class rcube_db_mssql extends rcube_db $query = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($limit + $offset) . ' ', $query); + if (!$offset) { + return $query; + } + $query = 'SELECT * FROM (SELECT TOP ' . $limit . ' * FROM (' . $query . ') AS inner_tbl'; if ($orderby !== false) { $query .= ' ORDER BY ' . $order . ' '; -- cgit v1.2.3