Dev-iL commented on code in PR #66893:
URL: https://github.com/apache/airflow/pull/66893#discussion_r3239526946
##########
providers/postgres/src/airflow/providers/postgres/hooks/postgres.py:
##########
@@ -262,30 +285,13 @@ def get_conn(self) -> CompatConnection:
if arg_name not in self.ignored_extra_options:
conn_args[arg_name] = arg_val
- if USE_PSYCOPG3:
- from psycopg.connection import Connection as pgConnection
-
- raw_cursor = conn.extra_dejson.get("cursor")
- if raw_cursor:
- conn_args["row_factory"] = self._get_cursor(raw_cursor)
-
- # Use Any type for the connection args to avoid type conflicts
- connection = pgConnection.connect(**cast("Any", conn_args))
- self.conn = cast("CompatConnection", connection)
-
- # Register JSON handlers for both json and jsonb types
- # This ensures JSON data is properly decoded from bytes to Python
objects
- register_default_adapters(connection)
+ raw_cursor = conn.extra_dejson.get("cursor")
- # Add the notice handler AFTER the connection is established
- if self.enable_log_db_messages and hasattr(self.conn,
"add_notice_handler"):
- self.conn.add_notice_handler(self._notice_handler)
- else: # psycopg2
- raw_cursor = conn.extra_dejson.get("cursor", False)
- if raw_cursor:
- conn_args["cursor_factory"] = self._get_cursor(raw_cursor)
+ if raw_cursor:
+ key, value = self._get_cursor_config(raw_cursor)
+ conn_args[key] = value
Review Comment:
Looks like the PPG2 branch's handling of `raw_cursor` was kept:
```python
raw_cursor = conn.extra_dejson.get("cursor") # PPG3, default None
raw_cursor = conn.extra_dejson.get("cursor", False) # PPG2, default False
```
Although both are falsy - are you sure this is safe?
##########
providers/postgres/src/airflow/providers/postgres/hooks/postgres.py:
##########
@@ -230,6 +230,29 @@ def _get_cursor(self, raw_cursor: str) -> CursorType:
valid_cursors = ", ".join(cursor_types.keys())
raise ValueError(f"Invalid cursor passed {_cursor}. Valid options are:
{valid_cursors}")
+ def _get_cursor_config(self, raw_cursor: str) -> tuple[str, Any]:
+ cursor = self._get_cursor(raw_cursor)
+
+ if USE_PSYCOPG3:
+ return "row_factory", cursor
+
+ return "cursor_factory", cursor
+
+ def _create_connection(self, conn_args: dict[str, Any]) ->
CompatConnection:
+ if USE_PSYCOPG3:
+ from psycopg.connection import Connection as pgConnection
+
+ connection = pgConnection.connect(**cast("Any", conn_args))
+
+ register_default_adapters(connection)
+
+ if self.enable_log_db_messages and hasattr(connection,
"add_notice_handler"):
+ connection.add_notice_handler(self._notice_handler)
+
+ return cast("CompatConnection", connection)
+
+ return cast("CompatConnection", ppg2_connect(**conn_args))
Review Comment:
Seeing how you're already refactoring this, is there a way to avoid the
casts? Do you think we still need `CompatConnection`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
