Skip to content

Commit f823e41

Browse files
committed
added logs + get_session as session
1 parent 89a9350 commit f823e41

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

src/opengeodeweb_microservice/database/connection.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,19 @@ def init_database(db_path: str = DATABASE_FILENAME) -> None:
1616

1717
if engine is None:
1818
engine = create_engine(
19-
f"sqlite:///{db_path}", connect_args={"check_same_thread": False}
19+
f"sqlite:///{db_path}",
20+
connect_args={"check_same_thread": False},
2021
)
22+
print(f"Database engine created for {db_path}", flush=True)
2123
session_factory = sessionmaker(bind=engine)
2224
scoped_session_registry = scoped_session(session_factory)
2325
Base.metadata.create_all(engine)
26+
print(f"Database engine created DONE for {db_path}")
27+
else:
28+
print(f"Database engine already exists for {db_path}, reusing", flush=True)
2429

2530

2631
def get_session() -> scoped_session[Session]:
2732
if scoped_session_registry is None:
2833
raise RuntimeError()
29-
return scoped_session_registry
34+
return scoped_session_registry()

tests/conftest.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ def _cleanup_database(db_path: str):
3030

3131
@pytest.fixture(autouse=True)
3232
def clean_database():
33-
session = get_session()
34-
session.query(Data).delete()
35-
session.commit()
36-
yield
37-
try:
38-
session.rollback()
39-
except Exception:
40-
pass
33+
with get_session() as session:
34+
session = get_session()
35+
session.query(Data).delete()
36+
session.commit()
37+
yield
38+
try:
39+
session.rollback()
40+
except Exception:
41+
pass

0 commit comments

Comments
 (0)