Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.20.0
rev: v3.21.2
hooks:
- id: pyupgrade
args:
- --py39-plus
- repo: https://github.com/hadialqattan/pycln
rev: v2.5.0
rev: v2.6.0
hooks:
- id: pycln
args:
Expand All @@ -22,19 +22,19 @@ repos:
additional_dependencies:
- black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.12.12"
rev: "v0.16.9"
hooks:
- id: ruff
args:
- --fix
- id: ruff-format
- repo: https://github.com/jvllmr/pre-commit-prettier
rev: v3.6.2
rev: v3.9.9
hooks:
- id: prettier
additional_dependencies: [prettier@latest, prettier-plugin-toml@latest]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: "v1.17.1"
rev: "v2.3.1"
hooks:
- id: mypy
exclude: ^tests/.*
Expand Down
2 changes: 1 addition & 1 deletion src/sqlalchemy_sessionload/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .options import SessionLoad, SessionRelationshipLoad
from .plugin import SQLAlchemySessionLoad

__all__ = ["SessionLoad", "SessionRelationshipLoad", "SQLAlchemySessionLoad"]
__all__ = ["SQLAlchemySessionLoad", "SessionLoad", "SessionRelationshipLoad"]
2 changes: 1 addition & 1 deletion src/sqlalchemy_sessionload/sort.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Order(Enum):
DESC = 1


TSortSpec = t.Tuple[str, Order]
TSortSpec = tuple[str, Order]


def _cmp_func(*args: TSortSpec):
Expand Down
9 changes: 4 additions & 5 deletions tests/model.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import typing as t
from datetime import datetime

import sqlalchemy as sa
Expand Down Expand Up @@ -39,14 +38,14 @@ class User(DeclarativeBase):
)
name: sa_orm.Mapped[str] = sa.Column(sa.String, nullable=False, default=faker.name)

chat_rooms: sa_orm.Mapped[t.List["Chatroom"]] = sa_orm.relationship(
chat_rooms: sa_orm.Mapped[list["Chatroom"]] = sa_orm.relationship(
"Chatroom",
secondary=chatroom_members_table,
back_populates="members",
lazy="raise",
)

messages: sa_orm.Mapped[t.List["Message"]] = sa_orm.relationship(
messages: sa_orm.Mapped[list["Message"]] = sa_orm.relationship(
"Message",
back_populates="user",
lazy="raise",
Expand All @@ -63,15 +62,15 @@ class Chatroom(DeclarativeBase):
sa.Integer, autoincrement=True, primary_key=True
)

members: sa_orm.Mapped[t.List[User]] = sa_orm.relationship(
members: sa_orm.Mapped[list[User]] = sa_orm.relationship(
"User",
secondary=chatroom_members_table,
back_populates="chat_rooms",
order_by="asc(User.name)",
lazy="raise",
)

messages: sa_orm.Mapped[t.List["Message"]] = sa_orm.relationship(
messages: sa_orm.Mapped[list["Message"]] = sa_orm.relationship(
"Message",
back_populates="chatroom",
lazy="raise",
Expand Down
3 changes: 1 addition & 2 deletions tests/test_loaders.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from __future__ import annotations


import sqlalchemy as sa
import sqlalchemy.orm as sa_orm

Expand All @@ -10,7 +9,7 @@
load_from_session,
)

from .model import Message, User, Chatroom
from .model import Chatroom, Message, User

message_mapper = Message.__mapper__

Expand Down
8 changes: 4 additions & 4 deletions tests/test_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_basic_load(db_session: sa_orm.Session, benchmark: BenchmarkFixture):
preloaded_messages = db_session.execute(sa.select(Message)).all() # noqa: F841

@benchmark # type:ignore[no-redef]
def loaded_messages(): # noqa: F811
def loaded_messages():
stmt = sa.select(Message)
return db_session.execute(stmt).all()

Expand All @@ -24,7 +24,7 @@ def loaded_messages(): # noqa: F811
def test_basic_load_with_option(
db_session: sa_orm.Session, benchmark: BenchmarkFixture
):
preloaded_messages = db_session.execute(sa.select(Message)).all() # noqa: F841
preloaded_messages = db_session.execute(sa.select(Message)).all()

@benchmark # type:ignore[no-redef]
def loaded_messages():
Expand Down Expand Up @@ -88,13 +88,13 @@ def test_equal_result_metadata_keys(db_session: sa_orm.Session):
def test_relationship_load(
db_session: sa_orm.Session, benchmark: BenchmarkFixture, basic_options, lib_options
):
preloaded_messages = db_session.execute( # noqa: F841
preloaded_messages = db_session.execute(
sa.select(Message).options(*basic_options)
).all()
assert len(preloaded_messages) > 0

@benchmark
def loaded_messages(): # noqa: F811
def loaded_messages():
stmt = sa.select(Message).options(*basic_options)
return db_session.execute(stmt).all()

Expand Down
Loading