Skip to content

Preserve nested right-hand expressions in grouped filters #327

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
phanak-sap merged 1 commit into from
Oct 29, 2026
Merged

Preserve nested right-hand expressions in grouped filters #327

Show file tree
Hide file tree
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
11 changes: 11 additions & 0 deletions pyodata/v2/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,12 +1223,23 @@ def _decode_and_combine_filter_expression(self, filter_expression):
filter_expressions = [self._decode_expression(expr, val) for expr, val in filter_expression.expressions]
return self._combine_expressions(filter_expressions)

def _decode_grouped_query_object(self, expr):
"""Preserve every right-hand subtree in an opt-in grouped expression."""
lhs = self._decode_and_combine_filter_expression(expr)
if expr.other is None:
return lhs
rhs = self._decode_grouped_query_object(expr.other)
return f'({lhs}) {expr.operator} ({rhs})'

def _process_query_objects(self):
"""Processes FilterExpression objects to OData lookups"""

filter_expressions = []

for expr in self._filter_expressions:
if self._group:
filter_expressions.append(self._decode_grouped_query_object(expr))
continue
lhs_expressions = self._decode_and_combine_filter_expression(expr)

if expr.other is not None:
Expand Down
82 changes: 51 additions & 31 deletions tests/test_filter_grouping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,21 @@ def evaluate(node, row):

@pytest.mark.parametrize('build, expected, expected_filter, expected_url', [
pytest.param(
Comment thread
phanak-sap marked this conversation as resolved.
Resolved
lambda request: request.filter(Q(ID=1) | Q(NickName='Tim'), NameLast='Smith', group=True),
{1, 3}, "((NameLast eq 'Smith') and ((ID eq 1) or (NickName eq 'Tim')))",
lambda request: request.filter('ID eq 2 or ID eq 3', group=True),
{2, 3}, '(ID eq 2 or ID eq 3)',
'http://odata.example.com/Employees?%24filter=%28ID+eq+2+or+ID+eq+3%29',
id='raw-group'),
pytest.param(
lambda request: request.filter(ID=2).filter('ID eq 3', group=True),
{3}, '(ID eq 3)',
'http://odata.example.com/Employees?%24filter=%28ID+eq+3%29',
id='raw-replaces-previous'),
pytest.param(
lambda request: request.filter(NameLast='Müller', NickName='René', group=True),
{6}, "((NameLast eq 'Müller') and (NickName eq 'René'))",
'http://odata.example.com/Employees?%24filter='
'%28%28NameLast+eq+%27Smith%27%29+and+%28%28ID+eq+1%29+or+%28NickName+eq+%27Tim%27%29%29%29',
id='or-with-keyword'),
'%28%28NameLast+eq+%27M%C3%BCller%27%29+and+%28NickName+eq+%27Ren%C3%A9%27%29%29',
id='unicode-encoding'),
pytest.param(
lambda request: request.filter(ID__in=[2, 3], NameLast='Smith', group=True),
{3}, "((ID eq 2 or ID eq 3) and (NameLast eq 'Smith'))",
Expand All @@ -67,12 +77,6 @@ def evaluate(node, row):
'http://odata.example.com/Employees?%24filter='
'%28%28ID+eq+2+or+ID+eq+3%29+and+%28NameLast+eq+%27Smith%27%29%29',
id='in-within-q'),
pytest.param(
lambda request: request.filter(Q(ID__in=[2, 3], NameLast='Smith') | Q(ID=5), group=True),
{3, 5}, "(((ID eq 2 or ID eq 3) and (NameLast eq 'Smith')) or (ID eq 5))",
'http://odata.example.com/Employees?%24filter='
'%28%28%28ID+eq+2+or+ID+eq+3%29+and+%28NameLast+eq+%27Smith%27%29%29+or+%28ID+eq+5%29%29',
id='compound-or'),
pytest.param(
lambda request: request.filter(Q(ID__in=[2, 3]) & Q(NameLast='Smith'), group=True),
{3}, "((ID eq 2 or ID eq 3) and (NameLast eq 'Smith'))",
Expand All @@ -86,39 +90,55 @@ def evaluate(node, row):
'%28%28%28ID+eq+2%29+or+%28ID+eq+3%29%29+and+%28NameLast+eq+%27Smith%27%29%29',
id='multiple-q'),
pytest.param(
lambda request: request.filter(Q(ID=2) | Q(ID=3)).filter(NameLast='Smith', group=True),
{3}, "((ID eq 2) or (ID eq 3)) and (NameLast eq 'Smith')",
lambda request: request.filter(Q(ID=1) | Q(NickName='Tim'), NameLast='Smith', group=True),
{1, 3}, "((NameLast eq 'Smith') and ((ID eq 1) or (NickName eq 'Tim')))",
'http://odata.example.com/Employees?%24filter='
'%28%28ID+eq+2%29+or+%28ID+eq+3%29%29+and+%28NameLast+eq+%27Smith%27%29',
id='group-previous-call'),
'%28%28NameLast+eq+%27Smith%27%29+and+%28%28ID+eq+1%29+or+%28NickName+eq+%27Tim%27%29%29%29',
id='or-with-keyword'),
pytest.param(
lambda request: request.filter(ID__in=[2, 3], group=True).filter(NameLast='Smith'),
{3}, "(ID eq 2 or ID eq 3) and NameLast eq 'Smith'",
lambda request: request.filter(Q(ID__in=[2, 3], NameLast='Smith') | Q(ID=5), group=True),
{3, 5}, "(((ID eq 2 or ID eq 3) and (NameLast eq 'Smith')) or (ID eq 5))",
'http://odata.example.com/Employees?%24filter='
'%28ID+eq+2+or+ID+eq+3%29+and+NameLast+eq+%27Smith%27',
id='group-before-legacy-tail'),
'%28%28%28ID+eq+2+or+ID+eq+3%29+and+%28NameLast+eq+%27Smith%27%29%29+or+%28ID+eq+5%29%29',
id='compound-or'),
pytest.param(
lambda request: request.filter('ID eq 2 or ID eq 3').filter(NameLast='Smith', group=True),
{3}, "(ID eq 2 or ID eq 3) and (NameLast eq 'Smith')",
'http://odata.example.com/Employees?%24filter='
'%28ID+eq+2+or+ID+eq+3%29+and+%28NameLast+eq+%27Smith%27%29',
id='raw-before-group'),
pytest.param(
lambda request: request.filter('ID eq 2 or ID eq 3', group=True),
{2, 3}, '(ID eq 2 or ID eq 3)',
'http://odata.example.com/Employees?%24filter=%28ID+eq+2+or+ID+eq+3%29',
id='raw-group'),
pytest.param(
lambda request: request.filter(ID=2).filter('ID eq 3', group=True),
{3}, '(ID eq 3)',
'http://odata.example.com/Employees?%24filter=%28ID+eq+3%29',
id='raw-replaces-previous'),
lambda request: request.filter(ID__in=[2, 3], group=True).filter(NameLast='Smith'),
{3}, "(ID eq 2 or ID eq 3) and NameLast eq 'Smith'",
'http://odata.example.com/Employees?%24filter='
'%28ID+eq+2+or+ID+eq+3%29+and+NameLast+eq+%27Smith%27',
id='group-before-legacy-tail'),
pytest.param(
lambda request: request.filter(NameLast='Müller', NickName='René', group=True),
{6}, "((NameLast eq 'Müller') and (NickName eq 'René'))",
lambda request: request.filter(Q(ID=2) | Q(ID=3)).filter(NameLast='Smith', group=True),
{3}, "((ID eq 2) or (ID eq 3)) and (NameLast eq 'Smith')",
'http://odata.example.com/Employees?%24filter='
'%28%28NameLast+eq+%27M%C3%BCller%27%29+and+%28NickName+eq+%27Ren%C3%A9%27%29%29',
id='unicode-encoding'),
'%28%28ID+eq+2%29+or+%28ID+eq+3%29%29+and+%28NameLast+eq+%27Smith%27%29',
id='group-previous-call'),
pytest.param(
lambda request: request.filter(ID__in=[1, 2, 3], group=True).filter(Q(NameLast='Smith') | Q(NameLast='Jones'), group=True).filter(Q(NickName='Tim') | Q(NickName='Al'), group=True),
{1, 2, 3}, "(((ID eq 1 or ID eq 2 or ID eq 3)) and ((NameLast eq 'Smith') or (NameLast eq 'Jones'))) and ((NickName eq 'Tim') or (NickName eq 'Al'))",
'http://odata.example.com/Employees?%24filter=%28%28%28ID+eq+1+or+ID+eq+2+or+ID+eq+3%29%29+and+%28%28NameLast+eq+%27Smith%27%29+or+%28NameLast+eq+%27Jones%27%29%29%29+and+%28%28NickName+eq+%27Tim%27%29+or+%28NickName+eq+%27Al%27%29%29',
id='three-grouped-calls'),
pytest.param(
lambda request: request.filter(Q(ID=1) | (Q(ID=2) | (Q(ID=3) & Q(NameLast='Smith'))), group=True),
{1, 2, 3}, "((ID eq 1) or ((ID eq 2) or ((ID eq 3) and (NameLast eq 'Smith'))))",
'http://odata.example.com/Employees?%24filter=%28%28ID+eq+1%29+or+%28%28ID+eq+2%29+or+%28%28ID+eq+3%29+and+%28NameLast+eq+%27Smith%27%29%29%29%29',
id='nested-or-and-tail'),
pytest.param(
lambda request: request.filter(Q(NameLast='Smith') & (Q(ID=1) | (Q(ID=3) & Q(NickName='Tim'))), group=True),
{1, 3}, "((NameLast eq 'Smith') and ((ID eq 1) or ((ID eq 3) and (NickName eq 'Tim'))))",
'http://odata.example.com/Employees?%24filter=%28%28NameLast+eq+%27Smith%27%29+and+%28%28ID+eq+1%29+or+%28%28ID+eq+3%29+and+%28NickName+eq+%27Tim%27%29%29%29%29',
id='and-around-nested-or'),
pytest.param(
lambda request: request.filter(Q(ID=1) | (Q(ID=2) & (Q(NameLast='Smith') | Q(NickName='Tim'))), group=True),
{1, 2}, "((ID eq 1) or ((ID eq 2) and ((NameLast eq 'Smith') or (NickName eq 'Tim'))))",
'http://odata.example.com/Employees?%24filter=%28%28ID+eq+1%29+or+%28%28ID+eq+2%29+and+%28%28NameLast+eq+%27Smith%27%29+or+%28NickName+eq+%27Tim%27%29%29%29%29',
id='right-nested-alternating'),
])
@responses.activate
def test_grouped_filter_selects_expected_rows(employees, build, expected, expected_filter, expected_url):
Expand Down
Loading