Skip to content

Guard type aliases and remove redundant imports in the postgres hook #61554

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
shahar1 merged 1 commit into from
Feb 7, 2026
Merged

Guard type aliases and remove redundant imports in the postgres hook #61554

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
15 changes: 7 additions & 8 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 @@ -23,9 +23,8 @@
from copy import deepcopy
from typing import TYPE_CHECKING, Any, Literal, Protocol, TypeAlias, cast, overload

import psycopg2
import psycopg2.extras
from more_itertools import chunked
from psycopg2 import connect as ppg2_connect
from psycopg2.extras import DictCursor, NamedTupleCursor, RealDictCursor, execute_batch

from airflow.providers.common.compat.sdk import (
Expand Down Expand Up @@ -65,8 +64,8 @@
if USE_PSYCOPG3:
from psycopg.errors import Diagnostic

CursorType: TypeAlias = DictCursor | RealDictCursor | NamedTupleCursor
CursorRow: TypeAlias = dict[str, Any] | tuple[Any, ...]
CursorType: TypeAlias = DictCursor | RealDictCursor | NamedTupleCursor
CursorRow: TypeAlias = dict[str, Any] | tuple[Any, ...]


class CompatConnection(Protocol):
Expand Down Expand Up @@ -221,9 +220,9 @@ def _get_cursor(self, raw_cursor: str) -> CursorType:
raise ValueError(f"Invalid cursor passed {_cursor}. Valid options are: {valid_cursors}")

cursor_types = {
"dictcursor": psycopg2.extras.DictCursor,
"realdictcursor": psycopg2.extras.RealDictCursor,
"namedtuplecursor": psycopg2.extras.NamedTupleCursor,
"dictcursor": DictCursor,
"realdictcursor": RealDictCursor,
"namedtuplecursor": NamedTupleCursor,
}
if _cursor in cursor_types:
return cursor_types[_cursor]
Expand Down Expand Up @@ -285,7 +284,7 @@ def get_conn(self) -> CompatConnection:
if raw_cursor:
conn_args["cursor_factory"] = self._get_cursor(raw_cursor)

self.conn = cast("CompatConnection", psycopg2.connect(**conn_args))
self.conn = cast("CompatConnection", ppg2_connect(**conn_args))

return self.conn

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -94,7 +94,7 @@ def mock_connect(mocker):
"""Mock the connection object according to the correct psycopg version."""
if USE_PSYCOPG3:
return mocker.patch("airflow.providers.postgres.hooks.postgres.psycopg.connection.Connection.connect")
return mocker.patch("airflow.providers.postgres.hooks.postgres.psycopg2.connect")
return mocker.patch("airflow.providers.postgres.hooks.postgres.ppg2_connect")


class TestPostgresHookConn:
Expand Down