Range of changes to MySQL execution

[system-cli] / src / Commands / RestoreCommand.php

diff --git a/src/Commands/RestoreCommand.php b/src/Commands/RestoreCommand.php
index 3fb91540dc8328696ba269741b6714579a5d3deb..4bbdbc8e11fc4cbd686407389f09320b13f99d1e 100644 (file)
--- a/src/Commands/RestoreCommand.php
+++ b/src/Commands/RestoreCommand.php
@@ -134,7 +134,7 @@ class RestoreCommand extends Command
 
     protected function restoreEnv(string $extractDir, string $appDir, OutputInterface $output, InteractiveConsole $interactions): array
     {
-        $oldEnv = EnvironmentLoader::load($extractDir);
+        $oldEnv = EnvironmentLoader::loadMergedWithCurrentEnv($extractDir);
         $currentEnv = EnvironmentLoader::load($appDir);
         $envContents = file_get_contents(Paths::join($extractDir, '.env'));
         $appEnvPath = Paths::real(Paths::join($appDir, '.env'));
@@ -192,7 +192,7 @@ class RestoreCommand extends Command
     protected function restoreDatabase(string $appDir, string $extractDir): void
     {
         $dbDump = Paths::join($extractDir, 'db.sql');
-        $currentEnv = EnvironmentLoader::load($appDir);
+        $currentEnv = EnvironmentLoader::loadMergedWithCurrentEnv($appDir);
         $mysql = MySqlRunner::fromEnvOptions($currentEnv);
 
         // Drop existing tables