diff --git a/lib/galaxy/model/migrations/base.py b/lib/galaxy/model/migrations/base.py index 5e6738857d9..77f4d58370f 100644 --- a/lib/galaxy/model/migrations/base.py +++ b/lib/galaxy/model/migrations/base.py @@ -434,7 +434,7 @@ def get_url_string(engine: Engine) -> str: def load_metadata(metadata: MetaData, engine: Engine) -> None: - with engine.connect() as conn: + with engine.begin() as conn: metadata.create_all(bind=conn) diff --git a/test/unit/data/model/migrations/test_migrations.py b/test/unit/data/model/migrations/test_migrations.py index 51cba45265a..832b4c50488 100644 --- a/test/unit/data/model/migrations/test_migrations.py +++ b/test/unit/data/model/migrations/test_migrations.py @@ -190,7 +190,7 @@ class TestDatabaseStateCache: with create_and_drop_database(db_url): with disposing_engine(db_url) as engine: assert DatabaseStateCache(engine).is_database_empty() - with engine.connect() as conn: + with engine.begin() as conn: metadata.create_all(bind=conn) assert not DatabaseStateCache(engine).is_database_empty() @@ -199,7 +199,7 @@ class TestDatabaseStateCache: with create_and_drop_database(db_url): with disposing_engine(db_url) as engine: assert not DatabaseStateCache(engine).has_alembic_version_table() - with engine.connect() as conn: + with engine.begin() as conn: metadata.create_all(bind=conn) assert DatabaseStateCache(engine).has_alembic_version_table() @@ -208,7 +208,7 @@ class TestDatabaseStateCache: with create_and_drop_database(db_url): with disposing_engine(db_url) as engine: assert not DatabaseStateCache(engine).has_sqlalchemymigrate_version_table() - with engine.connect() as conn: + with engine.begin() as conn: metadata.create_all(bind=conn) assert DatabaseStateCache(engine).has_sqlalchemymigrate_version_table() @@ -229,7 +229,7 @@ class TestDatabaseStateCache: with create_and_drop_database(db_url): with disposing_engine(db_url) as engine: assert DatabaseStateCache(engine).is_database_empty() - with engine.connect() as conn: + with engine.begin() as conn: metadata.create_all(bind=conn) assert not DatabaseStateCache(engine).is_database_empty() assert DatabaseStateCache(engine).contains_only_kombu_tables() @@ -733,7 +733,7 @@ def _get_paths_to_version_locations(): def load_sqlalchemymigrate_version(db_url, version): with disposing_engine(db_url) as engine: - with engine.connect() as conn: + with engine.begin() as conn: sql_delete = text(f"delete from {SQLALCHEMYMIGRATE_TABLE}") # there can be only 1 row sql_insert = text(f"insert into {SQLALCHEMYMIGRATE_TABLE} values('_', '_', {version})") conn.execute(sql_delete) @@ -747,7 +747,7 @@ def test_load_sqlalchemymigrate_version(url_factory, metadata_state2_gxy): # no load_metadata(metadata_state2_gxy, engine) sql = text(f"select version from {SQLALCHEMYMIGRATE_TABLE}") version = 42 - with engine.connect() as conn: + with engine.begin() as conn: result = conn.execute(sql).scalar() assert result != version load_sqlalchemymigrate_version(db_url, version) @@ -766,7 +766,7 @@ def database_is_empty_or_contains_kombu_tables(db_url): (ref: https://github.com/galaxyproject/galaxy/issues/13689) """ with disposing_engine(db_url) as engine: - with engine.connect() as conn: + with engine.begin() as conn: metadata = MetaData() metadata.reflect(bind=conn) return not bool(metadata.tables) or metadata_contains_only_kombu_tables(metadata) @@ -865,7 +865,7 @@ def is_metadata_loaded(db_url, metadata): # True if the set of tables from the up-to-date state metadata (state6) # is a subset of the metadata reflected from `db_url`. with disposing_engine(db_url) as engine: - with engine.connect() as conn: + with engine.begin() as conn: db_metadata = MetaData() db_metadata.reflect(bind=conn) tables = _get_tablenames(metadata) @@ -885,7 +885,7 @@ def test_is_metadata_loaded(url_factory, metadata_state1_gxy): # noqa F811 with create_and_drop_database(db_url): assert not is_metadata_loaded(db_url, metadata) with disposing_engine(db_url) as engine: - with engine.connect() as conn: + with engine.begin() as conn: metadata.create_all(bind=conn) assert is_metadata_loaded(db_url, metadata) @@ -896,7 +896,7 @@ def test_is_multiple_metadata_loaded(url_factory, metadata_state1_gxy, metadata_ with create_and_drop_database(db_url): assert not is_metadata_loaded(db_url, metadata) with disposing_engine(db_url) as engine: - with engine.connect() as conn: + with engine.begin() as conn: metadata_state1_gxy.create_all(bind=conn) metadata_state1_tsi.create_all(bind=conn) assert is_metadata_loaded(db_url, metadata)