CLI-1665: pull:db errors (#1929)

Author: danepowell

src/Command/Pull/PullCommandBase.php

@@ -486,7 +486,7 @@ private function importDatabaseDump(string $localDumpFilepath, string $dbHost, s
             'mysql',
         ]);
         if ($this->localMachineHelper->commandExists('pv')) {
-            $command = 'pv "${:LOCAL_DUMP_FILEPATH}" --bytes --rate | gunzip | MYSQL_PWD="${:MYSQL_PASSWORD}" mysql --host="${:MYSQL_HOST}" --user="${:MYSQL_USER}" "${:MYSQL_DATABASE}""';
+            $command = 'pv "${:LOCAL_DUMP_FILEPATH}" --bytes --rate | gunzip | MYSQL_PWD="${:MYSQL_PASSWORD}" mysql --host="${:MYSQL_HOST}" --user="${:MYSQL_USER}" "${:MYSQL_DATABASE}"';
         } else {
             $this->io->warning('Install `pv` to see progress bar');
             $command = 'gunzip -c "${:LOCAL_DUMP_FILEPATH}" | MYSQL_PWD="${:MYSQL_PASSWORD}" mysql --host="${:MYSQL_HOST}" --user="${:MYSQL_USER}" "${:MYSQL_DATABASE}"';

tests/phpunit/src/CommandTestBase.php

@@ -441,19 +441,7 @@ protected function mockCreateMySqlDumpOnLocal(ObjectProphecy $localMachineHelper
         $process = $this->mockProcess();
         $process->getOutput()->willReturn('');
         if ($pv) {
-            $command = 'bash -c "set -o pipefail; MYSQL_PWD="${:MYSQL_PASSWORD}" mysqldump --host="${:MYSQL_HOST}" --user="${:MYSQL_USER}" "${:MYSQL_DATABASE}" | pv --rate --bytes | gzip -9 > "${:LOCAL_FILEPATH}""';
-        } else {
-            $command = 'bash -c "set -o pipefail; MYSQL_PWD="${:MYSQL_PASSWORD}" mysqldump --host="${:MYSQL_HOST}" --user="${:MYSQL_USER}" "${:MYSQL_DATABASE}" | gzip -9 > "${:LOCAL_FILEPATH}""';
-        }
-        $env = [
-            'LOCAL_FILEPATH' => sys_get_temp_dir() . '/acli-mysql-dump-drupal.sql.gz',
-            'MYSQL_DATABASE' => 'drupal',
-            'MYSQL_HOST' => 'localhost',
-            'MYSQL_PASSWORD' => 'drupal',
-            'MYSQL_USER' => 'drupal',
-        ];
-        if ($pv) {
-            $localMachineHelper->executeFromCmd(Argument::containingString('pv --rate --bytes'), Argument::any(), null, $printOutput, null, Argument::that(function ($env) {
+            $localMachineHelper->executeFromCmd(Argument::containingString('pv --rate --bytes'), Argument::any(), null, $printOutput, null, Argument::that(static function ($env) {
                 return is_array($env) && array_key_exists('LOCAL_FILEPATH', $env);
             }))
                 ->willReturn($process->reveal())

tests/phpunit/src/Commands/Pull/PullCommandTestBase.php

@@ -310,7 +310,7 @@ protected function mockExecuteMySqlImport(
         $this->mockExecutePvExists($localMachineHelper, $pvExists);
         $process = $this->mockProcess($success);
         $filePath = Path::join(sys_get_temp_dir(), "$env-$dbName-$dbMachineName-$createdAt.sql.gz");
-        $command = $pvExists ? 'pv "${:LOCAL_DUMP_FILEPATH}" --bytes --rate | gunzip | MYSQL_PWD="${:MYSQL_PASSWORD}" mysql --host="${:MYSQL_HOST}" --user="${:MYSQL_USER}" "${:MYSQL_DATABASE}""' : 'gunzip -c "${:LOCAL_DUMP_FILEPATH}" | MYSQL_PWD="${:MYSQL_PASSWORD}" mysql --host="${:MYSQL_HOST}" --user="${:MYSQL_USER}" "${:MYSQL_DATABASE}"';
+        $command = $pvExists ? 'pv "${:LOCAL_DUMP_FILEPATH}" --bytes --rate | gunzip | MYSQL_PWD="${:MYSQL_PASSWORD}" mysql --host="${:MYSQL_HOST}" --user="${:MYSQL_USER}" "${:MYSQL_DATABASE}"' : 'gunzip -c "${:LOCAL_DUMP_FILEPATH}" | MYSQL_PWD="${:MYSQL_PASSWORD}" mysql --host="${:MYSQL_HOST}" --user="${:MYSQL_USER}" "${:MYSQL_DATABASE}"';
         $expectedEnv = [
             'LOCAL_DUMP_FILEPATH' => $filePath,
             'MYSQL_DATABASE' => $localDbName,