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: AND now works correctly with tags

Browse Source
This commit is contained in:
Jann Stute
2024-12-02 20:31:03 +01:00
parent 2d778cebd4
commit 1e8c72c74c
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tagstudio/src/core/library/alchemy/visitors.py
View File

@@ -12,7 +12,23 @@ class SQLBoolExpressionBuilder(BaseVisitor):
return or_(*[self.visit(element) for element in node.elements])
def visit_and_list(self, node: ANDList) -> ColumnExpressionArgument:
return and_(*[self.visit(term) for term in node.terms])
return and_(
*[
Entry.id.in_(
# TODO maybe try to figure out how to remove this code duplication
# My attempts to do this lead to very weird and (to me) unexplainable
# errors. Even just extracting the part up until the where to a seperate
# function leads to an error eventhough that shouldn't be possible.
# -Computerdores
select(Entry.id)
.outerjoin(Entry.tag_box_fields)
.outerjoin(TagBoxField.tags)
.outerjoin(TagAlias)
.where(self.visit(term))
)
for term in node.terms
]
)
def visit_constraint(self, node: Constraint) -> ColumnExpressionArgument:
if len(node.properties) != 0:
@@ -51,7 +67,7 @@ class SQLBoolExpressionBuilder(BaseVisitor):
def visit_not(self, node: Not) -> ColumnExpressionArgument:
return ~Entry.id.in_(
# TODO TSQLANG there is technically code duplication from Library.search_library here
# TODO TSQLANG this is technically code duplication, refer to TODO above for why
select(Entry.id)
.outerjoin(Entry.tag_box_fields)
.outerjoin(TagBoxField.tags)