Force ORDER BY usage with OFFSET-FETCH on SQL Server

Close #3128 Close #3332 Close #3334 Close #3335
bcit-ci · Nov 18, 2014 · ed3fc51 · ed3fc51
1 parent 71f0099
commit ed3fc51
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php b/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
@@ -304,6 +304,9 @@ protected function _limit($sql)
 		// As of SQL Server 2012 (11.0.*) OFFSET is supported
 		if (version_compare($this->version(), '11', '>='))
 		{
+			// SQL Server OFFSET-FETCH can be used only with the ORDER BY clause
+			empty($this->qb_orderby) && $sql .= ' ORDER BY 1';
+
 			return $sql.' OFFSET '.(int) $this->qb_offset.' ROWS FETCH NEXT '.$this->qb_limit.' ROWS ONLY';
 		}
 

diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php
@@ -494,6 +494,9 @@ protected function _limit($sql)
 		// As of SQL Server 2012 (11.0.*) OFFSET is supported
 		if (version_compare($this->version(), '11', '>='))
 		{
+			// SQL Server OFFSET-FETCH can be used only with the ORDER BY clause
+			empty($this->qb_orderby) && $sql .= ' ORDER BY 1';
+
 			return $sql.' OFFSET '.(int) $this->qb_offset.' ROWS FETCH NEXT '.$this->qb_limit.' ROWS ONLY';
 		}
 

diff --git a/system/libraries/Session/drivers/Session_cookie.php b/system/libraries/Session/drivers/Session_cookie.php
@@ -486,7 +486,7 @@ protected function _sess_read()
 			$db_cache = $this->CI->db->cache_on;
 			$this->CI->db->cache_off();
 
-			$query = $this->CI->db->limit(1)->get($this->sess_table_name);
+			$query = $this->CI->db->get($this->sess_table_name);
 
 			// Was caching in effect?
 			if ($db_cache)