From a0744323430f78e869e61d5412dff927fc512878 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 14 Feb 2019 14:57:54 +0200 Subject: [ci skip] Polish changes from PR #5692, apply them to pdo/oci and add a changelog entry --- system/database/drivers/oci8/oci8_forge.php | 10 +++++----- system/database/drivers/pdo/subdrivers/pdo_oci_forge.php | 7 +++++++ user_guide_src/source/changelog.rst | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php index 2f491d8f4..58f3c3913 100644 --- a/system/database/drivers/oci8/oci8_forge.php +++ b/system/database/drivers/oci8/oci8_forge.php @@ -82,11 +82,11 @@ class CI_DB_oci8_forge extends CI_DB_forge { protected $_unsigned = FALSE; /** - * NULL value representation in CREATE/ALTER TABLE statements - * - * @var string - */ - protected $_null = 'NULL'; + * NULL value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_null = 'NULL'; // -------------------------------------------------------------------- diff --git a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php index 0abda5930..b5d3eb143 100644 --- a/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php +++ b/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php @@ -74,6 +74,13 @@ class CI_DB_pdo_oci_forge extends CI_DB_pdo_forge { */ protected $_unsigned = FALSE; + /** + * NULL value representation in CREATE/ALTER TABLE statements + * + * @var string + */ + protected $_null = 'NULL'; + // -------------------------------------------------------------------- /** diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index bd66baa3f..3c4e87023 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -12,6 +12,7 @@ Bug fixes for 3.1.11 ==================== - Fixed a bug (#5681) - :doc:`Database Forge ` method ``modify_column()`` produced erroneous SQL for ``DEFAULT`` attribute changes under PostgreSQL, Firebird. +- Fixed a bug (#5692) - :doc:`Database Forge ` didn't handle column nullability with the 'oci8', 'pdo/oci' drivers. Version 3.1.10 ============== -- cgit v1.2.3-24-g4f1b