fix(dtypes): switch scale and timestamp parameter order when formatti…

…ng a timestamp datatype

ibis/expr/datatypes/core.py

@@ -611,10 +611,14 @@ def unit(self) -> str:
 
     @property
     def _pretty_piece(self) -> str:
-        pieces = [
-            repr(piece) for piece in (self.scale, self.timezone) if piece is not None
-        ]
-        return f"({', '.join(pieces)})" * bool(pieces)
+        if self.scale is not None and self.timezone is not None:
+            return f"('{self.timezone}', {self.scale:d})"
+        elif self.timezone is not None:
+            return f"('{self.timezone}')"
+        elif self.scale is not None:
+            return f"({self.scale:d})"
+        else:
+            return ""
 
 
 @public

ibis/expr/datatypes/tests/test_parse.py

@@ -202,9 +202,10 @@ def test_parse_timestamp_with_timezone_invalid_timezone():
 @pytest.mark.parametrize("scale", range(10))
 @pytest.mark.parametrize("tz", ["UTC", "America/New_York"])
 def test_parse_timestamp_with_scale(scale, tz):
-    assert dt.parse(f"timestamp({tz!r}, {scale:d})") == dt.Timestamp(
-        timezone=tz, scale=scale
-    )
+    expected = dt.Timestamp(timezone=tz, scale=scale)
+    typestring = f"timestamp({tz!r}, {scale:d})"
+    assert dt.parse(typestring) == expected
+    assert str(expected) == typestring
 
 
 @pytest.mark.parametrize("scale", range(10))