fix #417: parse union distinct correctly (#420)

* fix #417: parse union distinct correctly * chore: bump primer refs
tconbeer · May 10, 2023 · b50aec9 · b50aec9
1 parent 3d6db76
commit b50aec9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+-   fixes a bug when lexing `union distinct` tokens ([#417](https://github.com/tconbeer/sqlfmt/issues/417) - thank you, [@paschmaria](https://github.com/paschmaria)!)
 
 ## [0.18.0] - 2023-04-19
 

diff --git a/src/sqlfmt/rules/__init__.py b/src/sqlfmt/rules/__init__.py
@@ -178,7 +178,7 @@
         name="set_operator",
         priority=1320,
         pattern=group(
-            r"(union|intersect|except|minus)(\s+all|distinct)?",
+            r"(union|intersect|except|minus)(\s+(all|distinct))?",
         )
         + group(r"\W", r"$"),
         action=actions.handle_set_operator,

diff --git a/src/sqlfmt_primer/primer.py b/src/sqlfmt_primer/primer.py
@@ -75,7 +75,7 @@ def get_projects() -> List[SQLProject]:
         SQLProject(
             name="dbt_utils",
             git_url="https://github.com/tconbeer/dbt-utils.git",
-            git_ref="ae160c9",  # sqlfmt 54b8edd
+            git_ref="c62b99f",  # sqlfmt 6e9615c
             expected_changed=0,
             expected_unchanged=131,
             expected_errored=0,

diff --git a/tests/data/unformatted/114_unions.sql b/tests/data/unformatted/114_unions.sql
@@ -43,6 +43,9 @@ SELECT *, 'mr' AS geo_code, 'Mauritania' AS geo, 'Africa' AS region, 'Western Af
 SELECT *, 'mu' AS geo_code, 'Mauritius' AS geo, 'Africa' AS region, 'Eastern Africa' AS subregion FROM `chrome-ux-report.country_mu.201907` UNION ALL
 SELECT *, 'yt' AS geo_code, 'Mayotte' AS geo, 'Africa' AS region, 'Eastern Africa' AS subregion FROM `chrome-ux-report.country_yt.201907`
 ) select geo from geos
+union distinct
+select *
+from foo
 )))))__SQLFMT_OUTPUT__(((((
 (
     select *
@@ -113,3 +116,6 @@ with
     )
 select geo
 from geos
+union distinct
+select *
+from foo
diff --git a/tests/unit_tests/test_rule.py b/tests/unit_tests/test_rule.py
@@ -176,6 +176,7 @@ def get_rule(ruleset: List[Rule], rule_name: str) -> Rule:
         (MAIN, "unterm_keyword", "delete from"),
         (MAIN, "set_operator", "union"),
         (MAIN, "set_operator", "union all"),
+        (MAIN, "set_operator", "union distinct"),
         (MAIN, "set_operator", "intersect"),
         (MAIN, "set_operator", "minus"),
         (MAIN, "set_operator", "except"),