From 8b71bc904212d932faa25dc2be49c85c60e847e5 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 14 Feb 2019 14:49:00 +0200 Subject: [ci skip] Merge pull request #5692 from ytetsuro/patch-2 Fixed bug that can not be changed from not null to null in oci. --- system/database/drivers/oci8/oci8_forge.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'system/database/drivers/oci8/oci8_forge.php') diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php index 20217f2b8..2f491d8f4 100644 --- a/system/database/drivers/oci8/oci8_forge.php +++ b/system/database/drivers/oci8/oci8_forge.php @@ -81,6 +81,13 @@ 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'; + // -------------------------------------------------------------------- /** -- cgit v1.2.3-24-g4f1b 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 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'system/database/drivers/oci8/oci8_forge.php') 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'; // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b