From 5ca66d7c826e63cd750bbe65b3794757302dd7c1 Mon Sep 17 00:00:00 2001 From: Pavel Tisnovsky Date: Tue, 14 Oct 2025 09:22:18 +0200 Subject: [PATCH] LCORE-825: fixed new bug found by Pylint --- src/app/database.py | 10 +++++----- tests/unit/app/test_database.py | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/database.py b/src/app/database.py index 290369936..cff58cb49 100644 --- a/src/app/database.py +++ b/src/app/database.py @@ -14,7 +14,7 @@ logger = get_logger(__name__) engine: Engine | None = None -SessionLocal: sessionmaker | None = None +session_local: sessionmaker | None = None def get_engine() -> Engine: @@ -33,11 +33,11 @@ def create_tables() -> None: def get_session() -> Session: """Get a database session. Raises an error if not initialized.""" - if SessionLocal is None: + if session_local is None: raise RuntimeError( "Database session not initialized. Call initialize_database() first." ) - return SessionLocal() + return session_local() def _create_sqlite_engine(config: SQLiteDatabaseConfiguration, **kwargs: Any) -> Engine: @@ -102,7 +102,7 @@ def initialize_database() -> None: """Initialize the database engine.""" db_config = configuration.database_configuration - global engine, SessionLocal # pylint: disable=global-statement + global engine, session_local # pylint: disable=global-statement # Debug print all SQL statements if our logger is at-least DEBUG level echo = bool(logger.isEnabledFor(logging.DEBUG)) @@ -126,4 +126,4 @@ def initialize_database() -> None: assert isinstance(postgres_config, PostgreSQLDatabaseConfiguration) engine = _create_postgres_engine(postgres_config, **create_engine_kwargs) - SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) + session_local = sessionmaker(autocommit=False, autoflush=False, bind=engine) diff --git a/tests/unit/app/test_database.py b/tests/unit/app/test_database.py index 445a1cab4..5b7e1ee03 100644 --- a/tests/unit/app/test_database.py +++ b/tests/unit/app/test_database.py @@ -16,17 +16,17 @@ def reset_database_state_fixture(): """Reset global database state before and after tests.""" original_engine = database.engine - original_session_local = database.SessionLocal + original_session_local = database.session_local # Reset state before test database.engine = None - database.SessionLocal = None + database.session_local = None yield # Restore original state after test database.engine = original_engine - database.SessionLocal = original_session_local + database.session_local = original_session_local @pytest.fixture(name="base_postgres_config") @@ -72,7 +72,7 @@ def test_get_session_when_initialized(self, mocker): mock_session_local = mocker.MagicMock() mock_session = mocker.MagicMock(spec=Session) mock_session_local.return_value = mock_session - database.SessionLocal = mock_session_local + database.session_local = mock_session_local result = database.get_session() @@ -81,7 +81,7 @@ def test_get_session_when_initialized(self, mocker): def test_get_session_when_not_initialized(self): """Test get_session raises RuntimeError when not initialized.""" - database.SessionLocal = None + database.session_local = None with pytest.raises(RuntimeError, match="Database session not initialized"): database.get_session() @@ -257,7 +257,7 @@ def _verify_common_assertions( autocommit=False, autoflush=False, bind=mock_engine ) assert database.engine is mock_engine - assert database.SessionLocal is mock_session_local + assert database.session_local is mock_session_local def test_initialize_database_sqlite( self,