Skip to content

Use built-in exceptions for Postgres hook input validation #70537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Jul 31, 2026
Merged

Use built-in exceptions for Postgres hook input validation #70537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion generated/known_airflow_exceptions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ providers/opensearch/src/airflow/providers/opensearch/log/os_task_handler.py::1
providers/opensearch/src/airflow/providers/opensearch/operators/opensearch.py::9
providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty.py::1
providers/pagerduty/src/airflow/providers/pagerduty/hooks/pagerduty_events.py::2
providers/postgres/src/airflow/providers/postgres/hooks/postgres.py::2
providers/presto/src/airflow/providers/presto/hooks/presto.py::1
providers/samba/src/airflow/providers/samba/transfers/gcs_to_samba.py::1
providers/segment/src/airflow/providers/segment/hooks/segment.py::2
Expand Down
7 changes: 2 additions & 5 deletions providers/postgres/src/airflow/providers/postgres/hooks/postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from more_itertools import chunked

from airflow.providers.common.compat.sdk import (
AirflowException,
AirflowOptionalProviderFeatureException,
Connection,
conf,
Expand Down Expand Up @@ -189,7 +188,7 @@ def sqlalchemy_url(self) -> URL:
conn = self.connection
query = conn.extra_dejson.get("sqlalchemy_query", {})
if not isinstance(query, dict):
raise AirflowException("The parameter 'sqlalchemy_query' must be of type dict!")
raise TypeError("The parameter 'sqlalchemy_query' must be of type dict!")
if conn.extra_dejson.get("iam", False):
conn.login, conn.password, conn.port = self.get_iam_token(conn)
return URL.create(
Expand Down Expand Up @@ -222,9 +221,7 @@ def _get_cursor(self, raw_cursor: str) -> CursorType:
if _cursor == "namedtuplecursor":
return namedtuple_row
if _cursor == "realdictcursor":
raise AirflowException(
"realdictcursor is not supported with psycopg3. Use dictcursor instead."
)
raise ValueError("realdictcursor is not supported with psycopg3. Use dictcursor instead.")
valid_cursors = "dictcursor, namedtuplecursor"
raise ValueError(f"Invalid cursor passed {_cursor}. Valid options are: {valid_cursors}")

Expand Down
4 changes: 2 additions & 2 deletions providers/postgres/tests/unit/postgres/hooks/test_postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import sqlalchemy

from airflow.models import Connection
from airflow.providers.common.compat.sdk import AirflowException, AirflowOptionalProviderFeatureException
from airflow.providers.common.compat.sdk import AirflowOptionalProviderFeatureException
from airflow.providers.postgres.dialects.postgres import PostgresDialect
from airflow.providers.postgres.hooks.postgres import PostgresHook

Expand Down Expand Up @@ -110,7 +110,7 @@ def test_sqlalchemy_url_with_wrong_sqlalchemy_query_value(self):
)
hook = PostgresHook(connection=conn)

with pytest.raises(AirflowException):
with pytest.raises(TypeError, match="'sqlalchemy_query' must be of type dict"):
hook.sqlalchemy_url

@pytest.mark.parametrize("aws_conn_id", [NOTSET, None, "mock_aws_conn"])
Expand Down