piccolo 1.3.2__tar.gz → 1.5.0__tar.gz

{piccolo-1.3.2 → piccolo-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: piccolo
-Version: 1.3.2
+Version: 1.5.0
 Summary: A fast, user friendly ORM and query builder which supports asyncio.
 Home-page: https://github.com/piccolo-orm/piccolo
 Author: Daniel Townsend
@@ -144,7 +144,7 @@ Let Piccolo scaffold you an ASGI web app, using Piccolo as the ORM:
 piccolo asgi new
 ```
 
-[Starlette](https://www.starlette.io/), [FastAPI](https://fastapi.tiangolo.com/), [BlackSheep](https://www.neoteroi.dev/blacksheep/) and [Litestar](https://litestar.dev/) are currently supported.
+[Starlette](https://www.starlette.io/), [FastAPI](https://fastapi.tiangolo.com/), [BlackSheep](https://www.neoteroi.dev/blacksheep/), [Litestar](https://litestar.dev/) and [Esmerald](https://esmerald.dev/) are currently supported.
 
 ## Are you a Django user?
 

{piccolo-1.3.2 → piccolo-1.5.0}/README.md

@@ -94,7 +94,7 @@ Let Piccolo scaffold you an ASGI web app, using Piccolo as the ORM:
 piccolo asgi new
 ```
 
-[Starlette](https://www.starlette.io/), [FastAPI](https://fastapi.tiangolo.com/), [BlackSheep](https://www.neoteroi.dev/blacksheep/) and [Litestar](https://litestar.dev/) are currently supported.
+[Starlette](https://www.starlette.io/), [FastAPI](https://fastapi.tiangolo.com/), [BlackSheep](https://www.neoteroi.dev/blacksheep/), [Litestar](https://litestar.dev/) and [Esmerald](https://esmerald.dev/) are currently supported.
 
 ## Are you a Django user?
 

piccolo-1.5.0/piccolo/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "1.5.0"

{piccolo-1.3.2 → piccolo-1.5.0}/piccolo/apps/migrations/auto/migration_manager.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import inspect
+import logging
 import typing as t
 from dataclasses import dataclass, field
 
@@ -14,7 +15,7 @@ from piccolo.apps.migrations.auto.operations import (
 )
 from piccolo.apps.migrations.auto.serialisation import deserialise_params
 from piccolo.columns import Column, column_types
-from piccolo.columns.column_types import Serial
+from piccolo.columns.column_types import ForeignKey, Serial
 from piccolo.engine import engine_finder
 from piccolo.query import Query
 from piccolo.query.base import DDL
@@ -22,6 +23,8 @@ from piccolo.schema import SchemaDDLBase
 from piccolo.table import Table, create_table_class, sort_table_classes
 from piccolo.utils.warnings import colored_warning
 
+logger = logging.getLogger(__name__)
+
 
 @dataclass
 class AddColumnClass:
@@ -734,9 +737,9 @@ class MigrationManager:
     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={
@@ -789,30 +792,76 @@ class MigrationManager:
                 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
                 # sets up the columns correctly.
+
+                table_class_members = {
+                    add_column.column._meta.name: add_column.column
+                    for add_column in add_columns
+                }
+
+                # There's an extreme edge case, when we're adding a foreign
+                # key which references its own table, for example:
+                #
+                #   fk = ForeignKey('self')
+                #
+                # And that table has a custom primary key, for example:
+                #
+                #   id = UUID(primary_key=True)
+                #
+                # In this situation, we need to know the primary key of the
+                # table in order to correctly add this new foreign key.
+                for add_column in add_columns:
+                    if (
+                        isinstance(add_column.column, ForeignKey)
+                        and add_column.column._meta.params.get("references")
+                        == "self"
+                    ):
+                        try:
+                            existing_table = (
+                                await self.get_table_from_snapshot(
+                                    table_class_name=table_class_name,
+                                    app_name=self.app_name,
+                                    offset=-1,
+                                )
+                            )
+                        except ValueError:
+                            logger.error(
+                                "Unable to find primary key for the table - "
+                                "assuming Serial."
+                            )
+                        else:
+                            primary_key = existing_table._meta.primary_key
+
+                            table_class_members[primary_key._meta.name] = (
+                                primary_key
+                            )
+
+                        break
+
                 _Table = create_table_class(
                     class_name=add_columns[0].table_class_name,
                     class_kwargs={
                         "tablename": add_columns[0].tablename,
                         "schema": add_columns[0].schema,
                     },
-                    class_members={
-                        add_column.column._meta.name: add_column.column
-                        for add_column in add_columns
-                    },
+                    class_members=table_class_members,
                 )
 
+                ###############################################################
+
                 for add_column in add_columns:
                     # We fetch the column from the Table, as the metaclass
                     # copies and sets it up properly.
                     column = _Table._meta.get_column_by_name(
                         add_column.column._meta.name
                     )
+
                     await self._run_query(
                         _Table.alter().add_column(
                             name=column._meta.name, column=column

{piccolo-1.3.2 → piccolo-1.5.0}/piccolo/apps/migrations/auto/serialisation.py

@@ -25,8 +25,7 @@ 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 +236,7 @@ class Import(CanConflictWithGlobalNames):
 
 class Definition(CanConflictWithGlobalNames, abc.ABC):
     @abc.abstractmethod
-    def __repr__(self):
-        ...
+    def __repr__(self): ...
 
     ###########################################################################
     # To allow sorting:

{piccolo-1.3.2 → piccolo-1.5.0}/piccolo/apps/migrations/commands/backwards.py

@@ -31,9 +31,9 @@ class BackwardsMigrationManager(BaseMigrationManager):
         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-1.3.2 → piccolo-1.5.0}/piccolo/apps/migrations/commands/base.py

@@ -88,9 +88,9 @@ class BaseMigrationManager(Finder):
 
         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-1.3.2 → piccolo-1.5.0}/piccolo/apps/migrations/commands/forwards.py

@@ -32,9 +32,9 @@ class ForwardsMigrationManager(BaseMigrationManager):
             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-1.3.2 → piccolo-1.5.0}/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-1.3.2 → piccolo-1.5.0}/piccolo/apps/user/tables.py

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

{piccolo-1.3.2 → piccolo-1.5.0}/piccolo/columns/base.py

@@ -887,9 +887,11 @@ class Column(Selectable):
             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
                 )
             ) + "}'"