Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 41a887a73b | |||
| 1c42e4b0af | |||
| 6755ca8c27 | |||
| 280882f515 | |||
| 0e3c9fb52e | |||
| cc6ca5982c | |||
| c9fd066c31 |
@@ -6,14 +6,21 @@ from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_asyn
|
|||||||
|
|
||||||
from cartsnitch_api.config import settings
|
from cartsnitch_api.config import settings
|
||||||
|
|
||||||
engine = create_async_engine(
|
|
||||||
settings.database_url,
|
def _build_engine_kwargs() -> dict:
|
||||||
echo=False,
|
url = settings.database_url
|
||||||
pool_size=10,
|
kwargs: dict = {"echo": False}
|
||||||
max_overflow=20,
|
if not url.startswith("sqlite"):
|
||||||
pool_pre_ping=True,
|
kwargs.update(
|
||||||
pool_recycle=3600,
|
pool_size=10,
|
||||||
)
|
max_overflow=20,
|
||||||
|
pool_pre_ping=True,
|
||||||
|
pool_recycle=3600,
|
||||||
|
)
|
||||||
|
return kwargs
|
||||||
|
|
||||||
|
|
||||||
|
engine = create_async_engine(settings.database_url, **_build_engine_kwargs())
|
||||||
async_session_factory = async_sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
|
async_session_factory = async_sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+32
-5
@@ -51,8 +51,24 @@ def disable_rate_limiting():
|
|||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def engine():
|
def engine():
|
||||||
"""Sync in-memory SQLite engine for model unit tests."""
|
"""Sync in-memory SQLite engine for model unit tests.
|
||||||
|
|
||||||
|
Strips ALL PostgreSQL-specific server_default expressions so SQLite can
|
||||||
|
handle all column inserts without missing-function errors.
|
||||||
|
"""
|
||||||
eng = create_engine("sqlite:///:memory:")
|
eng = create_engine("sqlite:///:memory:")
|
||||||
|
|
||||||
|
for table in Base.metadata.tables.values():
|
||||||
|
for col in table.columns.values():
|
||||||
|
sd = col.server_default
|
||||||
|
if sd is not None:
|
||||||
|
if not hasattr(sd, "expression"):
|
||||||
|
col.server_default = None
|
||||||
|
continue
|
||||||
|
expr_str = str(sd.expression).lower()
|
||||||
|
if "gen_random_uuid" in expr_str or "gen_random_bytes" in expr_str:
|
||||||
|
col.server_default = None
|
||||||
|
|
||||||
Base.metadata.create_all(eng)
|
Base.metadata.create_all(eng)
|
||||||
yield eng
|
yield eng
|
||||||
eng.dispose()
|
eng.dispose()
|
||||||
@@ -76,9 +92,19 @@ async def db_engine():
|
|||||||
cursor.execute("PRAGMA foreign_keys=ON")
|
cursor.execute("PRAGMA foreign_keys=ON")
|
||||||
cursor.close()
|
cursor.close()
|
||||||
|
|
||||||
|
for table in Base.metadata.tables.values():
|
||||||
|
for col in table.columns.values():
|
||||||
|
sd = col.server_default
|
||||||
|
if sd is not None:
|
||||||
|
if not hasattr(sd, "expression"):
|
||||||
|
col.server_default = None
|
||||||
|
continue
|
||||||
|
expr_str = str(sd.expression).lower()
|
||||||
|
if "gen_random_uuid" in expr_str or "gen_random_bytes" in expr_str:
|
||||||
|
col.server_default = None
|
||||||
|
|
||||||
async with engine.begin() as conn:
|
async with engine.begin() as conn:
|
||||||
await conn.run_sync(Base.metadata.create_all)
|
await conn.run_sync(Base.metadata.create_all)
|
||||||
# Create Better-Auth tables (not managed by SQLAlchemy models)
|
|
||||||
await conn.execute(
|
await conn.execute(
|
||||||
text("""
|
text("""
|
||||||
CREATE TABLE IF NOT EXISTS sessions (
|
CREATE TABLE IF NOT EXISTS sessions (
|
||||||
@@ -178,9 +204,9 @@ async def _create_test_user_and_session(
|
|||||||
await conn.execute(
|
await conn.execute(
|
||||||
text(
|
text(
|
||||||
"INSERT INTO users (id, email, hashed_password, display_name, "
|
"INSERT INTO users (id, email, hashed_password, display_name, "
|
||||||
"email_verified, created_at, updated_at) "
|
"email_verified, email_inbound_token, created_at, updated_at) "
|
||||||
"VALUES (:id, :email, :hashed_password, :display_name, :email_verified, "
|
"VALUES (:id, :email, :hashed_password, :display_name, "
|
||||||
":created_at, :updated_at)"
|
":email_verified, :email_inbound_token, :created_at, :updated_at)"
|
||||||
),
|
),
|
||||||
{
|
{
|
||||||
"id": user_id,
|
"id": user_id,
|
||||||
@@ -188,6 +214,7 @@ async def _create_test_user_and_session(
|
|||||||
"hashed_password": "not-used-with-better-auth",
|
"hashed_password": "not-used-with-better-auth",
|
||||||
"display_name": display_name,
|
"display_name": display_name,
|
||||||
"email_verified": False,
|
"email_verified": False,
|
||||||
|
"email_inbound_token": secrets.token_urlsafe(16),
|
||||||
"created_at": now,
|
"created_at": now,
|
||||||
"updated_at": now,
|
"updated_at": now,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -139,8 +139,8 @@ async def test_expired_session_rejected(client, db_engine):
|
|||||||
await conn.execute(
|
await conn.execute(
|
||||||
text(
|
text(
|
||||||
"INSERT INTO users (id, email, hashed_password, display_name, "
|
"INSERT INTO users (id, email, hashed_password, display_name, "
|
||||||
"email_verified, created_at, updated_at) "
|
"email_verified, email_inbound_token, created_at, updated_at) "
|
||||||
"VALUES (:id, :email, :hp, :dn, :ev, :ca, :ua)"
|
"VALUES (:id, :email, :hp, :dn, :ev, :token, :ca, :ua)"
|
||||||
),
|
),
|
||||||
{
|
{
|
||||||
"id": user_id,
|
"id": user_id,
|
||||||
@@ -148,6 +148,7 @@ async def test_expired_session_rejected(client, db_engine):
|
|||||||
"hp": "unused",
|
"hp": "unused",
|
||||||
"dn": "Expired User",
|
"dn": "Expired User",
|
||||||
"ev": False,
|
"ev": False,
|
||||||
|
"token": secrets.token_urlsafe(16),
|
||||||
"ca": now,
|
"ca": now,
|
||||||
"ua": now,
|
"ua": now,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -66,8 +66,8 @@ class TestSessionValidation:
|
|||||||
await conn.execute(
|
await conn.execute(
|
||||||
text(
|
text(
|
||||||
"INSERT INTO users (id, email, hashed_password, display_name, "
|
"INSERT INTO users (id, email, hashed_password, display_name, "
|
||||||
"email_verified, created_at, updated_at) "
|
"email_verified, email_inbound_token, created_at, updated_at) "
|
||||||
"VALUES (:id, :email, :hp, :dn, :ev, :ca, :ua)"
|
"VALUES (:id, :email, :hp, :dn, :ev, :token, :ca, :ua)"
|
||||||
),
|
),
|
||||||
{
|
{
|
||||||
"id": user_id,
|
"id": user_id,
|
||||||
@@ -75,6 +75,7 @@ class TestSessionValidation:
|
|||||||
"hp": "unused",
|
"hp": "unused",
|
||||||
"dn": "Expired User",
|
"dn": "Expired User",
|
||||||
"ev": False,
|
"ev": False,
|
||||||
|
"token": secrets.token_urlsafe(16),
|
||||||
"ca": now,
|
"ca": now,
|
||||||
"ua": now,
|
"ua": now,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,6 +17,18 @@ from cartsnitch_api.models.user import User, UserStoreAccount
|
|||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def engine():
|
def engine():
|
||||||
eng = create_engine("sqlite:///:memory:")
|
eng = create_engine("sqlite:///:memory:")
|
||||||
|
|
||||||
|
for table in Base.metadata.tables.values():
|
||||||
|
for col in table.columns.values():
|
||||||
|
sd = col.server_default
|
||||||
|
if sd is not None:
|
||||||
|
if not hasattr(sd, "expression"):
|
||||||
|
col.server_default = None
|
||||||
|
continue
|
||||||
|
expr_str = str(sd.expression).lower()
|
||||||
|
if "gen_random_uuid" in expr_str or "gen_random_bytes" in expr_str:
|
||||||
|
col.server_default = None
|
||||||
|
|
||||||
Base.metadata.create_all(eng)
|
Base.metadata.create_all(eng)
|
||||||
yield eng
|
yield eng
|
||||||
eng.dispose()
|
eng.dispose()
|
||||||
|
|||||||
Reference in New Issue
Block a user