Skip to content

Commit 0ed0817

Browse files
committed
lock lib version and fix for sqlalchemy 14+
1 parent 5ce775c commit 0ed0817

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

db.sqlite

56 KB
Binary file not shown.

library_backend/database.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import random
2+
import sqlalchemy
23
import uuid
4+
5+
36
from datetime import date
47
from functools import wraps
58
from faker import Faker
@@ -39,16 +42,17 @@ def __init__(self):
3942
self.engine = create_engine("sqlite:///db.sqlite", echo=False)
4043
self.session = None
4144
self.connection_name = None
45+
self.inspect = sqlalchemy.inspect(self.engine)
4246

4347
def __enter__(self):
4448
self.session = sessionmaker(bind=self.engine)()
4549

4650
@check_session()
4751
def create_tables_if_not_exists(self):
4852
try:
49-
if not (self.engine.dialect.has_table(self.engine, UsersDBModel.__tablename__)
50-
and self.engine.dialect.has_table(self.engine, BooksDBModel.__tablename__)
51-
and self.engine.dialect.has_table(self.engine, ReservationsDBModel.__tablename__)):
53+
if not (self.inspect.has_table(UsersDBModel.__tablename__, schema=None)
54+
and self.inspect.has_table(BooksDBModel.__tablename__, schema=None)
55+
and self.inspect.has_table(ReservationsDBModel.__tablename__, schema=None)):
5256
logger.info(f"Creating table {UsersDBModel.__tablename__}...")
5357
try:
5458
Base.metadata.create_all(self.engine)

requirements.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
flask
2-
sqlalchemy
3-
faker
4-
pytest
1+
mock==4.0.3
2+
flask==1.1.2
3+
sqlalchemy==1.4.35
4+
faker==13.3.4
5+
pytest==7.11.1

tests/books_endpoints/test_book_service.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import copy
22

3-
import mock
43
import pytest
54

5+
from unittest import mock
6+
67
from library_backend.exceptions import BookAlreadyExists, ResourceNotFound
78
from library_backend.service import BookService, BooksDBModel
89

0 commit comments

Comments
 (0)