diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-06-13 12:26:31 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-06-13 12:26:31 +0200 |
| commit | 7ff61363b7f153670e9c8e4972eb5b842fc4ea53 (patch) | |
| tree | b8aed57164c24e29e06ab37f24decbf4df25137f | |
| parent | 09d4eb6d6272251a598986552971d6ba311f7afb (diff) | |
[ci skip] Apply PR #5150 patch to pdo/oci and add changelog entry
| -rw-r--r-- | system/database/drivers/pdo/subdrivers/pdo_oci_forge.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/pdo/subdrivers/pdo_oci_forge.php b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php index c8983ee56..813207b8e 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php @@ -117,7 +117,7 @@ class CI_DB_pdo_oci_forge extends CI_DB_pdo_forge { if ($alter_type === 'MODIFY' && ! empty($field[$i]['new_name'])) { $sqls[] = $sql.' RENAME COLUMN '.$this->db->escape_identifiers($field[$i]['name']) - .' '.$this->db->escape_identifiers($field[$i]['new_name']); + .' TO '.$this->db->escape_identifiers($field[$i]['new_name']); } } } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index aed8413f7..97cad70d1 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -18,6 +18,7 @@ Bug fixes for 3.1.5 - Fixed a bug (#5084) - :doc:`XML-RPC Library <libraries/xmlrpc>` errored because of a variable name typo. - Fixed a bug (#5108) - :doc:`Inflector Helper <helpers/inflector_helper>` function :php:func:`singular()` didn't properly handle 'quizzes'. - Fixed a regression (#5131) - private controller methods triggered PHP errors instead of a 404 response. +- Fixed a bug (#5150) - :doc:`Database Forge <database/forge>` method ``modify_column()`` triggered an error while renaming columns with the 'oci8', 'pdo/oci' drivers. Version 3.1.4 ============= |