From 221ba2eeb3d33a59f82d6445111f59618567cdc4 Mon Sep 17 00:00:00 2001 From: Pin-Yi Song <611077101@mail.nknu.edu.tw> Date: Thu, 31 Jul 2025 23:38:13 +0800 Subject: [PATCH 1/2] fix: add the ignore condition. Signed-off-by: Pin-Yi Song <611077101@mail.nknu.edu.tw> --- .../Controllers/Database/StructureController.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index e378528f01..8e89dc4f2c 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -605,16 +605,19 @@ class StructureController extends AbstractController $searchDoDBInTruename = array_search($table, $replicaInfo['Do_DB']); $searchDoDBInDB = array_search($this->db, $replicaInfo['Do_DB']); - $do = (is_string($searchDoDBInTruename) && strlen($searchDoDBInTruename) > 0) - || (is_string($searchDoDBInDB) && strlen($searchDoDBInDB) > 0) - || ($nbServReplicaDoDb == 0 && $nbServReplicaIgnoreDb == 0) - || $this->hasTable($replicaInfo['Wild_Do_Table'], $table); - $searchDb = array_search($this->db, $replicaInfo['Ignore_DB']); $searchTable = array_search($table, $replicaInfo['Ignore_Table']); $ignored = (is_string($searchTable) && strlen($searchTable) > 0) || (is_string($searchDb) && strlen($searchDb) > 0) || $this->hasTable($replicaInfo['Wild_Ignore_Table'], $table); + + // Only set do = true if table is not ignored + if (!$ignored) { + $do = (is_string($searchDoDBInTruename) && strlen($searchDoDBInTruename) > 0) + || (is_string($searchDoDBInDB) && strlen($searchDoDBInDB) > 0) + || ($nbServReplicaDoDb == 0 && $nbServReplicaIgnoreDb == 0) + || $this->hasTable($replicaInfo['Wild_Do_Table'], $table); + } } return [ From 5496edd11dba5f7fcb40ac81a2c1f8e697601091 Mon Sep 17 00:00:00 2001 From: Pin-Yi Song <611077101@mail.nknu.edu.tw> Date: Tue, 5 Aug 2025 22:57:24 +0800 Subject: [PATCH 2/2] style: phpcs fix. Signed-off-by: Pin-Yi Song <611077101@mail.nknu.edu.tw> --- libraries/classes/Controllers/Database/StructureController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index 8e89dc4f2c..eb1a0a406f 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -612,7 +612,7 @@ class StructureController extends AbstractController || $this->hasTable($replicaInfo['Wild_Ignore_Table'], $table); // Only set do = true if table is not ignored - if (!$ignored) { + if (! $ignored) { $do = (is_string($searchDoDBInTruename) && strlen($searchDoDBInTruename) > 0) || (is_string($searchDoDBInDB) && strlen($searchDoDBInDB) > 0) || ($nbServReplicaDoDb == 0 && $nbServReplicaIgnoreDb == 0)