Skip to content

Fix aggregated relation parsing for stored queries #8059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acwhite211 merged 1 commit into from
May 5, 2026
Merged

Fix aggregated relation parsing for stored queries #8059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions specifyweb/backend/stored_queries/queryfieldspec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,21 @@ def from_stringid(cls, stringid: str, is_relation: bool):
node = table

extracted_fieldname, date_part = extract_date_part(field_name)
field = node.get_field(extracted_fieldname, strict=False)
relation_already_in_path = (
is_relation
and len(join_path) > 0
and isinstance(join_path[-1], Relationship)
and join_path[-1].type not in {"many-to-one", "one-to-one"}
and join_path[-1].name.lower() == extracted_fieldname.lower()
)
field = (
None
if relation_already_in_path
else node.get_field(extracted_fieldname, strict=False)
)

tree_rank_name = None
if field is None: # try finding tree
if field is None and not relation_already_in_path: # try finding tree
tree_rank_name, field = find_tree_and_field(node, extracted_fieldname)
if tree_rank_name:
tree_rank = TreeRankQuery.create(
Expand Down
Loading