From 18bf9e5a4c753bc6cace9752d5eee114a501f505 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Thu, 6 Jun 2024 07:56:05 -0400 Subject: [PATCH 1/5] Refactor InitDbFixture to skip checkIntegrity for Oracle DB. --- framework/test/InitDbFixture.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/framework/test/InitDbFixture.php b/framework/test/InitDbFixture.php index f18bd16b97a..6cddfbffbd9 100644 --- a/framework/test/InitDbFixture.php +++ b/framework/test/InitDbFixture.php @@ -95,8 +95,11 @@ public function checkIntegrity($check) if (!$this->db instanceof \yii\db\Connection) { return; } + foreach ($this->schemas as $schema) { - $this->db->createCommand()->checkIntegrity($check, $schema)->execute(); + if ($this->db->getDriverName() !== 'oci') { + $this->db->createCommand()->checkIntegrity($check, $schema)->execute(); + } } } } From 54f541b72a4b2633d99ffc08499d57080187eb43 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Thu, 6 Jun 2024 08:18:01 -0400 Subject: [PATCH 2/5] Refactor InitDbFixture to skip checkIntegrity for Oracle DB. --- framework/test/InitDbFixture.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/framework/test/InitDbFixture.php b/framework/test/InitDbFixture.php index 6cddfbffbd9..6007b1a0ebd 100644 --- a/framework/test/InitDbFixture.php +++ b/framework/test/InitDbFixture.php @@ -96,10 +96,12 @@ public function checkIntegrity($check) return; } + if ($this->db->getDriverName() === 'oci') { + return; + } + foreach ($this->schemas as $schema) { - if ($this->db->getDriverName() !== 'oci') { - $this->db->createCommand()->checkIntegrity($check, $schema)->execute(); - } + $this->db->createCommand()->checkIntegrity($check, $schema)->execute(); } } } From 917138604912839d9237c527ece096fb0e62dbf3 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Thu, 6 Jun 2024 08:28:31 -0400 Subject: [PATCH 3/5] Add line in `CHANGELOG.md`. --- framework/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 8f2209d17ff..6b02265bfab 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -39,6 +39,7 @@ Yii Framework 2 Change Log - Enh #20134: Raise minimum `PHP` version to `7.3` (@terabytesoftw) - Enh #20171: Support JSON columns for MariaDB 10.4 or higher (@terabytesoftw) - New #20137: Added `yii\caching\CallbackDependency` to allow using a callback to determine if a cache dependency is still valid (laxity7) +- Bug #16116: Codeception: oci does not support enabling/disabling integrity check. (@terabytesoftw) 2.0.49.2 October 12, 2023 From 03a8c3cfdf2b20d88f4c21be8cadc8ba62a580d0 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Thu, 6 Jun 2024 08:31:40 -0400 Subject: [PATCH 4/5] Update line in `CHANGELOG.md`. --- framework/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 6b02265bfab..18cb54a0be9 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -39,7 +39,7 @@ Yii Framework 2 Change Log - Enh #20134: Raise minimum `PHP` version to `7.3` (@terabytesoftw) - Enh #20171: Support JSON columns for MariaDB 10.4 or higher (@terabytesoftw) - New #20137: Added `yii\caching\CallbackDependency` to allow using a callback to determine if a cache dependency is still valid (laxity7) -- Bug #16116: Codeception: oci does not support enabling/disabling integrity check. (@terabytesoftw) +- Bug #16116: Codeception: oci does not support enabling/disabling integrity check (@terabytesoftw) 2.0.49.2 October 12, 2023 From aff8e023d9847ee718a1437303e74b5f402a127f Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Wed, 12 Jun 2024 17:12:20 +0300 Subject: [PATCH 5/5] Update CHANGELOG.md --- framework/CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 18cb54a0be9..7ddde3d7450 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -4,7 +4,7 @@ Yii Framework 2 Change Log 2.0.51 under development ------------------------ -- no changes in this release. +- Bug #16116: Codeception: oci does not support enabling/disabling integrity check (@terabytesoftw) 2.0.50 May 30, 2024 @@ -39,7 +39,6 @@ Yii Framework 2 Change Log - Enh #20134: Raise minimum `PHP` version to `7.3` (@terabytesoftw) - Enh #20171: Support JSON columns for MariaDB 10.4 or higher (@terabytesoftw) - New #20137: Added `yii\caching\CallbackDependency` to allow using a callback to determine if a cache dependency is still valid (laxity7) -- Bug #16116: Codeception: oci does not support enabling/disabling integrity check (@terabytesoftw) 2.0.49.2 October 12, 2023