Feat(clickhouse): add geometry types (#4278)

jwhitaker-gridcog · georgesittas · web-flow · commit 9e11654c6ebf · 2024-10-22T21:13:47.000+03:00
* add clickhouse geometry types

* Fix test

---------

Co-authored-by: Jo &lt;46752250+georgesittas@users.noreply.github.com&gt;
diff --git a/sqlglot/dialects/clickhouse.py b/sqlglot/dialects/clickhouse.py
@@ -187,6 +187,12 @@ class Tokenizer(tokens.Tokenizer):
             "UINT8": TokenType.UTINYINT,
             "IPV4": TokenType.IPV4,
             "IPV6": TokenType.IPV6,
+            "POINT": TokenType.POINT,
+            "RING": TokenType.RING,
+            "LINESTRING": TokenType.LINESTRING,
+            "MULTILINESTRING": TokenType.MULTILINESTRING,
+            "POLYGON": TokenType.POLYGON,
+            "MULTIPOLYGON": TokenType.MULTIPOLYGON,
             "AGGREGATEFUNCTION": TokenType.AGGREGATEFUNCTION,
             "SIMPLEAGGREGATEFUNCTION": TokenType.SIMPLEAGGREGATEFUNCTION,
             "SYSTEM": TokenType.COMMAND,
@@ -865,6 +871,12 @@ class Generator(generator.Generator):
             exp.DataType.Type.UTINYINT: "UInt8",
             exp.DataType.Type.IPV4: "IPv4",
             exp.DataType.Type.IPV6: "IPv6",
+            exp.DataType.Type.POINT: "Point",
+            exp.DataType.Type.RING: "Ring",
+            exp.DataType.Type.LINESTRING: "LineString",
+            exp.DataType.Type.MULTILINESTRING: "MultiLineString",
+            exp.DataType.Type.POLYGON: "Polygon",
+            exp.DataType.Type.MULTIPOLYGON: "MultiPolygon",
             exp.DataType.Type.AGGREGATEFUNCTION: "AggregateFunction",
             exp.DataType.Type.SIMPLEAGGREGATEFUNCTION: "SimpleAggregateFunction",
         }
@@ -961,6 +973,12 @@ class Generator(generator.Generator):
             exp.DataType.Type.ARRAY,
             exp.DataType.Type.MAP,
             exp.DataType.Type.STRUCT,
+            exp.DataType.Type.POINT,
+            exp.DataType.Type.RING,
+            exp.DataType.Type.LINESTRING,
+            exp.DataType.Type.MULTILINESTRING,
+            exp.DataType.Type.POLYGON,
+            exp.DataType.Type.MULTIPOLYGON,
         }
 
         def strtodate_sql(self, expression: exp.StrToDate) -> str:
diff --git a/sqlglot/expressions.py b/sqlglot/expressions.py
@@ -4320,6 +4320,12 @@ class Type(AutoName):
         FLOAT = auto()
         GEOGRAPHY = auto()
         GEOMETRY = auto()
+        POINT = auto()
+        RING = auto()
+        LINESTRING = auto()
+        MULTILINESTRING = auto()
+        POLYGON = auto()
+        MULTIPOLYGON = auto()
         HLLSKETCH = auto()
         HSTORE = auto()
         IMAGE = auto()
diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -356,6 +356,12 @@ class Parser(metaclass=_Parser):
         TokenType.UUID,
         TokenType.GEOGRAPHY,
         TokenType.GEOMETRY,
+        TokenType.POINT,
+        TokenType.RING,
+        TokenType.LINESTRING,
+        TokenType.MULTILINESTRING,
+        TokenType.POLYGON,
+        TokenType.MULTIPOLYGON,
         TokenType.HLLSKETCH,
         TokenType.HSTORE,
         TokenType.PSEUDO_TYPE,
diff --git a/sqlglot/tokens.py b/sqlglot/tokens.py
@@ -175,6 +175,12 @@ class TokenType(AutoName):
     GEOGRAPHY = auto()
     NULLABLE = auto()
     GEOMETRY = auto()
+    POINT = auto()
+    RING = auto()
+    LINESTRING = auto()
+    MULTILINESTRING = auto()
+    POLYGON = auto()
+    MULTIPOLYGON = auto()
     HLLSKETCH = auto()
     HSTORE = auto()
     SUPER = auto()
diff --git a/tests/dialects/test_clickhouse.py b/tests/dialects/test_clickhouse.py
@@ -645,6 +645,19 @@ def test_signed_and_unsigned_types(self):
                 write={"clickhouse": f"CAST(pow(2, 32) AS {data_type})"},
             )
 
+    def test_geom_types(self):
+        data_types = [
+            "Point",
+            "Ring",
+            "LineString",
+            "MultiLineString",
+            "Polygon",
+            "MultiPolygon"
+        ]
+        for data_type in data_types:
+            with self.subTest(f"Casting to ClickHouse {data_type}"):
+                self.validate_identity(f"SELECT CAST(val AS {data_type})")
+
     def test_ddl(self):
         db_table_expr = exp.Table(this=None, db=exp.to_identifier("foo"), catalog=None)
         create_with_cluster = exp.Create(
