diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-03-07 09:10:17 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-03-07 09:10:17 +0100 |
| commit | 8108b612fb80327215ae66b53c75c158d6f07e62 (patch) | |
| tree | dc2c4542c556e01d41b146659b421be7d14d1ba9 | |
| parent | c1721f15c72fb0b062a381d89dadaf1e86f8576b (diff) | |
[ci skip] Fix transactions for the ibase driver
Reported via the forums: http://forum.codeigniter.com/thread-64559.html
| -rw-r--r-- | system/database/drivers/ibase/ibase_driver.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/drivers/ibase/ibase_driver.php b/system/database/drivers/ibase/ibase_driver.php index cbc1022ff..c1055c1e6 100644 --- a/system/database/drivers/ibase/ibase_driver.php +++ b/system/database/drivers/ibase/ibase_driver.php @@ -126,7 +126,7 @@ class CI_DB_ibase_driver extends CI_DB { */ protected function _execute($sql) { - return ibase_query($this->conn_id, $sql); + return ibase_query(isset($this->_ibase_trans) ? $this->_ibase_trans : $this->conn_id, $sql); } // -------------------------------------------------------------------- diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 45e891e89..d963b57dc 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -37,6 +37,7 @@ Bug fixes for 3.0.5 - Fixed a bug (#4449) - :doc:`Query Builder <database/query_builder>` method ``join()`` breaks conditions containing ``IS NULL``, ``IS NOT NULL``. - Fixed a bug (#4491) - :doc:`Session Library <libraries/sessions>` didn't clean-up internal variables for emulated locks with the 'redis' driver. - Fixed a bug where :doc:`Session Library <libraries/sessions>` didn't clean-up internal variables for emulated locks with the 'memcached' driver. +- Fixed a bug where :doc:`Database <database/index>` transactions didn't work with the 'ibase' driver. Version 3.0.4 ============= |