chore: map timestampntz to timestamp by default

Author: cpcloud

ibis/backends/sql/datatypes.py

@@ -253,25 +253,21 @@ def _from_sqlglot_STRUCT(
 
     @classmethod
     def _from_sqlglot_TIMESTAMP(
-        cls, scale=None, nullable: bool | None = None
+        cls, scale: int | None = None, nullable: bool | None = None
     ) -> dt.Timestamp:
         return dt.Timestamp(
             scale=cls.default_temporal_scale if scale is None else int(scale.this.this),
             nullable=nullable,
         )
 
     @classmethod
-    def _from_sqlglot_TIMESTAMPTZ(
+    def _from_sqlglot_TIMESTAMPNTZ(
         cls, scale=None, nullable: bool | None = None
     ) -> dt.Timestamp:
-        return dt.Timestamp(
-            timezone="UTC",
-            scale=cls.default_temporal_scale if scale is None else int(scale.this.this),
-            nullable=nullable,
-        )
+        return cls._from_sqlglot_TIMESTAMP(scale=scale, nullable=nullable)
 
     @classmethod
-    def _from_sqlglot_TIMESTAMPLTZ(
+    def _from_sqlglot_TIMESTAMPTZ(
         cls, scale=None, nullable: bool | None = None
     ) -> dt.Timestamp:
         return dt.Timestamp(
@@ -281,11 +277,11 @@ def _from_sqlglot_TIMESTAMPLTZ(
         )
 
     @classmethod
-    def _from_sqlglot_TIMESTAMPNTZ(
+    def _from_sqlglot_TIMESTAMPLTZ(
         cls, scale=None, nullable: bool | None = None
     ) -> dt.Timestamp:
         return dt.Timestamp(
-            timezone=None,
+            timezone="UTC",
             scale=cls.default_temporal_scale if scale is None else int(scale.this.this),
             nullable=nullable,
         )
@@ -614,7 +610,9 @@ def _from_sqlglot_DATETIME(
         )
 
     @classmethod
-    def _from_sqlglot_TIMESTAMP(cls, nullable: bool | None = None) -> dt.Timestamp:
+    def _from_sqlglot_TIMESTAMP(
+        cls, scale: int | None = None, nullable: bool | None = None
+    ) -> dt.Timestamp:
         return dt.Timestamp(timezone="UTC", nullable=nullable)
 
     @classmethod
@@ -635,7 +633,9 @@ class DuckDBType(SqlglotType):
     unknown_type_strings = FrozenDict({"wkb_blob": dt.binary})
 
     @classmethod
-    def _from_sqlglot_TIMESTAMP(cls, nullable: bool | None = None) -> dt.Timestamp:
+    def _from_sqlglot_TIMESTAMP(
+        cls, scale: int | None = None, nullable: bool | None = None
+    ) -> dt.Timestamp:
         return dt.Timestamp(scale=6, nullable=nullable)
 
     @classmethod
@@ -923,7 +923,9 @@ def _from_sqlglot_DATETIME(cls, nullable: bool | None = None) -> dt.Timestamp:
         return dt.Timestamp(timezone=None, nullable=nullable)
 
     @classmethod
-    def _from_sqlglot_TIMESTAMP(cls, nullable: bool | None = None) -> dt.Timestamp:
+    def _from_sqlglot_TIMESTAMP(
+        cls, scale: int | None = None, nullable: bool | None = None
+    ) -> dt.Timestamp:
         return dt.Timestamp(timezone=None, nullable=nullable)
 
     @classmethod
@@ -1147,7 +1149,9 @@ def _from_sqlglot_DATETIME(cls, n=None, nullable: bool | None = None):
         )
 
     @classmethod
-    def _from_sqlglot_TIMESTAMP(cls):
+    def _from_sqlglot_TIMESTAMP(
+        cls, scale: int | None = None, nullable: bool | None = None
+    ):
         return dt.Binary(nullable=False)
 
     @classmethod