From df665155b1d17addd20f4d164dec3c0a1cae1618 Mon Sep 17 00:00:00 2001
From: Yeonguk <choo121600@gmail.com>
Date: Mon, 15 Dec 2025 14:04:55 +0900
Subject: [PATCH 1/2] Refactor test_timestamp.py to use SQLA2

---
 .pre-commit-config.yaml                          | 1 +
 airflow-core/tests/unit/models/test_timestamp.py | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 81e24f2e8a3b3..ce36fb27d7e71 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -413,6 +413,7 @@ repos:
             ^airflow-ctl.*\.py$|
             ^airflow-core/src/airflow/models/.*\.py$|
             ^airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_assets.py$|
+            ^airflow-core/tests/unit/models/test_timestamp.py|
             ^task_sdk.*\.py$
         pass_filenames: true
       - id: update-supported-versions
diff --git a/airflow-core/tests/unit/models/test_timestamp.py b/airflow-core/tests/unit/models/test_timestamp.py
index 529fd32afc504..b200fe3ecdb5a 100644
--- a/airflow-core/tests/unit/models/test_timestamp.py
+++ b/airflow-core/tests/unit/models/test_timestamp.py
@@ -19,6 +19,7 @@
 import pendulum
 import pytest
 import time_machine
+from sqlalchemy import select
 
 from airflow._shared.timezones import timezone
 from airflow.models import Log
@@ -60,7 +61,7 @@ def test_timestamp_behaviour(dag_maker, session):
         current_time = timezone.utcnow()
         old_log = add_log(execdate, session, dag_maker)
         session.expunge(old_log)
-        log_time = session.query(Log).one().dttm
+        log_time = session.scalars(select(Log)).one().dttm
         assert log_time == current_time
         assert log_time.tzinfo.name == "UTC"
 
@@ -73,7 +74,7 @@ def test_timestamp_behaviour_with_timezone(dag_maker, session):
         old_log = add_log(execdate, session, dag_maker, timezone_override=pendulum.timezone("Europe/Warsaw"))
         session.expunge(old_log)
         # No matter what timezone we set - we should always get back UTC
-        log_time = session.query(Log).one().dttm
+        log_time = session.scalars(select(Log)).one().dttm
         assert log_time == current_time
         assert old_log.dttm.tzinfo.name != "UTC"
         assert log_time.tzinfo.name == "UTC"

From 1c86ddfa7da43e66401fe1ce6c2c8c1d87209849 Mon Sep 17 00:00:00 2001
From: Yeonguk <choo121600@gmail.com>
Date: Mon, 15 Dec 2025 14:10:43 +0900
Subject: [PATCH 2/2] Fix regex pattern in pre-commit

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ce36fb27d7e71..4df07e74c881a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -413,7 +413,7 @@ repos:
             ^airflow-ctl.*\.py$|
             ^airflow-core/src/airflow/models/.*\.py$|
             ^airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_assets.py$|
-            ^airflow-core/tests/unit/models/test_timestamp.py|
+            ^airflow-core/tests/unit/models/test_timestamp.py$|
             ^task_sdk.*\.py$
         pass_filenames: true
       - id: update-supported-versions