From ef13454b65804d5ee0da642fce9fcee54b881ef8 Mon Sep 17 00:00:00 2001 From: Sam Yao Date: Wed, 5 Jun 2024 12:00:40 +0800 Subject: [PATCH] refactor: rename make / teardown session methods --- fluent_alchemy/session.py | 4 ++-- tests/conftest.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fluent_alchemy/session.py b/fluent_alchemy/session.py index ac1f8b3..fae14aa 100644 --- a/fluent_alchemy/session.py +++ b/fluent_alchemy/session.py @@ -7,13 +7,13 @@ class ScopedSessionHandler: _session: Optional[scoped_session] = None @classmethod - def set_engine(cls, engine: Engine): + def make_session(cls, engine: Engine): if not isinstance(engine, Engine): raise ValueError("Only support Sqlalchemy Engine Object") cls._session = scoped_session(sessionmaker(engine)) @classmethod - def remove_scoped_session(cls): + def teardown_session(cls): if cls._session: cls._session.remove() diff --git a/tests/conftest.py b/tests/conftest.py index 44d5bb4..642fe2e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -37,12 +37,12 @@ def _test_session(engine): engine.echo = APP_DEBUG Base.metadata.create_all(engine) - Base.set_engine(engine) + Base.make_session(engine) # yield, to let all tests within the scope run yield - Base.remove_scoped_session() + Base.teardown_session() Base.metadata.drop_all(engine) @@ -64,7 +64,7 @@ def email(faker): # # set_up: fill table at beginning of scope # # populate_purchase_table_with_data(db, data) -# Base.set_engine( +# Base.make_session( # create_engine( # # "sqlite:///tests/database/test.db", # "sqlite:///tests/database/test.db", @@ -77,6 +77,6 @@ def email(faker): # # yield, to let all tests within the scope run # yield -# Base.remove_scoped_session() +# Base.teardown_session() # downgrade(alembic_cfg, "base")