Fix mysql via mariadb warns about being deprecated (#6183) (#6189)

* Fix mysql via mariadb warns about being deprecated (#6183) "mysql: Deprecated program name. It will be removed in a future release, use '/usr/bin/mariadb' instead" * Adjust SqlConnectTest --------- Co-authored-by: TBiesenbeek <[email protected]> Co-authored-by: Moshe Weitzman <[email protected]>
drush-ops · Jan 20, 2025 · b0ee286 · b0ee286
1 parent 305d991
commit b0ee286
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/src/Sql/SqlMariaDB.php b/src/Sql/SqlMariaDB.php
@@ -4,25 +4,15 @@
 
 namespace Drush\Sql;
 
-use Drush\Exec\ExecTrait;
-
 class SqlMariaDB extends SqlMysql
 {
-    use ExecTrait;
-
     public function command(): string
     {
-        if (self::programExists('mariadb')) {
-            return 'mariadb';
-        }
-        return parent::command();
+        return 'mariadb';
     }
 
     public function dumpProgram(): string
     {
-        if (self::programExists('mariadb-dump')) {
-            return 'mariadb-dump';
-        }
-        return parent::dumpProgram();
+        return 'mariadb-dump';
     }
 }
diff --git a/src/Sql/SqlMysql.php b/src/Sql/SqlMysql.php
@@ -4,10 +4,14 @@
 
 namespace Drush\Sql;
 
+use Drush\Drush;
+use Drush\Exec\ExecTrait;
 use PDO;
 
 class SqlMysql extends SqlBase
 {
+    use ExecTrait;
+
     protected string $version;
 
     public string $queryExtra = '-A';
@@ -17,15 +21,19 @@ class SqlMysql extends SqlBase
      */
     public static function make(array $dbSpec, array $options)
     {
-        // First get a MySQL instance
-        $instance = new self($dbSpec, $options);
+        // If the mysql version reports that it is MariaDB, use MariaDB as client.
+        $process = Drush::shell('mysql --version');
+        $process->setSimulated(false);
+        $process->run();
+        if ((!$process->isSuccessful() || str_contains($process->getOutput(), 'MariaDB')) && self::programExists('mariadb')) {
+            $instance = new SqlMariaDB($dbSpec, $options);
+        } else {
+            $instance = new self($dbSpec, $options);
+        }
+
         $sql = 'SELECT VERSION();"';
         $instance->alwaysQuery($sql);
         $out = trim($instance->getProcess()->getOutput());
-        if (str_contains($out, 'MariaDB')) {
-            // Replace with a MariaDB driver.
-            $instance = new SqlMariaDB($dbSpec, $options);
-        }
         $instance->setVersion($out);
         return $instance;
     }

diff --git a/tests/functional/SqlConnectTest.php b/tests/functional/SqlConnectTest.php
@@ -28,7 +28,7 @@ public function testSqlConnect()
         $shell_options = "-e";
         $db_driver = $this->dbDriver();
         if ($db_driver == 'mysql') {
-            $this->assertMatchesRegularExpression('/^mysql --user=[^\s]+ --password=.* --database=[^\s]+ --host=[^\s]+/', $connectionString);
+            $this->assertMatchesRegularExpression('/^mysql|mariadb --user=[^\s]+ --password=.* --database=[^\s]+ --host=[^\s]+/', $connectionString);
         } elseif ($db_driver == 'sqlite') {
             $this->assertStringContainsString('sqlite3', $connectionString);
             $shell_options = '';