Feat(duckdb): by_name modifiers #2118

tobymao · Aug 28, 2023 · 5b14f52 · 5b14f52
1 parent c066df2
commit 5b14f52
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/sqlglot/expressions.py b/sqlglot/expressions.py
@@ -1605,6 +1605,7 @@ class Insert(DDL):
         "alternative": False,
         "where": False,
         "ignore": False,
+        "by_name": False,
     }
 
     def with_(
@@ -2460,6 +2461,7 @@ class Union(Subqueryable):
         "this": True,
         "expression": True,
         "distinct": False,
+        "by_name": False,
         **QUERY_MODIFIERS,
     }
 

diff --git a/sqlglot/generator.py b/sqlglot/generator.py
@@ -1193,14 +1193,15 @@ def insert_sql(self, expression: exp.Insert) -> str:
         where = f"{self.sep()}REPLACE WHERE {where}" if where else ""
         expression_sql = f"{self.sep()}{self.sql(expression, 'expression')}"
         conflict = self.sql(expression, "conflict")
+        by_name = " BY NAME" if expression.args.get("by_name") else ""
         returning = self.sql(expression, "returning")
 
         if self.RETURNING_END:
             expression_sql = f"{expression_sql}{conflict}{returning}"
         else:
             expression_sql = f"{returning}{expression_sql}{conflict}"
 
-        sql = f"INSERT{alternative}{ignore}{this}{exists}{partition_sql}{where}{expression_sql}"
+        sql = f"INSERT{alternative}{ignore}{this}{by_name}{exists}{partition_sql}{where}{expression_sql}"
         return self.prepend_ctes(expression, sql)
 
     def intersect_sql(self, expression: exp.Intersect) -> str:
@@ -1834,7 +1835,8 @@ def union_sql(self, expression: exp.Union) -> str:
     def union_op(self, expression: exp.Union) -> str:
         kind = " DISTINCT" if self.EXPLICIT_UNION else ""
         kind = kind if expression.args.get("distinct") else " ALL"
-        return f"UNION{kind}"
+        by_name = " BY NAME" if expression.args.get("by_name") else ""
+        return f"UNION{kind}{by_name}"
 
     def unnest_sql(self, expression: exp.Unnest) -> str:
         args = self.expressions(expression, flat=True)

diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -1776,6 +1776,7 @@ def _parse_insert(self) -> exp.Insert:
             exp.Insert,
             comments=comments,
             this=this,
+            by_name=self._match_text_seq("BY", "NAME"),
             exists=self._parse_exists(),
             partition=self._parse_partition(),
             where=self._match_pair(TokenType.REPLACE, TokenType.WHERE)
@@ -2980,6 +2981,7 @@ def _parse_set_operations(self, this: t.Optional[exp.Expression]) -> t.Optional[
             expression,
             this=this,
             distinct=self._match(TokenType.DISTINCT) or not self._match(TokenType.ALL),
+            by_name=self._match_text_seq("BY", "NAME"),
             expression=self._parse_set_operations(self._parse_select(nested=True)),
         )
 

diff --git a/tests/dialects/test_duckdb.py b/tests/dialects/test_duckdb.py
@@ -6,6 +6,8 @@ class TestDuckDB(Validator):
     dialect = "duckdb"
 
     def test_duckdb(self):
+        self.validate_identity("INSERT INTO x BY NAME SELECT 1 AS y")
+        self.validate_identity("SELECT 1 AS x UNION ALL BY NAME SELECT 2 AS x")
         self.validate_identity("SELECT SUM(x) FILTER (x = 1)", "SELECT SUM(x) FILTER(WHERE x = 1)")
 
         # https://github.com/duckdb/duckdb/releases/tag/v0.8.0