Add port and use latest MCR image

Throw DB connection errors for SQL Server

Use the include directive

Author: paulbalandan

.github/workflows/test-phpunit.yml

@@ -62,13 +62,14 @@ jobs:
           - 5432:5432
         options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3
       mssql:
-        image: microsoft/mssql-server-linux:2017-latest
+        image: mcr.microsoft.com/mssql/server:2019-latest
         env:
           SA_PASSWORD: 1Secure*Password1
           ACCEPT_EULA: Y
           MSSQL_PID: Developer
         ports:
           - 1433:1433
+        options: --name=mssql --health-cmd="/opt/mssql-tools/bin/sqlcmd -S 127.0.0.1,1433 -U SA -P '1Secure*Password1' -Q 'SELECT 1'" --health-interval=10s --health-timeout=5s --health-retries=3
       redis:
         image: redis
         ports:
@@ -82,7 +83,7 @@ jobs:
     steps:
       - name: Create database for MSSQL Server
         if: matrix.db-platforms == 'SQLSRV'
-        run: sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test"
+        run: docker exec -i mssql /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1,1433 -U SA -P '1Secure*Password1' -Q 'CREATE DATABASE test'
 
       - name: Checkout
         uses: actions/checkout@v2

system/Database/SQLSRV/Connection.php

@@ -103,7 +103,10 @@ public function __construct($params)
 	/**
 	 * Connect to the database.
 	 *
-	 * @param  boolean $persistent
+	 * @param boolean $persistent
+	 *
+	 * @throws DatabaseException
+	 *
 	 * @return mixed
 	 */
 	public function connect(bool $persistent = false)
@@ -127,20 +130,26 @@ public function connect(bool $persistent = false)
 			unset($connection['UID'], $connection['PWD']);
 		}
 
-		if (false !== ($this->connID = sqlsrv_connect($this->hostname, $connection)))
+		$this->connID = sqlsrv_connect($this->hostname, $connection);
+
+		if ($this->connID !== false)
 		{
-			/* Disable warnings as errors behavior. */
-			sqlsrv_configure('WarningsReturnAsErrors', 0);
+			sqlsrv_configure('WarningsReturnAsErrors', 1);
 
 			// Determine how identifiers are escaped
 			$query = $this->query('SELECT CASE WHEN (@@OPTIONS | 256) = @@OPTIONS THEN 1 ELSE 0 END AS qi');
 			$query = $query->getResultObject();
 
 			$this->_quoted_identifier = empty($query) ? false : (bool) $query[0]->qi;
 			$this->escapeChar         = ($this->_quoted_identifier) ? '"' : ['[', ']'];
+
+			return $this->connID;
 		}
 
-		return $this->connID;
+		// $error   = $this->error();
+		// $message = preg_replace('/(\[.+\]\[.+\](?:\[.+\])?)(.+)/', '$2', $error['message']);
+
+		throw new DatabaseException(var_export(sqlsrv_errors(SQLSRV_ERR_ERRORS)));
 	}
 
 	/**