From 056a03391b2e5fc82480b158b52d2372eb1b528f Mon Sep 17 00:00:00 2001 From: Rodrigo Pedra Brum Date: Sun, 22 Nov 2020 22:18:13 -0300 Subject: [PATCH] [8.x] fix SQL Server command generation (#35317) * fix SQL Server command generation * style fixes from StyleCI --- src/Illuminate/Database/Console/DbCommand.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Illuminate/Database/Console/DbCommand.php b/src/Illuminate/Database/Console/DbCommand.php index a854fc6f0da0..ee6633557017 100644 --- a/src/Illuminate/Database/Console/DbCommand.php +++ b/src/Illuminate/Database/Console/DbCommand.php @@ -155,13 +155,13 @@ protected function getSqliteArguments(array $connection) */ protected function getSqlsrvArguments(array $connection) { - return $this->getOptionalArguments([ - 'database' => '-d '.$connection['database'], - 'username' => '-U '.$connection['username'], - 'password' => '-P '.$connection['password'], - 'host' => '-S tcp:'.$connection['host'] - .($connection['port'] ? ','.$connection['port'] : ''), - ], $connection); + return array_merge(...$this->getOptionalArguments([ + 'database' => ['-d', $connection['database']], + 'username' => ['-U', $connection['username']], + 'password' => ['-P', $connection['password']], + 'host' => ['-S', 'tcp:'.$connection['host'] + .($connection['port'] ? ','.$connection['port'] : ''), ], + ], $connection)); } /**