piccolo 1.28.0__py3-none-any.whl → 1.29.0__py3-none-any.whl

piccolo/apps/asgi/commands/templates/app/_sanic_app.py.jinja

@@ -1,11 +1,10 @@
-import asyncio
-import typing as t
+from typing import Any
 
 from hypercorn.middleware import DispatcherMiddleware
 from piccolo.engine import engine_finder
 from piccolo_admin.endpoints import create_admin
 from piccolo_api.crud.serializers import create_pydantic_model
-from sanic import Request, Sanic, json
+from sanic import NotFound, Request, Sanic, json
 from sanic_ext import openapi
 
 from home.endpoints import index
@@ -16,17 +15,24 @@ app = Sanic(__name__)
 app.static("/static/", "static")
 
 
-TaskModelIn: t.Any = create_pydantic_model(
+TaskModelIn: Any = create_pydantic_model(
     table=Task,
     model_name="TaskModelIn",
 )
-TaskModelOut: t.Any = create_pydantic_model(
+TaskModelOut: Any = create_pydantic_model(
     table=Task,
     include_default_columns=True,
     model_name="TaskModelOut",
 )
 
 
+# Check if the record is None. Use for query callback
+def check_record_not_found(result: dict[str, Any]) -> dict[str, Any]:
+    if result is None:
+        raise NotFound(message="Record not found")
+    return result
+
+
 @app.get("/")
 @openapi.exclude()
 def home(request: Request):
@@ -43,6 +49,19 @@ async def tasks(request: Request):
     )
 
 
+@app.get("/tasks/<task_id:int>/")
+@openapi.tag("Task")
+@openapi.response(200, {"application/json": TaskModelOut.model_json_schema()})
+async def single_task(request: Request, task_id: int):
+    task = (
+        await Task.select()
+        .where(Task._meta.primary_key == task_id)
+        .first()
+        .callback(check_record_not_found)
+    )
+    return json(task, status=200)
+
+
 @app.post("/tasks/")
 @openapi.definition(
     body={"application/json": TaskModelIn.model_json_schema()},
@@ -62,9 +81,11 @@ async def create_task(request: Request):
 )
 @openapi.response(200, {"application/json": TaskModelOut.model_json_schema()})
 async def update_task(request: Request, task_id: int):
-    task = await Task.objects().get(Task._meta.primary_key == task_id)
-    if not task:
-        return json({}, status=404)
+    task = (
+        await Task.objects()
+        .get(Task._meta.primary_key == task_id)
+        .callback(check_record_not_found)
+    )
     for key, value in request.json.items():
         setattr(task, key, value)
 
@@ -75,9 +96,11 @@ async def update_task(request: Request, task_id: int):
 @app.delete("/tasks/<task_id:int>/")
 @openapi.tag("Task")
 async def delete_task(request: Request, task_id: int):
-    task = await Task.objects().get(Task._meta.primary_key == task_id)
-    if not task:
-        return json({}, status=404)
+    task = (
+        await Task.objects()
+        .get(Task._meta.primary_key == task_id)
+        .callback(check_record_not_found)
+    )
     await task.remove()
     return json({}, status=200)
 

piccolo/apps/playground/commands/run.py

@@ -12,6 +12,7 @@ from typing import Optional
 
 from piccolo.columns import (
     JSON,
+    M2M,
     UUID,
     Array,
     Boolean,
@@ -19,6 +20,7 @@ from piccolo.columns import (
     ForeignKey,
     Integer,
     Interval,
+    LazyTableReference,
     Numeric,
     Serial,
     Text,
@@ -49,6 +51,7 @@ class Band(Table):
     name = Varchar(length=50)
     manager = ForeignKey(references=Manager, null=True)
     popularity = Integer()
+    genres = M2M(LazyTableReference("GenreToBand", module_path=__name__))
 
     @classmethod
     def get_readable(cls) -> Readable:
@@ -161,6 +164,26 @@ class Album(Table):
         )
 
 
+class Genre(Table):
+    id: Serial
+    name = Varchar()
+    bands = M2M(LazyTableReference("GenreToBand", module_path=__name__))
+
+    @classmethod
+    def get_readable(cls) -> Readable:
+        return Readable(
+            template="%s",
+            columns=[cls.name],
+        )
+
+
+class GenreToBand(Table):
+    id: Serial
+    band = ForeignKey(Band)
+    genre = ForeignKey(Genre)
+    reason = Text(null=True, default=None)
+
+
 TABLES = (
     Manager,
     Band,
@@ -171,6 +194,8 @@ TABLES = (
     DiscountCode,
     RecordingStudio,
     Album,
+    Genre,
+    GenreToBand,
 )
 
 
@@ -282,6 +307,24 @@ def populate():
         ),
     ).run_sync()
 
+    genres = Genre.insert(
+        Genre(name="Rock"),
+        Genre(name="Classical"),
+        Genre(name="Folk"),
+    ).run_sync()
+
+    GenreToBand.insert(
+        GenreToBand(
+            band=pythonistas.id,
+            genre=genres[0]["id"],
+            reason="Because they rock.",
+        ),
+        GenreToBand(band=pythonistas.id, genre=genres[2]["id"]),
+        GenreToBand(band=rustaceans.id, genre=genres[2]["id"]),
+        GenreToBand(band=c_sharps.id, genre=genres[0]["id"]),
+        GenreToBand(band=c_sharps.id, genre=genres[1]["id"]),
+    ).run_sync()
+
 
 def run(
     engine: str = "sqlite",

piccolo/columns/column_types.py

@@ -158,8 +158,8 @@ class MathDelegate:
                 raise ValueError(
                     "Adding values across joins isn't currently supported."
                 )
-            column_name = column._meta.db_column_name
-            return QueryString(f"{column_name} {operator} {column_name}")
+            other_column_name = value._meta.db_column_name
+            return QueryString(f"{column_name} {operator} {other_column_name}")
         elif isinstance(value, (int, float)):
             if reverse:
                 return QueryString(f"{{}} {operator} {column_name}", value)

piccolo/table.py

@@ -16,7 +16,6 @@ from piccolo.columns.column_types import (
     Email,
     ForeignKey,
     ReferencedTable,
-    Secret,
     Serial,
 )
 from piccolo.columns.defaults.base import Default
@@ -84,7 +83,7 @@ class TableMeta:
     foreign_key_columns: list[ForeignKey] = field(default_factory=list)
     primary_key: Column = field(default_factory=Column)
     json_columns: list[Union[JSON, JSONB]] = field(default_factory=list)
-    secret_columns: list[Secret] = field(default_factory=list)
+    secret_columns: list[Column] = field(default_factory=list)
     auto_update_columns: list[Column] = field(default_factory=list)
     tags: list[str] = field(default_factory=list)
     help_text: Optional[str] = None
@@ -274,7 +273,7 @@ class Table(metaclass=TableMetaclass):
         non_default_columns: list[Column] = []
         array_columns: list[Array] = []
         foreign_key_columns: list[ForeignKey] = []
-        secret_columns: list[Secret] = []
+        secret_columns: list[Column] = []
         json_columns: list[Union[JSON, JSONB]] = []
         email_columns: list[Email] = []
         auto_update_columns: list[Column] = []
@@ -315,15 +314,15 @@ class Table(metaclass=TableMetaclass):
                 if isinstance(column, Email):
                     email_columns.append(column)
 
-                if isinstance(column, Secret):
-                    secret_columns.append(column)
-
                 if isinstance(column, ForeignKey):
                     foreign_key_columns.append(column)
 
                 if isinstance(column, (JSON, JSONB)):
                     json_columns.append(column)
 
+                if column._meta.secret:
+                    secret_columns.append(column)
+
                 if column._meta.auto_update is not ...:
                     auto_update_columns.append(column)
 
@@ -1373,6 +1372,15 @@ class Table(metaclass=TableMetaclass):
             columns.append(
                 f"{col._meta.name} = {col.__class__.__name__}({params_string})"
             )
+
+        for m2m_relationship in cls._meta.m2m_relationships:
+            joining_table_name = (
+                m2m_relationship._meta.resolved_joining_table.__name__
+            )
+            columns.append(
+                f"{m2m_relationship._meta.name} = M2M({joining_table_name})"
+            )
+
         columns_string = spacer.join(columns)
         tablename = repr(cls._meta.tablename)
 

piccolo/testing/model_builder.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import datetime
+import decimal
 import json
 from collections.abc import Callable
 from decimal import Decimal
@@ -20,6 +21,7 @@ class ModelBuilder:
         datetime.date: RandomBuilder.next_date,
         datetime.datetime: RandomBuilder.next_datetime,
         float: RandomBuilder.next_float,
+        decimal.Decimal: RandomBuilder.next_decimal,
         int: RandomBuilder.next_int,
         str: RandomBuilder.next_str,
         datetime.time: RandomBuilder.next_time,
@@ -163,8 +165,8 @@ class ModelBuilder:
         random_value: Any
         if column.value_type == Decimal:
             precision, scale = column._meta.params["digits"] or (4, 2)
-            random_value = RandomBuilder.next_float(
-                maximum=10 ** (precision - scale), scale=scale
+            random_value = RandomBuilder.next_decimal(
+                precision=precision, scale=scale
             )
         elif column.value_type == datetime.datetime:
             tz_aware = getattr(column, "tz_aware", False)

piccolo/testing/random_builder.py

@@ -1,4 +1,5 @@
 import datetime
+import decimal
 import enum
 import random
 import string
@@ -43,6 +44,17 @@ class RandomBuilder:
     def next_float(cls, minimum=0, maximum=2147483647, scale=5) -> float:
         return round(random.uniform(minimum, maximum), scale)
 
+    @classmethod
+    def next_decimal(
+        cls, precision: int = 4, scale: int = 2
+    ) -> decimal.Decimal:
+        # For precision 4 and scale 2, maximum needs to be 99.99.
+        maximum = (10 ** (precision - scale)) - (10 ** (-1 * scale))
+        float_number = cls.next_float(maximum=maximum, scale=scale)
+        # We convert float_number to a string first, otherwise the decimal
+        # value is slightly off due to floating point precision.
+        return decimal.Decimal(str(float_number))
+
     @classmethod
     def next_int(cls, minimum=0, maximum=2147483647) -> int:
         return random.randint(minimum, maximum)

{piccolo-1.28.0.dist-info → piccolo-1.29.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piccolo
-Version: 1.28.0
+Version: 1.29.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-1.28.0.dist-info → piccolo-1.29.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-piccolo/__init__.py,sha256=xu4CW3LmhKRfjg47hg5s7XZDPYKw_3YQKCjwvwcpK1E,23
+piccolo/__init__.py,sha256=C-iTYm1gDGgB27Giaf3CpBiC_O-eM1faeVO4P3hLU68,23
 piccolo/custom_types.py,sha256=3ceuQZNMQTXVikZzACnJS4eIIgTpwubKg2kaKOshprw,1035
 piccolo/main.py,sha256=1VsFV67FWTUikPTysp64Fmgd9QBVa_9wcwKfwj2UCEA,5117
 piccolo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/querystring.py,sha256=nOSCh5sTng-dxHr5WdUqf7TwYTrKAgkEP5GcrBmcW9I,10011
 piccolo/schema.py,sha256=2S5SlG9FfAuRKNLA6cADziNcFJ1PeNj5uhc_NJ-_g0I,7953
-piccolo/table.py,sha256=83FMLo3AuR_eePhbu1YXXQPHcJ84n5XaQOys6zesgoU,50438
+piccolo/table.py,sha256=-i932n96luHZd2UJ0-qboky_DQaoM6xaRAvYt9HeXdE,50721
 piccolo/table_reflection.py,sha256=q3Dp70SI0r8eNduOgVv4u4_W5NwN6A54oYB_2BnyaVY,7535
 piccolo/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/apps/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,16 +17,16 @@ piccolo/apps/app/commands/templates/tables.py.jinja,sha256=revzdrvDDwe78VedBKz0z
 piccolo/apps/asgi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/apps/asgi/piccolo_app.py,sha256=7VUvqQJbB-ScO0A62S6MiJmQL9F5DS-SdlqlDLbAblE,217
 piccolo/apps/asgi/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-piccolo/apps/asgi/commands/new.py,sha256=6TNnp4Dz4g8tZNsXPv-cMCchRhmFzkUrwXZtiQ6ima8,4314
+piccolo/apps/asgi/commands/new.py,sha256=DiwR49zIvTSfsByaCjqleWD38UjHsWUE8hIf2C7DICA,4320
 piccolo/apps/asgi/commands/templates/app/README.md.jinja,sha256=As3gNEZt9qcRmTVkjCzNtXJ8r4-3g0fCSe7Q-P39ezI,214
-piccolo/apps/asgi/commands/templates/app/_blacksheep_app.py.jinja,sha256=ERbVPjjLQWDhXBYzZ_h3WT1Uf0qRL19rFE_NO3i09G0,3213
-piccolo/apps/asgi/commands/templates/app/_esmerald_app.py.jinja,sha256=fIbD106Us4j2DBv_41PimvFRVw2FuZhOfc3xFPkNjuY,2715
-piccolo/apps/asgi/commands/templates/app/_falcon_app.py.jinja,sha256=LOn3auJFeXNW48rtHzRbH3MzxWbRNhFib6Fm6wDS53E,1684
-piccolo/apps/asgi/commands/templates/app/_fastapi_app.py.jinja,sha256=mKnYfUOnYyWJA1jFoRLCUOGQlK6imaxx_1qaauGjeeQ,2627
+piccolo/apps/asgi/commands/templates/app/_blacksheep_app.py.jinja,sha256=xumVDAcbnVoaAcslDyUyx8MQU2qghB7LnJR-8IJAhSc,3824
+piccolo/apps/asgi/commands/templates/app/_esmerald_app.py.jinja,sha256=clKi85iqujPdP0M88QjocBme17zxKB4G5-Ay4SMzVbg,3433
+piccolo/apps/asgi/commands/templates/app/_falcon_app.py.jinja,sha256=puFcf7-f9qR3HKWaRnBVgtpHZUiVFCo3MsGxx2nCQVQ,3241
+piccolo/apps/asgi/commands/templates/app/_fastapi_app.py.jinja,sha256=NjKzww8-hvqVXdaXdjEF4kTm3tM2huOHUQRra_2LFJU,3355
 piccolo/apps/asgi/commands/templates/app/_lilya_app.py.jinja,sha256=PUph5Jj_AXVpxXZmpUzzHXogUchU8vjKBL_7WvgrfCU,1260
-piccolo/apps/asgi/commands/templates/app/_litestar_app.py.jinja,sha256=VCY4FoA7YlEhtjWB09XWQqi8GgL36VQwGGBpSXUDO5o,3349
-piccolo/apps/asgi/commands/templates/app/_quart_app.py.jinja,sha256=3LoQJ6LWRB0NFIcfQtPUdNWb10csyDGgCIa2zx8w4e8,2837
-piccolo/apps/asgi/commands/templates/app/_sanic_app.py.jinja,sha256=qza84-aV6wnPlPQ9bpcD5DLO-pvkmoSnb_lXmcymv6c,3159
+piccolo/apps/asgi/commands/templates/app/_litestar_app.py.jinja,sha256=dFcVfO150uj9OfdJ-3-MVZ-3RCoLIp9AOFdn1qSQzbE,3872
+piccolo/apps/asgi/commands/templates/app/_quart_app.py.jinja,sha256=4CACs2sjHhDF3TpxM232F6hq744WD-ue8hxFMAUd45E,3468
+piccolo/apps/asgi/commands/templates/app/_sanic_app.py.jinja,sha256=voq09eUymx4o7pMS7eoXlSrJYR8LY-HLW5Ufi4Utc2w,3781
 piccolo/apps/asgi/commands/templates/app/_starlette_app.py.jinja,sha256=vHcAzsS9I3OevYoznwZp8zucI4OEyUjj-EOAtscmlSE,1443
 piccolo/apps/asgi/commands/templates/app/app.py.jinja,sha256=n2KriWxCnq65vdEvX1USTqZPDbNkYXQqTJT5EmespT8,667
 piccolo/apps/asgi/commands/templates/app/conftest.py.jinja,sha256=ZG1pRVMv3LhIfOsO3_08c_fF3EV4_EApuDHiIFFPJdk,497
@@ -83,7 +83,7 @@ piccolo/apps/migrations/commands/templates/migration.py.jinja,sha256=wMC8RTIcQj3
 piccolo/apps/playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/apps/playground/piccolo_app.py,sha256=zs6nGxt-lgUF8nEwI0uDTNZDKQqjZaNDH8le5RqrMNE,222
 piccolo/apps/playground/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-piccolo/apps/playground/commands/run.py,sha256=5761m3xLcxR0uSeUSKgQ3V2Pr8LlGB0JAjhGTX9gCVo,9680
+piccolo/apps/playground/commands/run.py,sha256=TOAHIEGwEB09ufoZvDztO8osSRzU6lE96tr2u9BxmWM,10811
 piccolo/apps/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/apps/project/piccolo_app.py,sha256=mT3O0m3QcCfS0oOr3jt0QZ9TX6gUavGPjJeNn2C_fdM,220
 piccolo/apps/project/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -123,7 +123,7 @@ piccolo/apps/user/piccolo_migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 piccolo/columns/__init__.py,sha256=OYhO_n9anMiU9nL-K6ATq9FhAtm8RyMpqYQ7fTVbhxI,1120
 piccolo/columns/base.py,sha256=66hsxdiPJQiJ-v0TRSwxUYx3Cbw4BUp84jr6EFaDoOc,33632
 piccolo/columns/choices.py,sha256=ij5cMmslGr0WcFjcFelhdECX1E3n3R7Kl2Tn5bhu_Lc,725
-piccolo/columns/column_types.py,sha256=tzMdgrVgr1iYsFrc85wcMmT0_MYZRRcbdhH11cfZyxc,88240
+piccolo/columns/column_types.py,sha256=6Yg6F61u7VtAVchrokSO5Y5qYLR6FmPJ1ZBWzx27t7c,88251
 piccolo/columns/combination.py,sha256=lTxbrmUCrk_mVsvBPSEV7v72_dPjMs-Y8-MmAJFAifY,7088
 piccolo/columns/indexes.py,sha256=NfNok3v_791jgDlN28KmhP9ZCjl6031BXmjxV3ovXJk,372
 piccolo/columns/m2m.py,sha256=FfMS9oBZSrFwHsWxp8lJDj4JD0ukphYa3RPyJDKYyLY,14587
@@ -183,8 +183,8 @@ piccolo/query/methods/update.py,sha256=sRSoHU3SMSQQUbScSam8M4lin0RTBA6LrGQA-d4HB
 piccolo/query/operators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 piccolo/query/operators/json.py,sha256=GDLUrMDuHe6XKuzCmvYmkIUUqpQcM-8KMz-peSCLiX4,3182
 piccolo/testing/__init__.py,sha256=pRFSqRInfx95AakOq54atmvqoB-ue073q2aR8u8zR40,83
-piccolo/testing/model_builder.py,sha256=aHCGLC3cFqiEI8MHZ0kZW3w1pZe8X9V5KyLpP5xSvRA,6567
-piccolo/testing/random_builder.py,sha256=vBa42-q1BhiuudFo1ZhSDXXQP50ZsWXOugQMUw38OFw,2128
+piccolo/testing/model_builder.py,sha256=6JTL8CSpNTwF29wAzU6GEG33pp8tLk8viqRNfNLhu1s,6623
+piccolo/testing/random_builder.py,sha256=N_aY1SDBDP6YHGAmYIw-mjTCCwbqt9fPBKW-V0KZ_-c,2650
 piccolo/testing/test_case.py,sha256=VdC-1uclubtePTuxNQ-KOTF5ODaBdwzLbPuiYI5MD48,3280
 piccolo/utils/__init__.py,sha256=SDFFraauI9Op8dCRkreQv1dwUcab8Mi1eC-n0EwlTy8,36
 piccolo/utils/dictionary.py,sha256=mhyyhWwxTSxZcEUntgeQKsbrXD3f_KLdwa0NPzgI11k,1878
@@ -201,7 +201,7 @@ piccolo/utils/sync.py,sha256=oLBVx7K-KhxIOT9wRTAcfixQPMfMJTcnvlmBQM7lAzg,963
 piccolo/utils/warnings.py,sha256=W00-Qb8s2bTc9Xk4g4E5Xqp_aBQROVfFEh-RVSozwZg,1226
 piccolo/utils/graphlib/__init__.py,sha256=SUJ5Yh7LiRun3nkBuLUSVmGNHF6fANrxSoYan0mtYB0,200
 piccolo/utils/graphlib/_graphlib.py,sha256=9FNGDSmTIEAk86FktniCe_J2yXjSE_sRZHDBAJJAUOw,9677
-piccolo-1.28.0.dist-info/licenses/LICENSE,sha256=zFIpi-16uIJ420UMIG75NU0JbDBykvrdnXcj5U_EYBI,1059
+piccolo-1.29.0.dist-info/licenses/LICENSE,sha256=zFIpi-16uIJ420UMIG75NU0JbDBykvrdnXcj5U_EYBI,1059
 profiling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 profiling/run_profile.py,sha256=264qsSFu93NTpExePnKQ9GkcN5fiuRBQ72WOSt0ZHck,829
 tests/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -285,7 +285,7 @@ tests/columns/test_timestamptz.py,sha256=P7zblPC6Fjjdk6iOhVUGIKnFFzbbUPVNSY98qbu
 tests/columns/test_uuid.py,sha256=taFYNvRZjQztMPbTQHYtwQutvcLnKPt6_aUxsf2o04Q,372
 tests/columns/test_varchar.py,sha256=fbwBdimHoGaylfrqkFIgQ5m2q80umSoUNHIwofM6j_c,721
 tests/columns/m2m/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/columns/m2m/base.py,sha256=CCq52vf1_jyIRjn71i_tEhY_eW_8FKJVLSHgUSfYRjw,15023
+tests/columns/m2m/base.py,sha256=_EB5j2jFnSYgvGDT_skdvvZL-L5kcQ6CZCDqpSEGVjY,14067
 tests/columns/m2m/test_m2m.py,sha256=0ObmIHUJF6CZoNBznc5xXVr5_BbGBqOmWwtpg8IcPt4,13055
 tests/columns/m2m/test_m2m_schema.py,sha256=oxu7eAjFFpDjnq9Eq-5OTNmlnsEIMFWx18OItfpVs-s,339
 tests/conf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -346,7 +346,7 @@ tests/table/test_inheritance.py,sha256=AAkhEhhixVGweGe7ckzj-yypW-cj6D88Cca4-pjkw
 tests/table/test_insert.py,sha256=c7hJ1SsTiW43l_Z5KHSN3894ICzttOAsTfWN9rUOl0k,13696
 tests/table/test_join.py,sha256=Ukgvjc8NweBGHM7fVFytGQYG9P9thRaMeEvWXYs2Qes,15910
 tests/table/test_join_on.py,sha256=cdAV39JwHi0kIas2p9cw7mcsUv6mKLZD--_SUA0zLfI,2771
-tests/table/test_metaclass.py,sha256=pMv0PHh-2a9p74bweQXCXnq1OFsJ7Gk0uWRFdCTMf58,4123
+tests/table/test_metaclass.py,sha256=zIlUj0QfspHwnM3jb1DL_-7KTImBkHhjsJuShAvnuT8,4286
 tests/table/test_objects.py,sha256=ptbeIICOfZ2-Fl6K_Llo1SKIyQ5ngUZ-rZtgll5cMWM,9047
 tests/table/test_output.py,sha256=ZnpPbgVp79JcB6E_ooWQxOpOlhkwNUlMxC-1LSIEc2Y,4304
 tests/table/test_raw.py,sha256=9PTvYngQi41nYd5lKzkJdTqsEcwrdOXcvZjq-W26CwQ,1683
@@ -354,9 +354,9 @@ tests/table/test_ref.py,sha256=eYNRnYHzNMXuMbV3B1ca5EidpIg4500q6hr1ccuVaso,269
 tests/table/test_refresh.py,sha256=yn36LV6wXuY6YuIutLgHFE4hl-LIRuWqwCY4WB-wzJg,9253
 tests/table/test_repr.py,sha256=uahz3_GffGQrf2mDE-4-Pu4AmSLBAyso6-9rbohCl58,446
 tests/table/test_select.py,sha256=C-6S9HIZxMQ9cKWmmG8yDXPR37btdt6AUoZDbvcTYJs,43017
-tests/table/test_str.py,sha256=eztWNULcjARR1fr9X5n4tojhDNgDfatVyNHwuYrzHAo,1731
+tests/table/test_str.py,sha256=QCmx9Xc-pUXfAtXz9mPzMfW_WCajjydgz_YT1cYsgvY,1528
 tests/table/test_table_exists.py,sha256=upv2e9UD32V2QZOShzmcw0reMqRbYiX_jxWx57p25jg,1082
-tests/table/test_update.py,sha256=bWt4jMhv3S8fpars0_uW5N-Nq4No5sIKu3M-k0-LZFo,20505
+tests/table/test_update.py,sha256=M950plqKFYtew_4fqx91E0tIrwQL3zZeZh2CmvGy9yw,20979
 tests/table/test_update_self.py,sha256=im6HcM-WLkEhZP0vTL42tYEJZyAZG6gDOxCnbikCBD4,907
 tests/table/instance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/table/instance/test_create.py,sha256=JD0l7L9dDK1FKPhUs6WC_B2bruPR1qQ8aIqXpEbfiUg,1105
@@ -368,7 +368,7 @@ tests/table/instance/test_save.py,sha256=ccdDz-bR3aYDa16_RGQP7JTXprgm1mT6-NpF1y3
 tests/table/instance/test_to_dict.py,sha256=gkiYkmcI5qcy5E-ERWWmO-Q8uyVSFfcpJ8d53LlzCuI,3442
 tests/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/testing/test_model_builder.py,sha256=S0rT7IAmXfrQ6vRQxmkleTrAmsO5fi-tw0SF0l4jBLw,6185
-tests/testing/test_random_builder.py,sha256=Upz9P1bhICVo0udI6Li-5eEdrXKbv8rMMLe0uK6pqB0,1694
+tests/testing/test_random_builder.py,sha256=x2XOY2IAdIiC_hWWJ4iffLRiWOdn4CMvjiseeVvEYC8,1888
 tests/testing/test_test_case.py,sha256=qyDWYT44EZNyuWhaZXgSOpX48RaRw5u4FgNi87FYt2k,1691
 tests/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/utils/test_dictionary.py,sha256=GdWujlYQy6t09p2aQHPibkkPNbBYwkFwomKrVnztJTo,1480
@@ -377,13 +377,13 @@ tests/utils/test_lazy_loader.py,sha256=wDWhlV2IR6RuTaYCI5eWesz465WqIscYEJjwWnPrh
 tests/utils/test_list.py,sha256=25UoStmrYS_JDOKsXYqTDc3FUkOe3dUcy51r0I6grK0,769
 tests/utils/test_naming.py,sha256=ncJdzkMHSVFo2YQLkRhY93WJ8_W_j2pW9tHHL_ZgQcs,661
 tests/utils/test_printing.py,sha256=W8pQyWX2pEkLdMYWxtibFXJnI4MVsb6XMOTo3DZUuZc,668
-tests/utils/test_pydantic.py,sha256=fS3rd3rbn54uBN9w22n3-sCcvAMtk3dq54KMo2evMtQ,27726
+tests/utils/test_pydantic.py,sha256=xjob1PgQphzbSdLQNNkzzZ5XUDdUpC4HAiEj1kHO4tw,27881
 tests/utils/test_sql_values.py,sha256=vzxRmy16FfLZPH-sAQexBvsF9MXB8n4smr14qoEOS5E,2535
 tests/utils/test_sync.py,sha256=9ytVo56y2vPQePvTeIi9lHIouEhWJbodl1TmzkGFrSo,799
 tests/utils/test_table_reflection.py,sha256=bIlwIupyD6XLupf7KYZ1le4EPdft7Jp2ofwF2PHqn60,3771
 tests/utils/test_warnings.py,sha256=NvSC_cvJ6uZcwAGf1m-hLzETXCqprXELL8zg3TNLVMw,269
-piccolo-1.28.0.dist-info/METADATA,sha256=WINpG0xS2r9wGPE2tg3sWgFWiFCeBHqSf-WuJN5La-4,5531
-piccolo-1.28.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-piccolo-1.28.0.dist-info/entry_points.txt,sha256=SJPHET4Fi1bN5F3WqcKkv9SClK3_F1I7m4eQjk6AFh0,46
-piccolo-1.28.0.dist-info/top_level.txt,sha256=-SR74VGbk43VoPy1HH-mHm97yoGukLK87HE5kdBW6qM,24
-piccolo-1.28.0.dist-info/RECORD,,
+piccolo-1.29.0.dist-info/METADATA,sha256=KgAnQBJETmXrcDB97hFPLSdD08sjQymkUifFBakE56Y,5531
+piccolo-1.29.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+piccolo-1.29.0.dist-info/entry_points.txt,sha256=SJPHET4Fi1bN5F3WqcKkv9SClK3_F1I7m4eQjk6AFh0,46
+piccolo-1.29.0.dist-info/top_level.txt,sha256=-SR74VGbk43VoPy1HH-mHm97yoGukLK87HE5kdBW6qM,24
+piccolo-1.29.0.dist-info/RECORD,,

tests/columns/m2m/base.py

@@ -11,7 +11,7 @@ from piccolo.columns.m2m import M2M
 from piccolo.engine.finder import engine_finder
 from piccolo.schema import SchemaManager
 from piccolo.table import Table, create_db_tables_sync, drop_db_tables_sync
-from tests.base import engine_is, engines_skip
+from tests.base import engines_skip
 
 engine = engine_finder()
 
@@ -51,54 +51,25 @@ class M2MBase:
 
         create_db_tables_sync(*self.all_tables, if_not_exists=True)
 
-        if engine_is("cockroach"):
-            bands = (
-                Band.insert(
-                    Band(name="Pythonistas"),
-                    Band(name="Rustaceans"),
-                    Band(name="C-Sharps"),
-                )
-                .returning(Band.id)
-                .run_sync()
-            )
-
-            genres = (
-                Genre.insert(
-                    Genre(name="Rock"),
-                    Genre(name="Folk"),
-                    Genre(name="Classical"),
-                )
-                .returning(Genre.id)
-                .run_sync()
-            )
-
-            GenreToBand.insert(
-                GenreToBand(band=bands[0]["id"], genre=genres[0]["id"]),
-                GenreToBand(band=bands[0]["id"], genre=genres[1]["id"]),
-                GenreToBand(band=bands[1]["id"], genre=genres[1]["id"]),
-                GenreToBand(band=bands[2]["id"], genre=genres[0]["id"]),
-                GenreToBand(band=bands[2]["id"], genre=genres[2]["id"]),
-            ).run_sync()
-        else:
-            Band.insert(
-                Band(name="Pythonistas"),
-                Band(name="Rustaceans"),
-                Band(name="C-Sharps"),
-            ).run_sync()
+        bands = Band.insert(
+            Band(name="Pythonistas"),
+            Band(name="Rustaceans"),
+            Band(name="C-Sharps"),
+        ).run_sync()
 
-            Genre.insert(
-                Genre(name="Rock"),
-                Genre(name="Folk"),
-                Genre(name="Classical"),
-            ).run_sync()
+        genres = Genre.insert(
+            Genre(name="Rock"),
+            Genre(name="Folk"),
+            Genre(name="Classical"),
+        ).run_sync()
 
-            GenreToBand.insert(
-                GenreToBand(band=1, genre=1),
-                GenreToBand(band=1, genre=2),
-                GenreToBand(band=2, genre=2),
-                GenreToBand(band=3, genre=1),
-                GenreToBand(band=3, genre=3),
-            ).run_sync()
+        GenreToBand.insert(
+            GenreToBand(band=bands[0]["id"], genre=genres[0]["id"]),
+            GenreToBand(band=bands[0]["id"], genre=genres[1]["id"]),
+            GenreToBand(band=bands[1]["id"], genre=genres[1]["id"]),
+            GenreToBand(band=bands[2]["id"], genre=genres[0]["id"]),
+            GenreToBand(band=bands[2]["id"], genre=genres[2]["id"]),
+        ).run_sync()
 
     def tearDown(self):
         drop_db_tables_sync(*self.all_tables)

tests/table/test_metaclass.py

@@ -1,13 +1,13 @@
 from unittest import TestCase
 from unittest.mock import MagicMock, patch
 
-from piccolo.columns import Secret
 from piccolo.columns.column_types import (
     JSON,
     JSONB,
     Array,
     Email,
     ForeignKey,
+    Secret,
     Varchar,
 )
 from piccolo.table import TABLENAME_WARNING, Table
@@ -99,14 +99,18 @@ class TestMetaClass(TestCase):
 
     def test_secret_columns(self):
         """
-        Make sure TableMeta.secret_columns are setup correctly.
+        Make sure TableMeta.secret_columns are setup correctly with the
+        ``secret=True`` argument and ``Secret`` column type.
         """
 
         class Classified(Table):
             top_secret = Secret()
+            confidential = Varchar(secret=True)
+            public = Varchar()
 
         self.assertEqual(
-            Classified._meta.secret_columns, [Classified.top_secret]
+            Classified._meta.secret_columns,
+            [Classified.top_secret, Classified.confidential],
         )
 
     def test_json_columns(self):

tests/table/test_str.py

@@ -1,30 +1,20 @@
 from unittest import TestCase
 
-from tests.base import engine_is
-from tests.example_apps.music.tables import Manager
+from piccolo.apps.playground.commands.run import Genre, Manager
 
 
 class TestTableStr(TestCase):
-    def test_str(self):
-        if engine_is("cockroach"):
-            self.assertEqual(
-                Manager._table_str(),
-                (
-                    "class Manager(Table, tablename='manager'):\n"
-                    "    id = Serial(null=False, primary_key=True, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name='id', secret=False)\n"  # noqa: E501
-                    "    name = Varchar(length=50, default='', null=False, primary_key=False, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name=None, secret=False)\n"  # noqa: E501
-                ),
-            )
-        else:
-            self.assertEqual(
-                Manager._table_str(),
-                (
-                    "class Manager(Table, tablename='manager'):\n"
-                    "    id = Serial(null=False, primary_key=True, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name='id', secret=False)\n"  # noqa: E501
-                    "    name = Varchar(length=50, default='', null=False, primary_key=False, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name=None, secret=False)\n"  # noqa: E501
-                ),
-            )
+    def test_all_attributes(self):
+        self.assertEqual(
+            Manager._table_str(),
+            (
+                "class Manager(Table, tablename='manager'):\n"
+                "    id = Serial(null=False, primary_key=True, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name='id', secret=False)\n"  # noqa: E501
+                "    name = Varchar(length=50, default='', null=False, primary_key=False, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name=None, secret=False)\n"  # noqa: E501
+            ),
+        )
 
+    def test_abbreviated(self):
         self.assertEqual(
             Manager._table_str(abbreviated=True),
             (
@@ -34,5 +24,23 @@ class TestTableStr(TestCase):
             ),
         )
 
-        # We should also be able to print it directly.
+    def test_m2m(self):
+        """
+        Make sure M2M relationships appear in the Table string.
+        """
+
+        self.assertEqual(
+            Genre._table_str(abbreviated=True),
+            (
+                "class Genre(Table):\n"
+                "    id = Serial()\n"
+                "    name = Varchar()\n"
+                "    bands = M2M(GenreToBand)\n"
+            ),
+        )
+
+    def test_print(self):
+        """
+        Make sure we can print it directly without any errors.
+        """
         print(Manager)

tests/table/test_update.py

@@ -158,6 +158,7 @@ class TestUpdate(DBTestCase):
 
 class MyTable(Table):
     integer = Integer(null=True)
+    other_integer = Integer(null=True, default=5)
     timestamp = Timestamp(null=True)
     timestamptz = Timestamptz(null=True)
     date = Date(null=True)
@@ -295,6 +296,20 @@ TEST_CASES = [
         querystring=2000 - MyTable.integer,
         expected=1000,
     ),
+    OperatorTestCase(
+        description="Subtract Integer Columns",
+        column=MyTable.integer,
+        initial=1000,
+        querystring=MyTable.integer - MyTable.other_integer,
+        expected=995,
+    ),
+    OperatorTestCase(
+        description="Add Integer Columns",
+        column=MyTable.integer,
+        initial=1000,
+        querystring=MyTable.integer + MyTable.other_integer,
+        expected=1005,
+    ),
     OperatorTestCase(
         description="Multiply Integer",
         column=MyTable.integer,