Add missing connection timeout

Author: tarsil

.github/workflows/test-suite.yml

@@ -11,9 +11,6 @@ jobs:
   tests:
     name: "Python ${{ matrix.python-version }}"
     runs-on: "ubuntu-latest"
-    env:
-      MSSQL_SA_PASSWORD: Mssql123$#mssql
-
     strategy:
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
@@ -43,13 +40,13 @@ jobs:
       mssql:
         image: mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04
         env:
-          MSSQL_SA_PASSWORD: ${{ env.MSSQL_SA_PASSWORD }}
+          MSSQL_SA_PASSWORD: Mssql123mssql-
           ACCEPT_EULA: "Y"
-          MSSQL_PID: Express
+          MSSQL_PID: Developer
         ports:
-          - 1433/tcp
+          - 1433:1433
         options: >-
-          --health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $MSSQL_SA_PASSWORD -Q 'select 1' -b -o /dev/null"
+          --health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P Mssql123mssql- -Q 'select 1' -b -o /dev/null"
           --health-interval 60s
           --health-timeout 30s
           --health-start-period 20s
@@ -82,7 +79,7 @@ jobs:
             postgresql://username:password@localhost:5432/testsuite,
             postgresql+aiopg://username:[email protected]:5432/testsuite,
             postgresql+asyncpg://username:password@localhost:5432/testsuite,
-            mssql://sa:Mssql123$#[email protected]:1433/master?driver=ODBC+Driver+17+for+SQL+Server,
-            mssql+pyodbc://sa:Mssql123$#[email protected]:1433/master?driver=ODBC+Driver+17+for+SQL+Server,
-            mssql+aioodbc://sa:Mssql123$#[email protected]:1433/master?driver=ODBC+Driver+17+for+SQL+Server
+            mssql://sa:Mssql123mssql-@localhost:1433/master?driver=ODBC+Driver+17+for+SQL+Server,
+            mssql+pyodbc://sa:Mssql123mssql-@localhost:1433/master?driver=ODBC+Driver+17+for+SQL+Server,
+            mssql+aioodbc://sa:Mssql123mssql-@localhost:1433/master?driver=ODBC+Driver+17+for+SQL+Server
         run: "scripts/test"

databases/backends/mssql.py

@@ -41,6 +41,7 @@ def _get_connection_kwargs(self) -> dict:
         pool_recycle = url_options.get("pool_recycle")
         ssl = url_options.get("ssl")
         driver = url_options.get("driver")
+        timeout = url_options.get("connection_timeout", 30)
         trusted_connection = url_options.get("trusted_connection", "no")
 
         assert driver is not None, "The driver must be specified"
@@ -56,6 +57,7 @@ def _get_connection_kwargs(self) -> dict:
 
         kwargs["trusted_connection"] = trusted_connection.lower()
         kwargs["driver"] = driver
+        kwargs["timeout"] = timeout
 
         for key, value in self._options.items():
             # Coerce 'min_size' and 'max_size' for consistency.
@@ -77,8 +79,12 @@ async def connect(self) -> None:
         port = self._database_url.port or 1433
         user = self._database_url.username or getpass.getuser()
         password = self._database_url.password
+        timeout = kwargs.pop("timeout")
 
-        dsn = f"Driver={driver};Database={database};Server={hostname},{port};UID={user};PWD={password};"
+        if port:
+            dsn = f"Driver={driver};Database={database};Server={hostname},{port};UID={user};PWD={password};Connection+Timeout={timeout}"
+        else:
+            dsn = f"Driver={driver};Database={database};Server={hostname},{port};UID={user};PWD={password};Connection+Timeout={timeout}"
 
         self._pool = await aioodbc.create_pool(
             dsn=dsn,

tests/test_integration.py

@@ -29,10 +29,15 @@ def create_test_database():
             "postgresql+aiopg",
             "sqlite+aiosqlite",
             "postgresql+asyncpg",
+        ]:
+            url = str(database_url.replace(driver=None))
+        elif database_url.scheme in [
+            "mssql",
             "mssql+pyodbc",
             "mssql+aioodbc",
+            "mssql+pymssql",
         ]:
-            url = str(database_url.replace(driver=None))
+            url = str(database_url.replace(driver="pyodbc"))
         engine = sqlalchemy.create_engine(url)
         metadata.create_all(engine)
 
@@ -43,14 +48,19 @@ def create_test_database():
         database_url = DatabaseURL(url)
         if database_url.scheme in ["mysql", "mysql+aiomysql", "mysql+asyncmy"]:
             url = str(database_url.replace(driver="pymysql"))
-        if database_url.scheme in ["mssql", "mssql+aioodbc"]:
-            url = str(database_url.replace(driver="pyodbc"))
         elif database_url.scheme in [
             "postgresql+aiopg",
             "sqlite+aiosqlite",
             "postgresql+asyncpg",
         ]:
             url = str(database_url.replace(driver=None))
+        elif database_url.scheme in [
+            "mssql",
+            "mssql+pyodbc",
+            "mssql+aioodbc",
+            "mssql+pymssql",
+        ]:
+            url = str(database_url.replace(driver="pyodbc"))
         engine = sqlalchemy.create_engine(url)
         metadata.drop_all(engine)