SqlsrvDriver: fixed after 40ad77c [Closes dg#391][Closes dg#392]

peckadesign · Jun 30, 2021 · 0b394a9 · 0b394a9
1 parent df3edee
commit 0b394a9
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SqlsrvDriver.php
@@ -53,6 +53,9 @@ public function __construct(array $config)
 
 		if (isset($config['resource'])) {
 			$this->connection = $config['resource'];
+			if (!is_resource($this->connection)) {
+				throw new \InvalidArgumentException("Configuration option 'resource' is not resource.");
+			}
 
 		} else {
 			$options = $config['options'];
@@ -65,13 +68,13 @@ public function __construct(array $config)
 
 			sqlsrv_configure('WarningsReturnAsErrors', 0);
 			$this->connection = sqlsrv_connect($config['host'], $options);
+			if (!is_resource($this->connection)) {
+				$info = sqlsrv_errors(SQLSRV_ERR_ERRORS);
+				throw new Dibi\DriverException($info[0]['message'], $info[0]['code']);
+			}
 			sqlsrv_configure('WarningsReturnAsErrors', 1);
 		}
 
-		if (!is_resource($this->connection)) {
-			$info = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-			throw new Dibi\DriverException($info[0]['message'], $info[0]['code']);
-		}
 		$this->version = sqlsrv_server_info($this->connection)['SQLServerVersion'];
 	}