File tree Expand file tree Collapse file tree 1 file changed +12
-2
lines changed
dev/tests/integration/framework/Magento/TestFramework/Db Expand file tree Collapse file tree 1 file changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -176,7 +176,7 @@ public function restoreFromDbDump()
176
176
throw new \LogicException ("DB dump file does not exist: " . $ this ->getSetupDbDumpFilename ());
177
177
}
178
178
179
- $ dbCommand = $ this ->getDbCommand ();
179
+ $ dbCommand = $ this ->getDbImportCommand ();
180
180
181
181
$ this ->_shell ->execute (
182
182
"{$ dbCommand } --defaults-file=%s --host=%s --port=%s %s < %s " ,
@@ -297,7 +297,7 @@ private function isMariaDB(): bool
297
297
*/
298
298
protected function getDbCommand ()
299
299
{
300
- return $ this ->isMariaDB () ? 'mariadb-import ' : 'mysql ' ;
300
+ return $ this ->isMariaDB () ? 'mariadb ' : 'mysql ' ;
301
301
}
302
302
303
303
/**
@@ -309,4 +309,14 @@ protected function getDbDumpCommand()
309
309
{
310
310
return $ this ->isMariaDB () ? 'mariadb-dump ' : 'mysqldump ' ;
311
311
}
312
+
313
+ /**
314
+ * Get db command mysql or mariadb-import
315
+ *
316
+ * @return string
317
+ */
318
+ protected function getDbImportCommand ()
319
+ {
320
+ return $ this ->isMariaDB () ? 'mariadb-import ' : 'mysql ' ;
321
+ }
312
322
}
You can’t perform that action at this time.
0 commit comments