From e0dbe89fb3cb7883364653cc8865b7e2313f24de Mon Sep 17 00:00:00 2001 From: pratiksha badheka Date: Thu, 20 Mar 2025 05:44:15 -0700 Subject: [PATCH 1/3] moving create_db_orm to be a public method in db manager --- airflow/utils/db_manager.py | 4 ++-- tests/utils/test_db_manager.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airflow/utils/db_manager.py b/airflow/utils/db_manager.py index bc91f3c8003ca..46c4323dde539 100644 --- a/airflow/utils/db_manager.py +++ b/airflow/utils/db_manager.py @@ -86,7 +86,7 @@ def check_migration(self): return True return False - def _create_db_from_orm(self): + def create_db_from_orm(self): """Create database from ORM.""" self.log.info("Creating %s tables from the ORM", self.__class__.__name__) engine = self.session.get_bind().engine @@ -118,7 +118,7 @@ def initdb(self): if db_exists: self.upgradedb() else: - self._create_db_from_orm() + self.create_db_from_orm() def upgradedb(self, to_revision=None, from_revision=None, show_sql_only=False): """Upgrade the database.""" diff --git a/tests/utils/test_db_manager.py b/tests/utils/test_db_manager.py index b44262961f85c..34f849bf2e011 100644 --- a/tests/utils/test_db_manager.py +++ b/tests/utils/test_db_manager.py @@ -113,7 +113,7 @@ class MockDBManager(BaseDBManager): class TestBaseDBManager: @mock.patch.object(BaseDBManager, "get_alembic_config") @mock.patch.object(BaseDBManager, "get_current_revision") - @mock.patch.object(BaseDBManager, "_create_db_from_orm") + @mock.patch.object(BaseDBManager, "create_db_from_orm") def test_create_db_from_orm_called_from_init( self, mock_create_db_from_orm, mock_current_revision, mock_config, session ): From 5fe6fa513082fcea016af3dd44234e98b1c094c1 Mon Sep 17 00:00:00 2001 From: pratiksha badheka Date: Thu, 20 Mar 2025 07:39:39 -0700 Subject: [PATCH 2/3] move create_db_from_orm to be a public method in fab provider --- .../fab/src/airflow/providers/fab/auth_manager/models/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/fab/src/airflow/providers/fab/auth_manager/models/db.py b/providers/fab/src/airflow/providers/fab/auth_manager/models/db.py index 5e2c53977458c..15550a49bcdc0 100644 --- a/providers/fab/src/airflow/providers/fab/auth_manager/models/db.py +++ b/providers/fab/src/airflow/providers/fab/auth_manager/models/db.py @@ -55,7 +55,7 @@ class FABDBManager(BaseDBManager): supports_table_dropping = True def _create_db_from_orm(self): - super()._create_db_from_orm() + super().create_db_from_orm() _get_flask_db(settings.SQL_ALCHEMY_CONN).create_all() def upgradedb(self, to_revision=None, from_revision=None, show_sql_only=False): From 090286cdb661f56b8cb417948c3cb944ea216bd8 Mon Sep 17 00:00:00 2001 From: Vincent <97131062+vincbeck@users.noreply.github.com> Date: Thu, 20 Mar 2025 14:28:36 -0400 Subject: [PATCH 3/3] Update providers/fab/src/airflow/providers/fab/auth_manager/models/db.py --- .../fab/src/airflow/providers/fab/auth_manager/models/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/fab/src/airflow/providers/fab/auth_manager/models/db.py b/providers/fab/src/airflow/providers/fab/auth_manager/models/db.py index 15550a49bcdc0..8ffb6cfeab8b4 100644 --- a/providers/fab/src/airflow/providers/fab/auth_manager/models/db.py +++ b/providers/fab/src/airflow/providers/fab/auth_manager/models/db.py @@ -54,7 +54,7 @@ class FABDBManager(BaseDBManager): alembic_file = (PACKAGE_DIR / "alembic.ini").as_posix() supports_table_dropping = True - def _create_db_from_orm(self): + def create_db_from_orm(self): super().create_db_from_orm() _get_flask_db(settings.SQL_ALCHEMY_CONN).create_all()