This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new b683698684 Check if sqlalchemy_scheme extra contains forbidden
characters (#31984)
b683698684 is described below
commit b6836986846058e9e5fa271fb7b22ae721020787
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sun Jun 18 22:06:43 2023 +0200
Check if sqlalchemy_scheme extra contains forbidden characters (#31984)
---
airflow/providers/microsoft/mssql/hooks/mssql.py | 9 ++++-----
airflow/providers/odbc/hooks/odbc.py | 9 ++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/airflow/providers/microsoft/mssql/hooks/mssql.py
b/airflow/providers/microsoft/mssql/hooks/mssql.py
index 56bca7a8b9..01e1c9e47b 100644
--- a/airflow/providers/microsoft/mssql/hooks/mssql.py
+++ b/airflow/providers/microsoft/mssql/hooks/mssql.py
@@ -63,11 +63,10 @@ class MsSqlHook(DbApiHook):
@property
def sqlalchemy_scheme(self) -> str:
"""Sqlalchemy scheme either from constructor, connection extras or
default."""
- return (
- self._sqlalchemy_scheme
- or self.connection_extra_lower.get("sqlalchemy_scheme")
- or self.DEFAULT_SQLALCHEMY_SCHEME
- )
+ extra_scheme = self.connection_extra_lower.get("sqlalchemy_scheme")
+ if not self._sqlalchemy_scheme and extra_scheme and (":" in
extra_scheme or "/" in extra_scheme):
+ raise RuntimeError("sqlalchemy_scheme in connection extra should
not contain : or / characters")
+ return self._sqlalchemy_scheme or extra_scheme or
self.DEFAULT_SQLALCHEMY_SCHEME
def get_uri(self) -> str:
from urllib.parse import parse_qs, urlencode, urlsplit, urlunsplit
diff --git a/airflow/providers/odbc/hooks/odbc.py
b/airflow/providers/odbc/hooks/odbc.py
index 5f65517c87..21678ebe55 100644
--- a/airflow/providers/odbc/hooks/odbc.py
+++ b/airflow/providers/odbc/hooks/odbc.py
@@ -91,11 +91,10 @@ class OdbcHook(DbApiHook):
@property
def sqlalchemy_scheme(self) -> str:
"""SQLAlchemy scheme either from constructor, connection extras or
default."""
- return (
- self._sqlalchemy_scheme
- or self.connection_extra_lower.get("sqlalchemy_scheme")
- or self.DEFAULT_SQLALCHEMY_SCHEME
- )
+ extra_scheme = self.connection_extra_lower.get("sqlalchemy_scheme")
+ if not self._sqlalchemy_scheme and extra_scheme and (":" in
extra_scheme or "/" in extra_scheme):
+ raise RuntimeError("sqlalchemy_scheme in connection extra should
not contain : or / characters")
+ return self._sqlalchemy_scheme or extra_scheme or
self.DEFAULT_SQLALCHEMY_SCHEME
@property
def connection_extra_lower(self) -> dict: