Skip to content

Commit 79a5775

Browse files
committed
fix: rm session
1 parent 42c58c0 commit 79a5775

File tree

7 files changed

+235
-237
lines changed

7 files changed

+235
-237
lines changed

src/typed_diskcache/database/model.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from sqlalchemy.engine import Connection
3232
from sqlalchemy.ext.asyncio import AsyncConnection
33-
from sqlalchemy.orm import InstrumentedAttribute, Session
33+
from sqlalchemy.orm import InstrumentedAttribute
3434

3535

3636
__all__ = ["Version", "Metadata", "Settings", "Cache"]
@@ -64,11 +64,11 @@ class Version(Base):
6464
revision: Mapped[str] = mapped_column(sa.String(100))
6565

6666
@classmethod
67-
def get(cls, session: Connection) -> str:
67+
def get(cls, connection: Connection) -> str:
6868
"""get revision id"""
6969
stmt = sa.select(cls.revision).where(cls.id == 1)
7070
try:
71-
value = session.scalar(stmt)
71+
value = connection.scalar(stmt)
7272
except OperationalError as exc:
7373
raise te.TypedDiskcacheValueError("there is no version table") from exc
7474

@@ -77,52 +77,50 @@ def get(cls, session: Connection) -> str:
7777
return value
7878

7979
@classmethod
80-
async def aget(cls, session: AsyncConnection) -> str:
80+
async def aget(cls, connection: AsyncConnection) -> str:
8181
"""get revision id"""
8282
stmt = sa.select(cls.revision).where(cls.id == 1)
8383
try:
84-
value = await session.scalar(stmt)
84+
value = await connection.scalar(stmt)
8585
except OperationalError as exc:
8686
raise te.TypedDiskcacheValueError("there is no version table") from exc
8787

8888
if not value:
8989
raise te.TypedDiskcacheValueError("version table is empty")
9090
return value
9191

92-
def set(self, session: Connection) -> None:
92+
def set(self, connection: Connection) -> None:
9393
"""set revision id"""
9494
stmt = (
9595
sa.update(Version)
9696
.values(revision=self.revision)
9797
.where(Version.id == (self.id or 1))
9898
)
99-
session.execute(stmt)
99+
connection.execute(stmt)
100100
logger.debug("set revision id: `%s`", self.revision)
101101

102-
async def aset(self, session: AsyncConnection) -> None:
102+
async def aset(self, connection: AsyncConnection) -> None:
103103
"""set revision id"""
104104
stmt = (
105105
sa.update(Version)
106106
.values(revision=self.revision)
107107
.where(Version.id == (self.id or 1))
108108
)
109-
await session.execute(stmt)
109+
await connection.execute(stmt)
110110
logger.debug("set revision id: `%s`", self.revision)
111111

112112
@classmethod
113-
def delete(
114-
cls, session: Session | Connection, version_id: int | None = None
115-
) -> None:
113+
def delete(cls, connection: Connection, version_id: int | None = None) -> None:
116114
"""delete version table"""
117-
session.execute(sa.delete(cls).where(Version.id == (version_id or 1)))
115+
connection.execute(sa.delete(cls).where(Version.id == (version_id or 1)))
118116
logger.debug("delete version id: `%s`", version_id or 1)
119117

120118
@classmethod
121119
async def adelete(
122-
cls, session: AsyncConnection, version_id: int | None = None
120+
cls, connection: AsyncConnection, version_id: int | None = None
123121
) -> None:
124122
"""delete version table"""
125-
await session.execute(sa.delete(cls).where(Version.id == (version_id or 1)))
123+
await connection.execute(sa.delete(cls).where(Version.id == (version_id or 1)))
126124
logger.debug("delete version id: `%s`", version_id or 1)
127125

128126

0 commit comments

Comments
 (0)