From 11fcd2b85a7223280285b0e722807be4fa750eef Mon Sep 17 00:00:00 2001 From: Rodrigo Pedra Brum Date: Sun, 22 Nov 2020 00:51:44 -0300 Subject: [PATCH 1/2] fix SQL Server command generation --- 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..660fc9f7c9e1 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)); } /** From c50dd4ba696e1ad398987bb76302c33ce56a05ba Mon Sep 17 00:00:00 2001 From: Rodrigo Pedra Brum Date: Sun, 22 Nov 2020 01:02:50 -0300 Subject: [PATCH 2/2] style fixes from StyleCI --- src/Illuminate/Database/Console/DbCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Console/DbCommand.php b/src/Illuminate/Database/Console/DbCommand.php index 660fc9f7c9e1..ee6633557017 100644 --- a/src/Illuminate/Database/Console/DbCommand.php +++ b/src/Illuminate/Database/Console/DbCommand.php @@ -160,7 +160,7 @@ protected function getSqlsrvArguments(array $connection) 'username' => ['-U', $connection['username']], 'password' => ['-P', $connection['password']], 'host' => ['-S', 'tcp:'.$connection['host'] - .($connection['port'] ? ','.$connection['port'] : '')], + .($connection['port'] ? ','.$connection['port'] : ''), ], ], $connection)); }