summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/cubrid/cubrid_result.php
diff options
context:
space:
mode:
authorEric Roberts <eric@cryode.com>2012-07-11 10:43:36 +0200
committerEric Roberts <eric@cryode.com>2012-07-11 10:43:36 +0200
commitfa337081ced1b1d34805d28f8307f069edf16cdf (patch)
tree63e524a282d7a8efef45b205c42f9b8e4a06b89b /system/database/drivers/cubrid/cubrid_result.php
parent6bf1e50bdff62d4842cd5a94d324e0768c5ace3e (diff)
parent78e5fdfe4399975b75b8697f64e270b1799ee2f1 (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/drivers/cubrid/cubrid_result.php')
-rw-r--r--system/database/drivers/cubrid/cubrid_result.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/system/database/drivers/cubrid/cubrid_result.php b/system/database/drivers/cubrid/cubrid_result.php
index 3eb9f7e3d..4a06a2d39 100644
--- a/system/database/drivers/cubrid/cubrid_result.php
+++ b/system/database/drivers/cubrid/cubrid_result.php
@@ -33,6 +33,7 @@
* @category Database
* @author Esen Sagynov
* @link http://codeigniter.com/user_guide/database/
+ * @since 2.1
*/
class CI_DB_cubrid_result extends CI_DB_result {
@@ -43,7 +44,9 @@ class CI_DB_cubrid_result extends CI_DB_result {
*/
public function num_rows()
{
- return @cubrid_num_rows($this->result_id);
+ return is_int($this->num_rows)
+ ? $this->num_rows
+ : $this->num_rows = @cubrid_num_rows($this->result_id);
}
// --------------------------------------------------------------------
@@ -157,11 +160,12 @@ class CI_DB_cubrid_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 cubrid_fetch_object($this->result_id);
+ return cubrid_fetch_object($this->result_id, $class_name);
}
}