Skip to content

[Fix] Fix issue with subtree generalization not applying to SELECT DISTINCT ON #87

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
colinthebomb1 merged 1 commit into from
Nov 18, 2025
Merged

[Fix] Fix issue with subtree generalization not applying to SELECT DISTINCT ON #87

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
4 changes: 2 additions & 2 deletions core/rule_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,13 +1472,13 @@ def replaceSubtreesOfASTJson(astJson: Any, path: list, subtree: dict, var: str)
# if the subtree is the same as the given subtree
#
if RuleGenerator.sameSubtree(astJson, subtree):
# special case for 'select' list
# special case for 'select' or 'distinct_on' list
# e.g., for {'select': [{'value': 'V001.V002'}, {'value': 'V001.age'}, ...]}
# astJson = {'value': 'V001.V002'}
# subtree = {'value': 'V001.V002'}
# var = 'V005'
# we should return {'value': 'V005'}
if len(path) > 0 and path[-1] == 'select' and 'value'in astJson.keys():
if len(path) > 0 and path[-1] in ['select', 'distinct_on'] and 'value'in astJson.keys():
return {'value': var}
# otherwise
return var
Expand Down
4 changes: 2 additions & 2 deletions tests/test_rule_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2556,8 +2556,8 @@ def test_generate_spreadsheet_id_18():
assert type(rule) is dict

q0_rule, q1_rule = unify_variable_names(rule['pattern'], rule['rewrite'])
assert StringUtil.strim(RuleGenerator._fingerPrint(q0_rule)) == StringUtil.strim(RuleGenerator._fingerPrint("SELECT DISTINCT ON (<x1>) <x2>, <x3>, <x4>, COALESCE(<x5>.<x6>, <x7>), <<x8>> FROM <x9> LEFT JOIN <x5> ON <<x10>> LEFT JOIN <x11> ON <<x12>> WHERE <<x13>> AND <x11>.<x14> IN (<x15>, <x16>, <x17>, <x18>, <x19>, <x20>, <x21>) AND <<x22>> ORDER BY <x9>.<x23> DESC"))
assert StringUtil.strim(RuleGenerator._fingerPrint(q1_rule)) == StringUtil.strim(RuleGenerator._fingerPrint("SELECT <x2>, <x3>, <x1>, COALESCE((SELECT <x4>.<x5> FROM <x4> WHERE <<x9>> AND <<x21>> LIMIT <x15>), <x6>), (SELECT <<x7>> FROM <x10> WHERE <<x11>> AND <x10>.<x13> IN (<x14>, <x15>, <x16>, <x17>, <x18>, <x19>, <x20>) LIMIT <x15>) FROM <x8> WHERE <<x12>>"))
assert q0_rule == "SELECT DISTINCT ON (<x1>) <x2>, <x3>, <x1>, COALESCE(<x4>.<x5>, <x6>), <<x7>> FROM <x8> LEFT JOIN <x4> ON <<x9>> LEFT JOIN <x10> ON <<x11>> WHERE <<x12>> AND <x10>.<x13> IN (<x14>, <x15>, <x16>, <x17>, <x18>, <x19>, <x20>) AND <<x21>> ORDER BY <x8>.<x22> DESC"
assert q1_rule == "SELECT <x2>, <x3>, <x1>, COALESCE((SELECT <x4>.<x5> FROM <x4> WHERE <<x9>> AND <<x21>> LIMIT <x15>), <x6>), (SELECT <<x7>> FROM <x10> WHERE <<x11>> AND <x10>.<x13> IN (<x14>, <x15>, <x16>, <x17>, <x18>, <x19>, <x20>) LIMIT <x15>) FROM <x8> WHERE <<x12>>"

def test_generate_spreadsheet_id_20():
q0 = """SELECT * FROM (SELECT * FROM (SELECT NULL FROM EMP) WHERE N IS NULL) WHERE N IS NULL"""
Expand Down