diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-12 22:26:12 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-12 22:26:12 +0200 |
| commit | 93ec20b8d9afbf8cb22ec6383b7fb24fe70330e8 (patch) | |
| tree | 8ad006bb39a8caee805fb9dd35912b32fc2d9778 /system/database/drivers/mssql/mssql_driver.php | |
| parent | 7ecc5cda6647a4b316b44dc40d5925d9ef63c908 (diff) | |
| parent | 98ebf4351f8aad58504cd7318ddd94faf0dec482 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/database/drivers/mssql/mssql_driver.php')
| -rw-r--r-- | system/database/drivers/mssql/mssql_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index a62ea94b3..a5ace02e6 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -465,7 +465,7 @@ class CI_DB_mssql_driver extends CI_DB { $orderby = 'ORDER BY '.implode(', ', $this->qb_orderby); // We have to strip the ORDER BY clause - $sql = trim(substr($sql, 0, strrpos($sql, 'ORDER BY '.$orderby))); + $sql = trim(substr($sql, 0, strrpos($sql, $orderby))); return 'SELECT '.(count($this->qb_select) === 0 ? '*' : implode(', ', $this->qb_select))." FROM (\n" .preg_replace('/^(SELECT( DISTINCT)?)/i', '\\1 ROW_NUMBER() OVER('.$orderby.') AS '.$this->escape_identifiers('CI_rownum').', ', $sql) |