Fixes #3859: Allow input to be piped to sql:cli (#3866)

greg-1-anderson · weitzman · commit 5640cf94d10a · 2019-01-17T13:46:50.000-05:00
diff --git a/src/Commands/sql/SqlCommands.php b/src/Commands/sql/SqlCommands.php
@@ -9,6 +9,7 @@
 use Drush\Exec\ExecTrait;
 use Drush\Sql\SqlBase;
 use Consolidation\OutputFormatters\StructuredData\PropertyList;
+use Symfony\Component\Console\Input\InputInterface;
 
 class SqlCommands extends DrushCommands
 {
@@ -137,11 +138,13 @@ public function drop($options = [])
      * @remote-tty
      * @bootstrap max configuration
      */
-    public function cli($options = ['extra' => self::REQ])
+    public function cli(InputInterface $input, $options = ['extra' => self::REQ])
     {
         $sql = SqlBase::create($options);
         $process = $this->processManager()->shell($sql->connect(), null, $sql->getEnv());
-        $process->setTty(true);
+        $process->setTty($this->getConfig()->get('ssh.tty', $input->isInteractive()));
+        $process->setInput(STDIN);
+        $process->mustRun($process->showRealtime());
         $process->mustRun();
     }
 
diff --git a/src/Runtime/RedispatchHook.php b/src/Runtime/RedispatchHook.php
@@ -97,6 +97,7 @@ public function redispatch(InputInterface $input)
         $aliasRecord = $this->siteAliasManager()->getSelf();
         $process = $this->processManager->drushSiteProcess($aliasRecord, $redispatchArgs, $redispatchOptions);
         $process->setTty($this->getConfig()->get('ssh.tty', $input->isInteractive()));
+        $process->setInput(STDIN);
         $process->mustRun($process->showRealtime());
 
         return $this->exitEarly($process->getExitCode());
