diff options
| author | Eric Roberts <eric@cryode.com> | 2012-07-11 10:43:36 +0200 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2012-07-11 10:43:36 +0200 |
| commit | fa337081ced1b1d34805d28f8307f069edf16cdf (patch) | |
| tree | 63e524a282d7a8efef45b205c42f9b8e4a06b89b /system/database/drivers/sqlsrv/sqlsrv_result.php | |
| parent | 6bf1e50bdff62d4842cd5a94d324e0768c5ace3e (diff) | |
| parent | 78e5fdfe4399975b75b8697f64e270b1799ee2f1 (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/drivers/sqlsrv/sqlsrv_result.php')
| -rw-r--r-- | system/database/drivers/sqlsrv/sqlsrv_result.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/system/database/drivers/sqlsrv/sqlsrv_result.php b/system/database/drivers/sqlsrv/sqlsrv_result.php index f9d5a0d29..fb7a68647 100644 --- a/system/database/drivers/sqlsrv/sqlsrv_result.php +++ b/system/database/drivers/sqlsrv/sqlsrv_result.php @@ -21,7 +21,7 @@ * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) * @link http://codeigniter.com - * @since Version 2.0.3 + * @since Version 1.0 * @filesource */ @@ -33,6 +33,7 @@ * @category Database * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/database/ + * @since 2.0.3 */ class CI_DB_sqlsrv_result extends CI_DB_result { @@ -43,7 +44,9 @@ class CI_DB_sqlsrv_result extends CI_DB_result { */ public function num_rows() { - return @sqlsrv_num_rows($this->result_id); + return is_int($this->num_rows) + ? $this->num_rows + : $this->num_rows = @sqlsrv_num_rows($this->result_id); } // -------------------------------------------------------------------- @@ -142,11 +145,12 @@ class CI_DB_sqlsrv_result extends CI_DB_result { * * Returns the result set as an object * + * @param string * @return object */ - protected function _fetch_object() + protected function _fetch_object($class_name = 'stdClass') { - return sqlsrv_fetch_object($this->result_id); + return sqlsrv_fetch_object($this->result_id, $class_name); } } |