From 55954ba0812cb2f38a47a4b39152233fe952b8e2 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 18 Jun 2026 10:59:44 -0500 Subject: [PATCH] =?UTF-8?q?fix:=20remaining=20review=20items=20=E2=80=94?= =?UTF-8?q?=20prefix=20in=20trailing=20SQL,=20dead=20code,=20indent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - DatabaseImporter: apply #__ prefix replacement on trailing statement (was missing for SQL not terminated by semicolon) - SteppedBackupEngine: remove unused DatabaseDumper instantiation - SteppedBackupEngine: fix misaligned indentation in stepDatabase() --- .../com_mokosuitebackup/src/Engine/DatabaseImporter.php | 2 ++ .../src/Engine/SteppedBackupEngine.php | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/packages/com_mokosuitebackup/src/Engine/DatabaseImporter.php b/source/packages/com_mokosuitebackup/src/Engine/DatabaseImporter.php index 60093063..af681d5f 100644 --- a/source/packages/com_mokosuitebackup/src/Engine/DatabaseImporter.php +++ b/source/packages/com_mokosuitebackup/src/Engine/DatabaseImporter.php @@ -107,6 +107,8 @@ class DatabaseImporter $remaining = trim($currentStatement); if (!empty($remaining)) { + $remaining = str_replace('#__', $prefix, $remaining); + try { $db->setQuery($remaining); $db->execute(); diff --git a/source/packages/com_mokosuitebackup/src/Engine/SteppedBackupEngine.php b/source/packages/com_mokosuitebackup/src/Engine/SteppedBackupEngine.php index 4e9c53ca..7df30e7f 100644 --- a/source/packages/com_mokosuitebackup/src/Engine/SteppedBackupEngine.php +++ b/source/packages/com_mokosuitebackup/src/Engine/SteppedBackupEngine.php @@ -220,8 +220,7 @@ class SteppedBackupEngine $db = Factory::getDbo(); // Dump this single table - $dumper = new DatabaseDumper([]); - $sql = $this->dumpSingleTable($db, $table); + $sql = $this->dumpSingleTable($db, $table); // Append to a temp SQL file that will be added to ZIP in finalize $sqlFile = $session->archivePath . '.sql'; @@ -234,8 +233,9 @@ class SteppedBackupEngine . "SET SQL_MODE = \"NO_AUTO_VALUE_ON_ZERO\";\n" . "SET time_zone = \"+00:00\";\n\n"; if (file_put_contents($sqlFile, $header) === false) { - throw new \RuntimeException('Cannot write SQL dump: ' . $sqlFile); - } + throw new \RuntimeException('Cannot write SQL dump: ' . $sqlFile); + } + $flags = FILE_APPEND; }