Fix: teradata partition order (#1696)

tobymao · May 26, 2023 · 5f45e18 · 5f45e18
1 parent 810522b
commit 5f45e18
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/sqlglot/dialects/teradata.py b/sqlglot/dialects/teradata.py
@@ -142,7 +142,7 @@ class Generator(generator.Generator):
         PROPERTIES_LOCATION = {
             **generator.Generator.PROPERTIES_LOCATION,
             exp.OnCommitProperty: exp.Properties.Location.POST_INDEX,
-            exp.PartitionedByProperty: exp.Properties.Location.POST_INDEX,
+            exp.PartitionedByProperty: exp.Properties.Location.POST_EXPRESSION,
             exp.StabilityProperty: exp.Properties.Location.POST_CREATE,
         }
 

diff --git a/sqlglot/expressions.py b/sqlglot/expressions.py
@@ -1510,6 +1510,7 @@ class Index(Expression):
         "unique": False,
         "primary": False,
         "amp": False,  # teradata
+        "partition_by": False,  # teradata
     }
 
 

diff --git a/sqlglot/generator.py b/sqlglot/generator.py
@@ -878,7 +878,9 @@ def index_sql(self, expression: exp.Index) -> str:
         table = f"{self.INDEX_ON} {table} " if table else ""
         index = "INDEX " if not table else ""
         columns = self.expressions(expression, key="columns", flat=True)
-        return f"{unique}{primary}{amp}{index}{name}{table}({columns})"
+        partition_by = self.expressions(expression, key="partition_by", flat=True)
+        partition_by = f" PARTITION BY {partition_by}" if partition_by else ""
+        return f"{unique}{primary}{amp}{index}{name}{table}({columns}){partition_by}"
 
     def identifier_sql(self, expression: exp.Identifier) -> str:
         text = expression.name

diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -2228,6 +2228,7 @@ def _parse_index(
             unique=unique,
             primary=primary,
             amp=amp,
+            partition_by=self._parse_partition_by(),
         )
 
     def _parse_table_part(self, schema: bool = False) -> t.Optional[exp.Expression]:

diff --git a/tests/dialects/test_teradata.py b/tests/dialects/test_teradata.py
@@ -23,12 +23,8 @@ def test_update(self):
         )
 
     def test_create(self):
-        self.validate_all(
-            "CREATE TABLE x (y INT) PRIMARY INDEX (y) PARTITION BY y INDEX (y)",
-            write={
-                "teradata": "CREATE TABLE x (y INT) PRIMARY INDEX (y) INDEX (y) PARTITION BY y",
-            },
-        )
+        self.validate_identity("CREATE TABLE x (y INT) PRIMARY INDEX (y) PARTITION BY y INDEX (y)")
+        self.validate_identity("CREATE TABLE x (y INT) PARTITION BY y INDEX (y)")
         self.validate_identity(
             "CREATE MULTISET VOLATILE TABLE my_table (id INT) PRIMARY INDEX (id) ON COMMIT PRESERVE ROWS"
         )
@@ -42,7 +38,7 @@ def test_create(self):
             "CREATE TABLE a (b INT) PARTITION BY RANGE_N(b BETWEEN 0, 1 AND 2 EACH 1)"
         )
         self.validate_identity(
-            "CREATE TABLE a (b INT) INDEX (a) PARTITION BY RANGE_N(b BETWEEN *, 1 AND * EACH b)"
+            "CREATE TABLE a (b INT) PARTITION BY RANGE_N(b BETWEEN *, 1 AND * EACH b) INDEX (a)"
         )
 
         self.validate_all(