diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-05 15:17:32 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-05 15:17:32 +0100 |
| commit | 99013ed3ed0ea5641a6c6b6afa08a7befb579cb0 (patch) | |
| tree | ec85d2c3b418d87366d88f9efc96c03bfa839fdb /system/database/drivers/oci8/oci8_result.php | |
| parent | 62d6ee48b319dc7ec92b4a14fa8dbd3601060544 (diff) | |
| parent | 57bdeb61bf199d1ae3ceaede4e9a9af8290ce715 (diff) | |
Rename property _commit to commit_mode and merge upstream changes
Diffstat (limited to 'system/database/drivers/oci8/oci8_result.php')
| -rw-r--r-- | system/database/drivers/oci8/oci8_result.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index ff6f7a405..9ac96fc52 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -39,15 +39,23 @@ class CI_DB_oci8_result extends CI_DB_result { public $stmt_id; public $curs_id; public $limit_used; - - // This will be changed by CI_DB_driver, but it's good to have a default: - public $commit_mode = OCI_DEFAULT; + public $commit_mode; /* Overwriting the parent here, so we have a way to know if it's * already called or not: */ public $num_rows; + public function __construct(&$driver_object) + { + parent::__construct($driver_object); + $this->stmt_id = $driver_object->stmt_id; + $this->curs_id = $driver_object->curs_id; + $this->limit_used = $driver_object->limit_used; + $this->commit_mode =& $driver_object->commit_mode; + $driver_object->stmt_id = FALSE; + } + /** * Number of rows in the result set. * |