From 3732d57293f54e1d228f3380144870374de12963 Mon Sep 17 00:00:00 2001 From: kharysharpe Date: Fri, 16 Dec 2016 01:48:58 -0500 Subject: [PATCH 1/2] Added check for empty port. Prevents DSN from generating with an extra comma and throwing an Invalid Handler Error when port is specified in the database configuration but not set to a value. Produces 'sqlsrv:Server=localhost;Database=mydb;' instead of 'sqlsrv:Server=localhost,;Database=mydb;' --- src/Illuminate/Database/Connectors/SqlServerConnector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Connectors/SqlServerConnector.php b/src/Illuminate/Database/Connectors/SqlServerConnector.php index 7a2a6c814632..b96fa21eea52 100755 --- a/src/Illuminate/Database/Connectors/SqlServerConnector.php +++ b/src/Illuminate/Database/Connectors/SqlServerConnector.php @@ -155,7 +155,7 @@ protected function buildConnectString($driver, array $arguments) */ protected function buildHostString(array $config, $separator) { - if (isset($config['port'])) { + if (isset($config['port']) && !empty($config['port'])) { return $config['host'].$separator.$config['port']; } else { return $config['host']; From 036f08eff63fdcbf20ecc8e16b76c2009b56f0b6 Mon Sep 17 00:00:00 2001 From: kharysharpe Date: Fri, 16 Dec 2016 02:01:44 -0500 Subject: [PATCH 2/2] Fixed style guide --- src/Illuminate/Database/Connectors/SqlServerConnector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Connectors/SqlServerConnector.php b/src/Illuminate/Database/Connectors/SqlServerConnector.php index b96fa21eea52..cc135643a1ab 100755 --- a/src/Illuminate/Database/Connectors/SqlServerConnector.php +++ b/src/Illuminate/Database/Connectors/SqlServerConnector.php @@ -155,7 +155,7 @@ protected function buildConnectString($driver, array $arguments) */ protected function buildHostString(array $config, $separator) { - if (isset($config['port']) && !empty($config['port'])) { + if (isset($config['port']) && ! empty($config['port'])) { return $config['host'].$separator.$config['port']; } else { return $config['host'];