Merge pull request #165 from fortrabbit/fix/mysqldump-ssl

Change ssl option until all dependencies fully support it

.github/workflows/docker.yml

@@ -7,7 +7,7 @@ env:
 jobs:
     build:
         name: Build
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         defaults:
             run:
                 working-directory: ./docker

CHANGELOG.md

@@ -1,5 +1,8 @@
 #  Changelog
 
+## 2.3.1 - 2023-04-03
+- More tweaks on the mysql command line options
+
 ## 2.3.0 - 2023-02-06
 - use `--defaults-extra-file` to support custom .my.cnf
 - ignore `project.yaml` in production to prevent comparison of external and internal Project Config 

bin/craft-copy-import-db.php

@@ -69,7 +69,7 @@
     '{MYSQL_DATABASE}' => getenv('MYSQL_DATABASE'),
 ];
 
-$cmd = 'mysql --defaults-extra-file={EXTRA_FILE} --force {MYSQL_DATABASE} < {FILE} && echo 1';
+$cmd = 'mysql --defaults-extra-file={EXTRA_FILE} --ssl-mode=DISABLED --force {MYSQL_DATABASE} < {FILE} && echo 1';
 $cmd = str_replace(array_keys($tokens), array_values($tokens), $cmd);
 
 $process = \Symfony\Component\Process\Process::fromShellCommandline($cmd);

src/Actions/DbExportAction.php

@@ -6,13 +6,16 @@
 
 use Craft;
 use craft\errors\ShellCommandException;
+use fortrabbit\Copy\Helpers\MysqlConfigFile;
 use fortrabbit\Copy\Plugin;
 use ostark\Yii2ArtisanBridge\base\Action;
 use yii\base\Exception;
 use yii\console\ExitCode;
 
 class DbExportAction extends Action
 {
+    use MysqlConfigFile;
+
     /**
      * Export database from file
      *
@@ -21,7 +24,7 @@ class DbExportAction extends Action
     public function run(?string $file = null): int
     {
         $plugin = Plugin::getInstance();
-        $this->assureMyCfnForMysqldump();
+        $this->assureMyCnf();
         $this->info("Creating DB Dump in '{$file}'");
 
         try {
@@ -40,15 +43,5 @@ public function run(?string $file = null): int
         }
     }
 
-    protected function assureMyCfnForMysqldump(): bool
-    {
-        $mycnfDest = Craft::getAlias('@root') . '/.my.cnf';
-        $mycnfSrc = Plugin::PLUGIN_ROOT_PATH . '/.my.cnf.example';
 
-        if (! file_exists($mycnfDest)) {
-            return copy($mycnfSrc, $mycnfDest);
-        }
-
-        return true;
-    }
 }

src/Actions/DbImportAction.php

@@ -6,13 +6,16 @@
 
 use craft\errors\ShellCommandException;
 use craft\helpers\FileHelper;
+use fortrabbit\Copy\Helpers\MysqlConfigFile;
 use fortrabbit\Copy\Plugin;
 use ostark\Yii2ArtisanBridge\base\Action;
 use yii\base\Exception;
 use yii\console\ExitCode;
 
 class DbImportAction extends Action
 {
+    use MysqlConfigFile;
+
     /**
      * Import database from file
      *
@@ -31,6 +34,7 @@ public function run(string $file): int
         }
 
         $this->info("Importing DB Dump from '{$file}'");
+        $this->assureMyCnf();
 
         try {
             $file = Plugin::getInstance()->database->import($file);

src/Helpers/MysqlConfigFile.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace fortrabbit\Copy\Helpers;
+
+use Craft;
+use fortrabbit\Copy\Plugin;
+
+trait MysqlConfigFile
+{
+    public function assureMyCnf(): bool
+    {
+        $mycnfDest = Craft::getAlias('@root') . '/.my.cnf';
+        $mycnfSrc = Plugin::PLUGIN_ROOT_PATH . '/.my.cnf.example';
+
+        // Create
+        if (! file_exists($mycnfDest)) {
+            return copy($mycnfSrc, $mycnfDest);
+        }
+
+        // Update
+        if (file_get_contents($mycnfSrc) !== file_get_contents($mycnfDest)) {
+            return copy($mycnfSrc, $mycnfDest);
+        }
+
+        return true;
+    }
+}

src/Services/Database.php

@@ -44,6 +44,8 @@ public function import(?string $file = null): string
     {
         $file = $this->prepareFile($file);
 
+        $this->alterCraftDefaultRestoreCommand($file);
+
         $this->db->restore($file);
 
         return $file;
@@ -81,10 +83,39 @@ protected function alterCraftDefaultBackupCommand(string $file): void
         // The actual overwrite to allow .my.cnf again
         // It basically reverts this change:
         // https://github.com/craftcms/cms/commit/c1068dd56974172a98213b616461266711aef86a
-        Craft::$app->getConfig()->getGeneral()->backupCommand = str_replace(
+        $backupCommand = str_replace(
             '--defaults-file',
             '--defaults-extra-file',
             $backupCommand
         );
+
+        // Disable single-transaction for now
+        $backupCommand = str_replace(
+            ' --single-transaction',
+            '',
+            $backupCommand
+        );
+
+        // Disable ssl-mode for now
+        $backupCommand = str_replace(
+            '--no-tablespaces',
+            '--no-tablespaces --ssl-mode=DISABLED',
+            $backupCommand
+        );
+
+        Craft::$app->getConfig()->getGeneral()->backupCommand = $backupCommand;
+    }
+
+    protected function alterCraftDefaultRestoreCommand(): void
+    {
+        // Determine the command that should be executed
+        $restoreCommand = $this->db->getSchema()->getDefaultRestoreCommand();
+
+        Craft::$app->getConfig()->getGeneral()->restoreCommand = str_replace(
+            '.cnf"',
+            '.cnf" --ssl-mode=DISABLED',
+            $restoreCommand
+        );
+
     }
 }