small tweaks

Author: dantownsend

piccolo/apps/asgi/commands/new.py

@@ -48,7 +48,7 @@ def new():
 
         if not os.path.exists(output_dir_path):
             folder_name = output_dir_path.split("/")[-1]
-            if folder_name.startswith("_") or folder_name.startswith("."):
+            if folder_name.startswith(("_", ".")):
                 continue
             os.mkdir(dir_path)
 

piccolo/apps/migrations/auto/serialisation.py

@@ -35,7 +35,7 @@ def serialise_params(params: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
     for key, value in params.items():
         # Convert enums into plain values
         if isinstance(value, Enum):
-            params[key] = f"{value.__class__.__name__}.{value.name}"
+            params[key] = str(value)
 
         # Replace any Table class values into class names
         if isclass(value) and issubclass(value, Table):
@@ -99,7 +99,7 @@ def deserialise_params(
     default = params.get("default")
     if isinstance(default, str):
         if column_class_name == "Timestamp":
-            if default.startswith("TimestampDefault"):
+            if default.startswith(("TimestampDefault", "DatetimeDefault")):
                 _, item_name = default.split(".")
                 params["default"] = getattr(TimestampDefault, item_name)
             else:

piccolo/columns/base.py

@@ -178,9 +178,10 @@ def __init__(
             params=kwargs,
         )
 
-    @staticmethod
     def _validate_default(
-        default: t.Any, allowed_types: t.Iterable[t.Union[None, t.Type[t.Any]]]
+        self,
+        default: t.Any,
+        allowed_types: t.Iterable[t.Union[None, t.Type[t.Any]]],
     ) -> bool:
         """
         Make sure that the default value is of the allowed types.
@@ -193,7 +194,7 @@ def _validate_default(
             return True
         else:
             raise ValueError(
-                "The default isn't one of the permitted types - "
+                f"The default {default} isn't one of the permitted types - "
                 f"{allowed_types}"
             )
 

piccolo/columns/column_types.py

@@ -376,6 +376,7 @@ def __init__(
 
 
 class Date(Column):
+
     value_type = date
 
     def __init__(self, default: DateArg = DateDefault.now, **kwargs) -> None:
@@ -386,6 +387,7 @@ def __init__(self, default: DateArg = DateDefault.now, **kwargs) -> None:
 
 
 class Time(Column):
+
     value_type = time
 
     def __init__(self, default: TimeArg = TimeDefault.now, **kwargs) -> None:

piccolo/custom_types.py

@@ -58,6 +58,8 @@ class UUIDDefault(Enum):
 
 
 UUIDArg = t.Union[UUIDDefault, uuid.UUID, None]
-TimestampArg = t.Union[datetime.datetime, TimestampDefault, None]
-DateArg = t.Union[datetime.date, DateDefault, None]
-TimeArg = t.Union[datetime.time, TimeDefault, None]
+TimestampArg = t.Union[
+    datetime.datetime, TimestampDefault, DatetimeDefault, None,
+]
+DateArg = t.Union[datetime.date, datetime.timedelta, DateDefault, None]
+TimeArg = t.Union[datetime.time, datetime.timedelta, TimeDefault, None]

tests/columns/test_defaults.py

@@ -25,10 +25,11 @@
 
 
 class TestDefaults(TestCase):
-    def test_defaults(self):
-        """
-        Columns check the type of the default argument.
-        """
+    """
+    Columns check the type of the default argument.
+    """
+
+    def test_int(self):
         for _type in (Integer, BigInt, SmallInt):
             _type(default=0)
             _type(default=None, null=True)
@@ -37,6 +38,7 @@ def test_defaults(self):
             with self.assertRaises(ValueError):
                 _type(default=None, null=False)
 
+    def test_text(self):
         for _type in (Text, Varchar):
             _type(default="")
             _type(default=None, null=True)
@@ -45,20 +47,23 @@ def test_defaults(self):
             with self.assertRaises(ValueError):
                 _type(default=None, null=False)
 
+    def test_real(self):
         Real(default=0.0)
         Real(default=None, null=True)
         with self.assertRaises(ValueError):
             Real(default="hello world")
         with self.assertRaises(ValueError):
             Real(default=None, null=False)
 
+    def test_numeric(self):
         Numeric(default=decimal.Decimal(1.0))
         Numeric(default=None, null=True)
         with self.assertRaises(ValueError):
             Numeric(default="hello world")
         with self.assertRaises(ValueError):
             Numeric(default=None, null=False)
 
+    def test_uuid(self):
         UUID(default=None, null=True)
         UUID(default=UUIDDefault.uuid4)
         UUID(default=uuid.uuid4())
@@ -67,6 +72,7 @@ def test_defaults(self):
         with self.assertRaises(ValueError):
             UUID(default=None, null=False)
 
+    def test_time(self):
         Time(default=None, null=True)
         Time(default=TimeDefault.now)
         Time(default=datetime.datetime.now().time())
@@ -75,6 +81,7 @@ def test_defaults(self):
         with self.assertRaises(ValueError):
             Time(default=None, null=False)
 
+    def test_date(self):
         Date(default=None, null=True)
         Date(default=DateDefault.now)
         Date(default=datetime.datetime.now().date())
@@ -83,6 +90,7 @@ def test_defaults(self):
         with self.assertRaises(ValueError):
             Date(default=None, null=False)
 
+    def test_timestamp(self):
         Timestamp(default=None, null=True)
         Timestamp(default=TimestampDefault.now)
         Timestamp(default=datetime.datetime.now())
@@ -91,6 +99,7 @@ def test_defaults(self):
         with self.assertRaises(ValueError):
             Timestamp(default=None, null=False)
 
+    def test_foreignkey(self):
         ForeignKey(references=Table(), default=None, null=True)
         ForeignKey(references=Table(), default=1)
         with self.assertRaises(ValueError):