piccolo 0.113.0__py3-none-any.whl → 0.115.0__py3-none-any.whl

piccolo/__init__.py

@@ -1 +1 @@
-__VERSION__ = "0.113.0"
+__VERSION__ = "0.115.0"

piccolo/apps/fixtures/commands/load.py

@@ -1,19 +1,27 @@
 from __future__ import annotations
 
+import sys
 import typing as t
 
+import typing_extensions
+
 from piccolo.apps.fixtures.commands.shared import (
     FixtureConfig,
     create_pydantic_fixture_model,
 )
 from piccolo.conf.apps import Finder
 from piccolo.engine import engine_finder
+from piccolo.query.mixins import OnConflictAction
 from piccolo.table import Table, sort_table_classes
 from piccolo.utils.encoding import load_json
 from piccolo.utils.list import batch
 
 
-async def load_json_string(json_string: str, chunk_size: int = 1000):
+async def load_json_string(
+    json_string: str,
+    chunk_size: int = 1000,
+    on_conflict_action: t.Optional[OnConflictAction] = None,
+):
     """
     Parses the JSON string, and inserts the parsed data into the database.
     """
@@ -71,10 +79,23 @@ async def load_json_string(json_string: str, chunk_size: int = 1000):
             rows = data[table_class]
 
             for chunk in batch(data=rows, chunk_size=chunk_size):
-                await table_class.insert(*chunk).run()
-
-
-async def load(path: str = "fixture.json", chunk_size: int = 1000):
+                query = table_class.insert(*chunk)
+                if on_conflict_action is not None:
+                    query = query.on_conflict(
+                        target=table_class._meta.primary_key,
+                        action=on_conflict_action,
+                        values=table_class._meta.columns,
+                    )
+                await query.run()
+
+
+async def load(
+    path: str = "fixture.json",
+    chunk_size: int = 1000,
+    on_conflict: t.Optional[
+        typing_extensions.Literal["DO NOTHING", "DO UPDATE"]
+    ] = None,
+):
     """
     Reads the fixture file, and loads the contents into the database.
 
@@ -86,8 +107,28 @@ async def load(path: str = "fixture.json", chunk_size: int = 1000):
         determined by the database adapter, which has a max number of
         parameters per query.
 
+    :param on_conflict:
+        If specified, the fixture will be upserted, meaning that if a row
+        already exists with a matching primary key, then it will be overridden
+        if "DO UPDATE", or it will be ignored if "DO NOTHING".
+
     """
     with open(path, "r") as f:
         contents = f.read()
 
-    await load_json_string(contents, chunk_size=chunk_size)
+    on_conflict_action: t.Optional[OnConflictAction] = None
+
+    if on_conflict:
+        try:
+            on_conflict_action = OnConflictAction(on_conflict.upper())
+        except ValueError:
+            sys.exit(
+                f"{on_conflict} isn't a valid option - use 'DO NOTHING' or "
+                "'DO UPDATE'."
+            )
+
+    await load_json_string(
+        contents,
+        chunk_size=chunk_size,
+        on_conflict_action=on_conflict_action,
+    )

piccolo/apps/migrations/auto/migration_manager.py

@@ -826,7 +826,7 @@ class MigrationManager:
                 await self._run_query(
                     schema_manager.move_table(
                         table_name=change_table_schema.tablename,
-                        new_schema=change_table_schema.new_schema,
+                        new_schema=change_table_schema.new_schema or "public",
                         current_schema=change_table_schema.old_schema,
                     )
                 )

piccolo/columns/m2m.py

@@ -57,30 +57,34 @@ class M2MSelect(Selectable):
         )
 
     def get_select_string(self, engine_type: str, with_alias=True) -> str:
-        m2m_table_name = self.m2m._meta.resolved_joining_table._meta.tablename
+        m2m_table_name_with_schema = (
+            self.m2m._meta.resolved_joining_table._meta.get_formatted_tablename()  # noqa: E501
+        )  # noqa: E501
         m2m_relationship_name = self.m2m._meta.name
 
         fk_1 = self.m2m._meta.primary_foreign_key
         fk_1_name = fk_1._meta.db_column_name
         table_1 = fk_1._foreign_key_meta.resolved_references
         table_1_name = table_1._meta.tablename
+        table_1_name_with_schema = table_1._meta.get_formatted_tablename()
         table_1_pk_name = table_1._meta.primary_key._meta.db_column_name
 
         fk_2 = self.m2m._meta.secondary_foreign_key
         fk_2_name = fk_2._meta.db_column_name
         table_2 = fk_2._foreign_key_meta.resolved_references
         table_2_name = table_2._meta.tablename
+        table_2_name_with_schema = table_2._meta.get_formatted_tablename()
         table_2_pk_name = table_2._meta.primary_key._meta.db_column_name
 
         inner_select = f"""
-            "{m2m_table_name}"
-            JOIN "{table_1_name}" "inner_{table_1_name}" ON (
-                "{m2m_table_name}"."{fk_1_name}" = "inner_{table_1_name}"."{table_1_pk_name}"
+            {m2m_table_name_with_schema}
+            JOIN {table_1_name_with_schema} "inner_{table_1_name}" ON (
+                {m2m_table_name_with_schema}."{fk_1_name}" = "inner_{table_1_name}"."{table_1_pk_name}"
             )
-            JOIN "{table_2_name}" "inner_{table_2_name}" ON (
-                "{m2m_table_name}"."{fk_2_name}" = "inner_{table_2_name}"."{table_2_pk_name}"
+            JOIN {table_2_name_with_schema} "inner_{table_2_name}" ON (
+                {m2m_table_name_with_schema}."{fk_2_name}" = "inner_{table_2_name}"."{table_2_pk_name}"
             )
-            WHERE "{m2m_table_name}"."{fk_1_name}" = "{table_1_name}"."{table_1_pk_name}"
+            WHERE {m2m_table_name_with_schema}."{fk_1_name}" = "{table_1_name}"."{table_1_pk_name}"
         """  # noqa: E501
 
         if engine_type in ("postgres", "cockroach"):

piccolo/query/methods/count.py

@@ -4,19 +4,29 @@ import typing as t
 
 from piccolo.custom_types import Combinable
 from piccolo.query.base import Query
-from piccolo.query.methods.select import Select
+from piccolo.query.methods.select import Count as SelectCount
 from piccolo.query.mixins import WhereDelegate
 from piccolo.querystring import QueryString
 
 if t.TYPE_CHECKING:  # pragma: no cover
+    from piccolo.columns import Column
     from piccolo.table import Table
 
 
 class Count(Query):
-    __slots__ = ("where_delegate",)
 
-    def __init__(self, table: t.Type[Table], **kwargs):
+    __slots__ = ("where_delegate", "column", "_distinct")
+
+    def __init__(
+        self,
+        table: t.Type[Table],
+        column: t.Optional[Column] = None,
+        distinct: t.Optional[t.Sequence[Column]] = None,
+        **kwargs,
+    ):
         super().__init__(table, **kwargs)
+        self.column = column
+        self._distinct = distinct
         self.where_delegate = WhereDelegate()
 
     ###########################################################################
@@ -26,6 +36,10 @@ class Count(Query):
         self.where_delegate.where(*where)
         return self
 
+    def distinct(self: Self, columns: t.Optional[t.Sequence[Column]]) -> Self:
+        self._distinct = columns
+        return self
+
     ###########################################################################
 
     async def response_handler(self, response) -> bool:
@@ -33,14 +47,15 @@ class Count(Query):
 
     @property
     def default_querystrings(self) -> t.Sequence[QueryString]:
-        select = Select(self.table)
-        select.where_delegate._where = self.where_delegate._where
-        return [
-            QueryString(
-                'SELECT COUNT(*) AS "count" FROM ({}) AS "subquery"',
-                select.querystrings[0],
-            )
-        ]
+        table: t.Type[Table] = self.table
+
+        query = table.select(
+            SelectCount(column=self.column, distinct=self._distinct)
+        )
+
+        query.where_delegate._where = self.where_delegate._where
+
+        return query.querystrings
 
 
 Self = t.TypeVar("Self", bound=Count)

piccolo/query/methods/select.py

@@ -99,43 +99,84 @@ class Avg(Selectable):
 
 class Count(Selectable):
     """
-    Used in conjunction with the ``group_by`` clause in ``Select`` queries.
+    Used in ``Select`` queries, usually in conjunction with the ``group_by``
+    clause::
 
-    If a column is specified, the count is for non-null values in that
-    column. If no column is specified, the count is for all rows, whether
-    they have null values or not.
+        >>> await Band.select(
+        ...     Band.manager.name.as_alias('manager_name'),
+        ...     Count(alias='band_count')
+        ... ).group_by(Band.manager)
+        [{'manager_name': 'Guido', 'count': 1}, ...]
 
-    .. code-block:: python
-
-        await Band.select(Band.name, Count()).group_by(Band.name)
-
-        # We can use an alias. These two are equivalent:
-
-        await Band.select(
-            Band.name, Count(alias="total")
-        ).group_by(Band.name)
+    It can also be used without the ``group_by`` clause (though you may prefer
+    to the :meth:`Table.count <piccolo.table.Table.count>` method instead, as
+    it's more convenient)::
 
-        await Band.select(
-            Band.name,
-            Count().as_alias("total")
-        ).group_by(Band.name)
+        >>> await Band.select(Count())
+        [{'count': 3}]
 
     """
 
     def __init__(
-        self, column: t.Optional[Column] = None, alias: str = "count"
+        self,
+        column: t.Optional[Column] = None,
+        distinct: t.Optional[t.Sequence[Column]] = None,
+        alias: str = "count",
     ):
+        """
+        :param column:
+            If specified, the count is for non-null values in that column.
+        :param distinct:
+            If specified, the count is for distinct values in those columns.
+        :param alias:
+            The name of the value in the response::
+
+                # These two are equivalent:
+
+                await Band.select(
+                    Band.name, Count(alias="total")
+                ).group_by(Band.name)
+
+                await Band.select(
+                    Band.name,
+                    Count().as_alias("total")
+                ).group_by(Band.name)
+
+        """
+        if distinct and column:
+            raise ValueError("Only specify `column` or `distinct`")
+
         self.column = column
+        self.distinct = distinct
         self._alias = alias
 
     def get_select_string(
         self, engine_type: str, with_alias: bool = True
     ) -> str:
-        if self.column is None:
-            column_name = "*"
+        expression: str
+
+        if self.distinct:
+            if engine_type == "sqlite":
+                # SQLite doesn't allow us to specify multiple columns, so
+                # instead we concatenate the values.
+                column_names = " || ".join(
+                    i._meta.get_full_name(with_alias=False)
+                    for i in self.distinct
+                )
+            else:
+                column_names = ", ".join(
+                    i._meta.get_full_name(with_alias=False)
+                    for i in self.distinct
+                )
+
+            expression = f"DISTINCT ({column_names})"
         else:
-            column_name = self.column._meta.get_full_name(with_alias=False)
-        return f'COUNT({column_name}) AS "{self._alias}"'
+            if self.column:
+                expression = self.column._meta.get_full_name(with_alias=False)
+            else:
+                expression = "*"
+
+        return f'COUNT({expression}) AS "{self._alias}"'
 
 
 class Max(Selectable):
@@ -737,12 +778,10 @@ class Select(Query[TableInstance, t.List[t.Dict[str, t.Any]]]):
         query = "SELECT"
 
         distinct = self.distinct_delegate._distinct
-        if distinct:
-            if distinct.on:
-                distinct.validate_on(self.order_by_delegate._order_by)
-
-            query += "{}"
-            args.append(distinct.querystring)
+        if distinct.on:
+            distinct.validate_on(self.order_by_delegate._order_by)
+        query += "{}"
+        args.append(distinct.querystring)
 
         query += f" {columns_str} FROM {self.table._meta.get_formatted_tablename()}"  # noqa: E501
 

piccolo/table.py

@@ -1114,16 +1114,54 @@ class Table(metaclass=TableMetaclass):
         return Objects[TableInstance](table=cls, prefetch=prefetch)
 
     @classmethod
-    def count(cls) -> Count:
-        """
-        Count the number of matching rows.
+    def count(
+        cls,
+        column: t.Optional[Column] = None,
+        distinct: t.Optional[t.Sequence[Column]] = None,
+    ) -> Count:
 
-        .. code-block:: python
+        """
+        Count the number of matching rows::
 
             await Band.count().where(Band.popularity > 1000)
 
+        :param column:
+            If specified, just count rows where this column isn't null.
+
+        :param distinct:
+            Counts the number of distinct values for these columns. For
+            example, if we have a concerts table::
+
+                class Concert(Table):
+                    band = Varchar()
+                    start_date = Date()
+
+            With this data:
+
+            .. table::
+                :widths: auto
+
+                ===========  ==========
+                band         start_date
+                ===========  ==========
+                Pythonistas  2023-01-01
+                Pythonistas  2023-02-03
+                Rustaceans   2023-01-01
+                ===========  ==========
+
+            Without the ``distinct`` argument, we get the count of all
+            rows::
+
+                >>> await Concert.count()
+                3
+
+            To get the number of unique concert dates::
+
+                >>> await Concert.count(distinct=[Concert.start_date])
+                2
+
         """
-        return Count(table=cls)
+        return Count(table=cls, column=column, distinct=distinct)
 
     @classmethod
     def exists(cls) -> Exists:

{piccolo-0.113.0.dist-info → piccolo-0.115.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: piccolo
-Version: 0.113.0
+Version: 0.115.0
 Summary: A fast, user friendly ORM and query builder which supports asyncio.
 Home-page: https://github.com/piccolo-orm/piccolo
 Author: Daniel Townsend

{piccolo-0.113.0.dist-info → piccolo-0.115.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-piccolo/__init__.py,sha256=bbQ6ntboeYUZlRuUo9VeWe-Il4YWTUroehQvy5v58yc,24
+piccolo/__init__.py,sha256=-CLJ49iCidYB3xsIzg9Dqc7jRuCmSb4xu1RlklEi9y8,24
 piccolo/custom_types.py,sha256=7HMQAze-5mieNLfbQ5QgbRQgR2abR7ol0qehv2SqROY,604
 piccolo/main.py,sha256=2W2EXXEr-EN1PG8s8xHIWCvU7t7kT004fBChK9CZhzo,5024
 piccolo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/querystring.py,sha256=pjtp0jLtZc7AaVESR4QTZu9wlsGGxeyfLjJZx26U7IA,5859
 piccolo/schema.py,sha256=aWPuZxEulgBRD5NTqKN-RAZchxu-PoIrn0iFrWGZuq4,7731
-piccolo/table.py,sha256=64L2bvAaKLK2qWlYgzyXJhBNiyT4o08VnrkT8W8vcCg,48231
+piccolo/table.py,sha256=99O73bkpvI5tzFSMD54yOvTa7Mha3mWjWrSL0ILpTsA,49374
 piccolo/table_reflection.py,sha256=jrN1nHerDJ4tU09GtNN3hz7ap-7rXnSUjljFO6LB2H0,7094
 piccolo/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/apps/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,7 +45,7 @@ piccolo/apps/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 piccolo/apps/fixtures/piccolo_app.py,sha256=4O1Cznl1zms2gIw2iVjCjidkgCfFcB83nZIAJwcNTtg,268
 piccolo/apps/fixtures/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/apps/fixtures/commands/dump.py,sha256=fC0XsLaTLAP_VtfFSWPNj9XsZLfWGpl-Og_y71_OL7o,3650
-piccolo/apps/fixtures/commands/load.py,sha256=1uCFZeeBXov6CnoX66q4DEre1HUgq9ih9R03Y8IGSy0,2945
+piccolo/apps/fixtures/commands/load.py,sha256=nqjqrOrEww5Q_gvhTP_Nhu4urD6JqwpsC3NR9FWZq7o,4188
 piccolo/apps/fixtures/commands/shared.py,sha256=BMG8ku5FyK5vLewaDYwEfe_5HCnEVz1oKxHfL-GpO08,1462
 piccolo/apps/meta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/apps/meta/piccolo_app.py,sha256=EdAB74BvwpwO9L8DOIMXPly9f4hiW3oaWdzoLNNV2a4,224
@@ -56,7 +56,7 @@ piccolo/apps/migrations/piccolo_app.py,sha256=1EcS2ComBPCaMCC2C3WaPR_GqLwt3XiIJN
 piccolo/apps/migrations/tables.py,sha256=jqBnK-Rk545v1Eu6GaLHTVz7-uwBTUnz2m58OA-mxTc,799
 piccolo/apps/migrations/auto/__init__.py,sha256=5bgdh5EsROSvq4rrZAxpzmXiJNj5LJKwf06dxI2LZsc,191
 piccolo/apps/migrations/auto/diffable_table.py,sha256=ZjUIjqcEAWsoFJuShSDy6W1HUBOM1G7kEsne-R5VJ-Q,6935
-piccolo/apps/migrations/auto/migration_manager.py,sha256=5sRoH_WUWfG0MSC7dvJbSxW60Uoscaqx_UeFug7sxQg,31753
+piccolo/apps/migrations/auto/migration_manager.py,sha256=RqegV19ZM2hcb03x5IBP2615CD1uEhrgPXKNZIZjq5o,31765
 piccolo/apps/migrations/auto/operations.py,sha256=eAiTK9wCxFwhE13W0Tf2-FUg7kyPUWjDEGHyyRHwZUg,1154
 piccolo/apps/migrations/auto/schema_differ.py,sha256=oNJVqqDxokUhMU-JjoA0aC21j0sbLEHMZRiyQwGG-rg,25348
 piccolo/apps/migrations/auto/schema_snapshot.py,sha256=ZqUg4NpChOeoACKF2gkhqsz1BW3wOWFnzJCccq-CNNQ,4719
@@ -115,7 +115,7 @@ piccolo/columns/choices.py,sha256=-HNQuk9vMmVZIPZ5PMeXGTfr23o4nzKPSAkvcG1k0y8,72
 piccolo/columns/column_types.py,sha256=X0nTvlc8epfcu8Q8uuIBlnHv_R_GTJ58dehC343vNgA,77278
 piccolo/columns/combination.py,sha256=vMXC2dfY7pvnCFhsT71XFVyb4gdQzfRsCMaiduu04Ss,6900
 piccolo/columns/indexes.py,sha256=NfNok3v_791jgDlN28KmhP9ZCjl6031BXmjxV3ovXJk,372
-piccolo/columns/m2m.py,sha256=C7IKMg7ik2yE3143Gwdbx3YNB3VrZbltJAlX0XxQwAI,14067
+piccolo/columns/m2m.py,sha256=JNgulzZjmwzPDNlpHLMIE_GP8UoBEcWFS4mEIkbKpvk,14357
 piccolo/columns/readable.py,sha256=vKIEc_vWxKo4GSPOeJZz-q5a1i4DNaoBcCNG_i_2OSA,1485
 piccolo/columns/reference.py,sha256=-e1nu-yWeqiyJtDqG0cPVVVrLai6ClEAYAa8c6a0hnA,3573
 piccolo/columns/defaults/__init__.py,sha256=7hpB13baEJgc1zbZjRKDFr-5hltxM2VGj8KnKfOiS8c,145
@@ -146,7 +146,7 @@ piccolo/query/mixins.py,sha256=N6HAN_A4kd-PC07q3OIzwrkRy3ZwGMtB2xLueYefBSM,21649
 piccolo/query/proxy.py,sha256=Hg5S6tp1EiKD899eYdDKHscFYucHdKtL3YC2GTcL2Jk,1833
 piccolo/query/methods/__init__.py,sha256=_PfGUdOd6AsKq1sqXeZUHhESHE-e1cNpwFr8Lyz7QoY,421
 piccolo/query/methods/alter.py,sha256=AI9YkJeip2EitrWJN_TDExXhA8HGAG3XuDz1NR-KirQ,16728
-piccolo/query/methods/count.py,sha256=SBQaOkCJhzHO-1dOUYJuUgWwygc9uaDg-nupsXgrXHQ,1339
+piccolo/query/methods/count.py,sha256=vSwn52IG0wlhPC6L-jYVlCsD4BPb2EkGHGwWn7z7gH4,1717
 piccolo/query/methods/create.py,sha256=hJ-6VVsWczzKDH6fQRN1WmYhcitixuXJ-eNOuCo_JgM,2742
 piccolo/query/methods/create_index.py,sha256=RV9yVHwPvfQCk-g6YpmUTKamgOj0uxWe8Zr97YHIPGo,2216
 piccolo/query/methods/delete.py,sha256=c4LO6-sGKfX-pi1nTZPC3aKvevgKWXuO28sFetbQ7WY,2212
@@ -157,7 +157,7 @@ piccolo/query/methods/insert.py,sha256=ygQQBHMEtZRpPDYKK9qv4mdJsCcSZOA0d5drwqb57
 piccolo/query/methods/objects.py,sha256=i71GHPJZJcRpgM6e69Vk7vVcCuAFokOsMnR5EXbZq1w,11673
 piccolo/query/methods/raw.py,sha256=VhYpCB52mZk4zqFTsqK5CHKTDGskUjISXTBV7UjohmA,600
 piccolo/query/methods/refresh.py,sha256=P1Eo_HYU_L7kcGM_cvDDgyLi1boCXY7Pc4tv_eDAzvc,2769
-piccolo/query/methods/select.py,sha256=5fEAilOzqJcXOKPbhnt_lzNhstZZl9SNQM0g5RiZmPs,25540
+piccolo/query/methods/select.py,sha256=lkR46W2oatozkTgyKjACtpf8UVRZBISVAf607e2ljWs,26903
 piccolo/query/methods/table_exists.py,sha256=0yb3n6Jd2ovSBWlZ-gl00K4E7Jnbj7J8qAAX5d7hvNk,1259
 piccolo/query/methods/update.py,sha256=KJrdS98uvbio_95h979xGd6HTtn9d0LP7SqwPjBn7tU,3655
 piccolo/testing/__init__.py,sha256=pRFSqRInfx95AakOq54atmvqoB-ue073q2aR8u8zR40,83
@@ -190,7 +190,7 @@ tests/apps/asgi/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 tests/apps/asgi/commands/test_new.py,sha256=CxlY2TGK-fOAPUroKK4CIXRyBwnsetAehAAIc4wheUE,3097
 tests/apps/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/apps/fixtures/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/apps/fixtures/commands/test_dump_load.py,sha256=Ohnm_DZl1JLK_SI4g5THbm5M9-43hj40fdB3lefJrpM,8172
+tests/apps/fixtures/commands/test_dump_load.py,sha256=aS4as-Uve4W65c2hL5oWvxYwL4HJrsD5gaUBzmzqm_Y,9344
 tests/apps/fixtures/commands/test_shared.py,sha256=z-0-lrkATlt98hJbu3udKne_DW7BT6p_iPZLjUuwyb4,2139
 tests/apps/meta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/apps/meta/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -204,7 +204,7 @@ tests/apps/migrations/auto/test_schema_differ.py,sha256=0P7TCUyggPuqmO5QnzoMu-u_
 tests/apps/migrations/auto/test_schema_snapshot.py,sha256=ZyvGZqn3N3cwd-3S-FME5AJ8buDSHesw7yPIvY6mE5k,6196
 tests/apps/migrations/auto/test_serialisation.py,sha256=EFkhES1w9h51UCamWrhxs3mf4I718ggeP7Yl5J_UID4,13548
 tests/apps/migrations/auto/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/apps/migrations/auto/integration/test_migrations.py,sha256=F9g5_hwtVyTZRh32tSp-ql9-FnhWx4HsBJUdcbYEraA,41986
+tests/apps/migrations/auto/integration/test_migrations.py,sha256=9CM7PI79DS3CRjkXXiXcU5JhQR-CceTT2LfV4P-G7HI,42960
 tests/apps/migrations/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/apps/migrations/commands/test_base.py,sha256=NgHgVjNd3Hil9eODvW7Ic2D9muTa_grNaH3YpRFfR8I,1829
 tests/apps/migrations/commands/test_check.py,sha256=hOX_sVk1nfCRfbQ8tJoFEUBFhih9O4QuQLHTp5TQaiY,630
@@ -245,7 +245,6 @@ tests/columns/test_double_precision.py,sha256=YuC-mVMvwYgtiBzZDIajf6HbLkb08OWs0N
 tests/columns/test_interval.py,sha256=1kn0ufhAMe0vG7343rQyoQ2EDJ3o1ER8p3HCC1sSRhc,2921
 tests/columns/test_json.py,sha256=T5v7GD6sOro8X2OB3Nwhw8-BbsmKmbD9w3o4c8bzv8M,3814
 tests/columns/test_jsonb.py,sha256=YomSvGyLKfmXhJiFIE1StfDyPMBuXeEETZZcVQHbiwE,6821
-tests/columns/test_m2m.py,sha256=-WB52gOti74t1RsJJhUyKD2TAsYvmYVjj9UylAJp5zI,25767
 tests/columns/test_numeric.py,sha256=8h6LwYI_3Jer9R6w2Ew_xtH09JSPsDZ0ahVIXEKAnnM,813
 tests/columns/test_primary_key.py,sha256=KrV5sbH7MOZk0Uu8WtK8Pi3KtmZRVEmSKloN-DVFoKs,5396
 tests/columns/test_readable.py,sha256=kMuge5X_PfVeE1PjStwEHY-W0zwrxVBXV0CiW2Gw7kE,802
@@ -258,6 +257,10 @@ tests/columns/test_timestamp.py,sha256=q8idev7hO8TrFXeLb8ZVBFVBb3kqWck17s-RZP747
 tests/columns/test_timestamptz.py,sha256=IvBC4S1MLkYRG6jOGn9631qmwKkg2lqftC_8i71zDcA,2771
 tests/columns/test_uuid.py,sha256=HDh_qvznN7nUjCaJ-TJwRcPjMTYMLhrO_oOHtW9MAAc,466
 tests/columns/test_varchar.py,sha256=5IY9J5m1Hmuq1vZ78aApwPYI7J-XZFVtZVHPhlKGn8Y,813
+tests/columns/m2m/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/columns/m2m/base.py,sha256=PgdTs4bFHNH5V7SgfhkOwE3ch2XH8J-AbX7yo0DO7J4,14145
+tests/columns/m2m/test_m2m.py,sha256=XD20-MCci7T2gSc7loI1JScsYpItdiwacrOxBK5BP8s,13084
+tests/columns/m2m/test_m2m_schema.py,sha256=wTsTOEaAnReECeNfjP_lRojuMDFy4-_wQbZDkdsmsYw,1184
 tests/conf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conf/example.py,sha256=kOa8EUzxG-iP-BGJuJv3-mqyvr1vW7XLVMeuCXzypo8,346
 tests/conf/test_apps.py,sha256=mqkkdEnFjphbrdRh9yKu4Red05-3l0fG2pOxYhT_9tU,7578
@@ -294,7 +297,7 @@ tests/table/test_alter.py,sha256=k_tXdiuG6grybRNKmXdt7PdwaENOsvoNX-lodB_hCF8,123
 tests/table/test_batch.py,sha256=5XdwZfsQWhnWSEMVG_yetW-28yYTU6bBCZJGYjx4sOU,3740
 tests/table/test_callback.py,sha256=mNp4NOQ4PM_PIKn-WLG4HyvN-YHk7w0Ka_Bljg5Ugd4,6381
 tests/table/test_constructor.py,sha256=zPbzhKQWzzsQQUK7P9WM8OgCi1ndhXedP6rU0tg6XIM,832
-tests/table/test_count.py,sha256=PIMKpoxRmo9SI4tfsJ6wIPIPDg7wlhdNrOuHtEZX80w,285
+tests/table/test_count.py,sha256=qm4dwlQJ5gv8FPSsgYTS-3Gsd_KLgvWlFnmXweKydxw,2297
 tests/table/test_create.py,sha256=d-X7faDGI6NesvElu9JhrAo0Ialmrl6163Whd_LAUDQ,2887
 tests/table/test_create_db_tables.py,sha256=9ZVlv9jGX5uneMfM5c2j1LlOphgorFNHN1cQ1pay4gM,903
 tests/table/test_create_table_class.py,sha256=N56XnaixbiZlakAexdMOw6FI4XnJjy_ybVjpsyhgMQ0,1341
@@ -308,7 +311,7 @@ tests/table/test_insert.py,sha256=LeYNvApZ2T-PZ9fseINLZ6hnrY5F1Axe3QHqidwzbAQ,13
 tests/table/test_join.py,sha256=tk2r5OUaay9-4U37aj2-qul1XybchBG3xr-k7K_IQh0,14705
 tests/table/test_join_on.py,sha256=NhJRg_7_YQ0o2ox5mF330ZaIvmtq09Xl2lfDTwKtUng,2719
 tests/table/test_metaclass.py,sha256=pimcSDH8GYcTTmrwEz7agezgZPyb6_aUTi2CqwsLqFY,3562
-tests/table/test_objects.py,sha256=aEv-y0xkg6UMrWo8rd098ahCI7m177AL3dwU3JNMKRY,7895
+tests/table/test_objects.py,sha256=kMvR-6vah0dU25lQSKlVJkjJOPX3Qd27d5mGKwmm1CY,7910
 tests/table/test_output.py,sha256=BvALFil1VlWKPmlRiqlrhhiAVXcuj3E-Bg85JMqGNlQ,2984
 tests/table/test_raw.py,sha256=9PTvYngQi41nYd5lKzkJdTqsEcwrdOXcvZjq-W26CwQ,1683
 tests/table/test_ref.py,sha256=eYNRnYHzNMXuMbV3B1ca5EidpIg4500q6hr1ccuVaso,269
@@ -341,9 +344,9 @@ tests/utils/test_sql_values.py,sha256=vzxRmy16FfLZPH-sAQexBvsF9MXB8n4smr14qoEOS5
 tests/utils/test_sync.py,sha256=9ytVo56y2vPQePvTeIi9lHIouEhWJbodl1TmzkGFrSo,799
 tests/utils/test_table_reflection.py,sha256=SIzuat-IpcVj1GCFyOWKShI8YkhdOPPFH7qVrvfyPNE,3794
 tests/utils/test_warnings.py,sha256=NvSC_cvJ6uZcwAGf1m-hLzETXCqprXELL8zg3TNLVMw,269
-piccolo-0.113.0.dist-info/LICENSE,sha256=zFIpi-16uIJ420UMIG75NU0JbDBykvrdnXcj5U_EYBI,1059
-piccolo-0.113.0.dist-info/METADATA,sha256=y3WXBB9-MXuwGvUy98op1YrvgE2mh4uYWa6F_c_F8tM,5113
-piccolo-0.113.0.dist-info/WHEEL,sha256=00yskusixUoUt5ob_CiUp6LsnN5lqzTJpoqOFg_FVIc,92
-piccolo-0.113.0.dist-info/entry_points.txt,sha256=zYhu-YNtMlh2N_8wptCS8YWKOgc81UPL3Ji5gly8ouc,47
-piccolo-0.113.0.dist-info/top_level.txt,sha256=-SR74VGbk43VoPy1HH-mHm97yoGukLK87HE5kdBW6qM,24
-piccolo-0.113.0.dist-info/RECORD,,
+piccolo-0.115.0.dist-info/LICENSE,sha256=zFIpi-16uIJ420UMIG75NU0JbDBykvrdnXcj5U_EYBI,1059
+piccolo-0.115.0.dist-info/METADATA,sha256=8DSsJLdSVNh-fxAo23bFxWrtJc9x-cwV9Pmqa9-7afQ,5113
+piccolo-0.115.0.dist-info/WHEEL,sha256=00yskusixUoUt5ob_CiUp6LsnN5lqzTJpoqOFg_FVIc,92
+piccolo-0.115.0.dist-info/entry_points.txt,sha256=zYhu-YNtMlh2N_8wptCS8YWKOgc81UPL3Ji5gly8ouc,47
+piccolo-0.115.0.dist-info/top_level.txt,sha256=-SR74VGbk43VoPy1HH-mHm97yoGukLK87HE5kdBW6qM,24
+piccolo-0.115.0.dist-info/RECORD,,

tests/apps/fixtures/commands/test_dump_load.py

@@ -1,5 +1,7 @@
 import datetime
 import decimal
+import os
+import tempfile
 import typing as t
 import uuid
 from unittest import TestCase
@@ -8,7 +10,7 @@ from piccolo.apps.fixtures.commands.dump import (
     FixtureConfig,
     dump_to_json_string,
 )
-from piccolo.apps.fixtures.commands.load import load_json_string
+from piccolo.apps.fixtures.commands.load import load, load_json_string
 from piccolo.utils.sync import run_sync
 from tests.base import engines_only
 from tests.example_apps.mega.tables import MegaTable, SmallTable
@@ -240,3 +242,39 @@ class TestDumpLoad(TestCase):
                 "not_null_col": "hello",
             },
         )
+
+
+class TestOnConflict(TestCase):
+    def setUp(self) -> None:
+        SmallTable.create_table().run_sync()
+        SmallTable({SmallTable.varchar_col: "Test"}).save().run_sync()
+
+    def tearDown(self) -> None:
+        SmallTable.alter().drop_table().run_sync()
+
+    def test_on_conflict(self):
+        temp_dir = tempfile.gettempdir()
+
+        json_file_path = os.path.join(temp_dir, "fixture.json")
+
+        json_string = run_sync(
+            dump_to_json_string(
+                fixture_configs=[
+                    FixtureConfig(
+                        app_name="mega",
+                        table_class_names=["SmallTable"],
+                    )
+                ]
+            )
+        )
+
+        if os.path.exists(json_file_path):
+            os.unlink(json_file_path)
+
+        with open(json_file_path, "w") as f:
+            f.write(json_string)
+
+        run_sync(load(path=json_file_path, on_conflict="DO NOTHING"))
+        run_sync(load(path=json_file_path, on_conflict="DO UPDATE"))
+        run_sync(load(path=json_file_path, on_conflict="do nothing"))
+        run_sync(load(path=json_file_path, on_conflict="do update"))

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

@@ -1138,9 +1138,10 @@ class TestSchemas(MigrationTestCase):
             ).run_sync(),
         )
 
-    def test_move_schemas(self):
+    def test_move_table_from_public_schema(self):
         """
-        Make sure the auto migrations detect that a table's schema has changed.
+        Make sure the auto migrations can move a table from the public schema
+        to a different schema.
         """
         self._test_migrations(
             table_snapshots=[
@@ -1181,6 +1182,37 @@ class TestSchemas(MigrationTestCase):
             self.schema_manager.list_schemas().run_sync(),
         )
 
+    def test_move_table_to_public_schema(self):
+        """
+        Make sure the auto migrations can move a table from a schema to the
+        public schema.
+        """
+        self._test_migrations(
+            table_snapshots=[
+                [self.manager_2],
+                [self.manager_1],
+            ],
+        )
+
+        # Make sure that the table is in the public schema.
+        self.assertIn(
+            "manager",
+            self.schema_manager.list_tables(schema_name="public").run_sync(),
+        )
+
+        #######################################################################
+
+        # Reverse the last migration, which should move the table back to the
+        # non-public schema.
+        self._run_backwards(migration_id="1")
+
+        self.assertIn(
+            "manager",
+            self.schema_manager.list_tables(
+                schema_name=self.new_schema
+            ).run_sync(),
+        )
+
 
 @engines_only("postgres", "cockroach")
 class TestSameTableName(MigrationTestCase):