added tests for Time columns in migrations

Author: dantownsend

piccolo/apps/migrations/auto/serialisation.py

@@ -13,6 +13,7 @@
 from piccolo.columns.defaults.base import Default
 from piccolo.columns.reference import LazyTableReference
 from piccolo.table import Table
+from piccolo.utils.repr import repr_class_instance
 from .serialisation_legacy import deserialise_legacy_params
 
 ###############################################################################
@@ -43,13 +44,7 @@ def __eq__(self, other):
         return self.__hash__() == other.__hash__()
 
     def __repr__(self):
-        args = ", ".join(
-            [
-                f"{key}={value.__repr__()}"
-                for key, value in self.instance.__dict__.items()
-            ]
-        )
-        return f"{self.instance.__class__.__name__}({args})"
+        return repr_class_instance(self.instance)
 
 
 @dataclass
@@ -327,6 +322,13 @@ def serialise_params(params: t.Dict[str, t.Any]) -> SerialisedParams:
             )
             continue
 
+        if inspect.isclass(value) and not issubclass(value, Enum):
+            params[key] = SerialisedCallable(callable_=value)
+            extra_imports.append(
+                Import(module=value.__module__, target=value.__name__)
+            )
+            continue
+
         # All other types can remain as is.
 
     return SerialisedParams(

piccolo/apps/migrations/commands/new.py

@@ -200,3 +200,4 @@ async def new(app_name: str, auto: bool = False):
         await _create_new_migration(app_config=app_config, auto=auto)
     except NoChanges:
         print("No changes detected - exiting.")
+        sys.exit(0)

piccolo/columns/base.py

@@ -541,6 +541,8 @@ def get_sql_value(self, value: t.Any) -> t.Any:
             output = str(value).lower()
         elif isinstance(value, datetime.datetime):
             output = f"'{value.isoformat().replace('T', ' ')}'"
+        elif isinstance(value, datetime.time):
+            output = f"'{value.isoformat()}'"
         elif isinstance(value, bytes):
             output = f"'{value.hex()}'"
         elif isinstance(value, uuid.UUID):

piccolo/columns/defaults/base.py

@@ -2,6 +2,8 @@
 from abc import abstractmethod, abstractproperty, ABC
 import typing as t
 
+from piccolo.utils.repr import repr_class_instance
+
 
 class Default(ABC):
     @abstractproperty
@@ -50,11 +52,11 @@ def get_sqlite_interval_string(self, attributes: t.List[str]) -> str:
 
         return ", ".join(interval_components)
 
+    def __repr__(self):
+        return repr_class_instance(self)
+
     def __str__(self):
-        args_str = ", ".join(
-            [f"{key}={value}" for key, value in self.__dict__.items()]
-        )
-        return f"{self.__class__.__name__}({args_str})"
+        return self.__repr__()
 
     def __eq__(self, other):
         return self.__hash__() == other.__hash__()

piccolo/columns/defaults/time.py

@@ -57,11 +57,11 @@ def __init__(self, hour: int, minute: int, second: int):
 
     @property
     def postgres(self):
-        return self.time.isostring()
+        return f"'{self.time.isoformat()}'"
 
     @property
     def sqlite(self):
-        return self.time.isostring()
+        return f"'{self.time.isoformat()}'"
 
     def python(self):
         return self.time

piccolo/utils/repr.py

@@ -0,0 +1,25 @@
+import inspect
+
+
+def repr_class_instance(class_instance: object) -> str:
+    """
+    Piccolo uses code generation for creating migrations. This function takes
+    a class instance, and generates a string representation for it, which can
+    be used in a migration file.
+    """
+    init_arg_names = [
+        i
+        for i in inspect.signature(
+            class_instance.__class__.__init__
+        ).parameters.keys()
+        if i not in ("self", "args", "kwargs")
+    ]
+    args_dict = {}
+    for arg_name in init_arg_names:
+        value = class_instance.__dict__.get(arg_name)
+        args_dict[arg_name] = value
+
+    args_str = ", ".join(
+        [f"{key}={value.__repr__()}" for key, value in args_dict.items()]
+    )
+    return f"{class_instance.__class__.__name__}({args_str})"

tests/apps/migrations/auto/integration/test_migrations.py

@@ -15,6 +15,7 @@
     Integer,
     SmallInt,
     Text,
+    Time,
     Timestamp,
     UUID,
     Varchar,
@@ -49,6 +50,10 @@ def datetime_default():
     return datetime.datetime.now()
 
 
+def time_default():
+    return datetime.datetime.now().time()
+
+
 @postgres_only
 class TestMigrations(TestCase):
     def tearDown(self):
@@ -223,3 +228,20 @@ def test_timestamp_column(self):
                 ]
             ]
         )
+
+    def test_time_column(self):
+        self._test_migrations(
+            table_classes=[
+                self.table(column)
+                for column in [
+                    Time(),
+                    Time(default=datetime.time(hour=12, minute=0)),
+                    Time(default=datetime.time),
+                    Time(default=time_default),
+                    Time(null=True, default=None),
+                    Time(null=False),
+                    Time(index=True),
+                    Time(index=False),
+                ]
+            ]
+        )