Datetime Autoconversion for Timestamptz Columns

piccolo/apps/migrations/auto/migration_manager.py

@@ -737,9 +737,9 @@ async def _run_rename_columns(self, backwards: bool = False):
  async def _run_add_tables(self, backwards: bool = False):
  table_classes: t.List[t.Type[Table]] = []
  for add_table in self.add_tables:
- add_columns: t.List[
- AddColumnClass
- ] = self.add_columns.for_table_class_name(add_table.class_name)
+ add_columns: t.List[AddColumnClass] = (
+ self.add_columns.for_table_class_name(add_table.class_name)
+ )
  _Table: t.Type[Table] = create_table_class(
  class_name=add_table.class_name,
  class_kwargs={
@@ -792,9 +792,9 @@ async def _run_add_columns(self, backwards: bool = False):
  if table_class_name in [i.class_name for i in self.add_tables]:
  continue # No need to add columns to new tables
 
- add_columns: t.List[
- AddColumnClass
- ] = self.add_columns.for_table_class_name(table_class_name)
+ add_columns: t.List[AddColumnClass] = (
+ self.add_columns.for_table_class_name(table_class_name)
+ )
 
  ###############################################################
  # Define the table, with the columns, so the metaclass
@@ -838,9 +838,9 @@ async def _run_add_columns(self, backwards: bool = False):
  else:
  primary_key = existing_table._meta.primary_key
 
- table_class_members[
- primary_key._meta.name
- ] = primary_key
+ table_class_members[primary_key._meta.name] = (
+ primary_key
+ )
 
  break
 

piccolo/apps/migrations/auto/serialisation.py

@@ -12,21 +12,30 @@
 from dataclasses import dataclass, field
 from enum import Enum
 
-from piccolo.columns import Column
+from piccolo.columns import Column, Timestamptz
 from piccolo.columns.defaults.base import Default
+from piccolo.columns.defaults.timestamptz import (
+ TimestamptzCustom,
+ TimestamptzNow,
+ TimestamptzOffset,
+)
 from piccolo.columns.reference import LazyTableReference
 from piccolo.table import Table
 from piccolo.utils.repr import repr_class_instance
 
+try:
+ from zoneinfo import ZoneInfo # type: ignore
+except ImportError: # pragma: no cover
+ from backports.zoneinfo import ZoneInfo # type: ignore # noqa: F401
+
 from .serialisation_legacy import deserialise_legacy_params
 
 ###############################################################################
 
 
 class CanConflictWithGlobalNames(abc.ABC):
  @abc.abstractmethod
- def warn_if_is_conflicting_with_global_name(self):
- ...
+ def warn_if_is_conflicting_with_global_name(self): ...
 
 
 class UniqueGlobalNamesMeta(type):
@@ -237,8 +246,7 @@ def warn_if_is_conflicting_with_global_name(self):
 
 class Definition(CanConflictWithGlobalNames, abc.ABC):
  @abc.abstractmethod
- def __repr__(self):
- ...
+ def __repr__(self): ...
 
  ###########################################################################
  # To allow sorting:
@@ -548,8 +556,31 @@ def serialise_params(params: t.Dict[str, t.Any]) -> SerialisedParams:
  expect_conflict_with_global_name=UniqueGlobalNames.DEFAULT,
  )
  )
+ # ZoneInfo for Timestamptz* instances
+ in_group = (
+ Timestamptz,
+ TimestamptzNow,
+ TimestamptzCustom,
+ TimestamptzOffset,
+ )
+ if isinstance(value, in_group):
+ extra_imports.append(
+ Import(
+ module=ZoneInfo.__module__,
+ target=None,
+ )
+ )
  continue
 
+ # ZoneInfo instances
+ if isinstance(value, ZoneInfo):
+ extra_imports.append(
+ Import(
+ module=value.__class__.__module__,
+ target=None,
+ )
+ )
+
  # Dates and times
  if isinstance(
  value, (datetime.time, datetime.datetime, datetime.date)

piccolo/apps/migrations/commands/backwards.py

@@ -31,9 +31,9 @@ def __init__(
  super().__init__()
 
  async def run_migrations_backwards(self, app_config: AppConfig):
- migration_modules: t.Dict[
- str, MigrationModule
- ] = self.get_migration_modules(app_config.migrations_folder_path)
+ migration_modules: t.Dict[str, MigrationModule] = (
+ self.get_migration_modules(app_config.migrations_folder_path)
+ )
 
  ran_migration_ids = await Migration.get_migrations_which_ran(
  app_name=self.app_name

piccolo/apps/migrations/commands/base.py

@@ -88,9 +88,9 @@ async def get_migration_managers(
 
  migrations_folder = app_config.migrations_folder_path
 
- migration_modules: t.Dict[
- str, MigrationModule
- ] = self.get_migration_modules(migrations_folder)
+ migration_modules: t.Dict[str, MigrationModule] = (
+ self.get_migration_modules(migrations_folder)
+ )
 
  migration_ids = sorted(migration_modules.keys())
 

piccolo/apps/migrations/commands/forwards.py

@@ -32,9 +32,9 @@ async def run_migrations(self, app_config: AppConfig) -> MigrationResult:
  app_name=app_config.app_name
  )
 
- migration_modules: t.Dict[
- str, MigrationModule
- ] = self.get_migration_modules(app_config.migrations_folder_path)
+ migration_modules: t.Dict[str, MigrationModule] = (
+ self.get_migration_modules(app_config.migrations_folder_path)
+ )
 
  ids = self.get_migration_ids(migration_modules)
  n = len(ids)

piccolo/apps/playground/commands/run.py

@@ -2,6 +2,7 @@
 Populates a database with an example schema and data, and launches a shell
 for interacting with the data using Piccolo.
 """
+
 import datetime
 import sys
 import typing as t

piccolo/apps/user/tables.py

@@ -1,6 +1,7 @@
 """
 A User model, used for authentication.
 """
+
 from __future__ import annotations
 
 import datetime

piccolo/columns/base.py

@@ -887,9 +887,11 @@ def get_sql_value(self, value: t.Any) -> t.Any:
  return (
  "'{"
  + ", ".join(
- f'"{i}"'
- if isinstance(i, str)
- else str(self.get_sql_value(i))
+ (
+ f'"{i}"'
+ if isinstance(i, str)
+ else str(self.get_sql_value(i))
+ )
  for i in value
  )
  ) + "}'"