calvin.erfmann/TagStudio
1
0
Fork 0
mirror of https://github.com/TagStudioDev/TagStudio.git synced 2026-02-01 15:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tags no longer lazy load subtags and aliases

Browse Source
This commit is contained in:
Travis Abendshien
2025-01-03 18:29:05 -08:00
parent 1755cb9771
commit 50815aa1b4
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tagstudio/src/core/library/alchemy/library.py
View File

@@ -28,6 +28,7 @@ from sqlalchemy.exc import IntegrityError
from sqlalchemy.orm import (
Session,
contains_eager,
joinedload,
make_transient,
selectinload,
)
@@ -426,17 +427,22 @@ class Library:
with Session(self.engine) as session:
statement = select(Entry).where(Entry.id == entry_id)
if with_fields:
statement = statement.outerjoin(Entry.text_fields).outerjoin(Entry.datetime_fields)
statement = (
statement.outerjoin(Entry.text_fields)
.outerjoin(Entry.datetime_fields)
.options(selectinload(Entry.text_fields), selectinload(Entry.datetime_fields))
)
if with_tags:
statement = statement.outerjoin(Entry.tags)
statement = statement.options(
selectinload(Entry.text_fields),
selectinload(Entry.datetime_fields),
selectinload(Entry.tags).options(
selectinload(Tag.aliases),
selectinload(Tag.subtags),
),
)
statement = (
statement.outerjoin(Entry.tags)
.outerjoin(TagAlias)
.options(
selectinload(Entry.tags).options(
joinedload(Tag.aliases),
joinedload(Tag.subtags),
)
)
)
entry = session.scalar(statement)
if not entry:
return None