Merge branch 'piccolo-orm:master' into disable_migrations

Author: sinisaos

.github/workflows/tests.yaml

@@ -142,7 +142,7 @@ jobs:
         strategy:
             matrix:
                 python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
-                cockroachdb-version: ["v24.1.0"]
+                cockroachdb-version: ["v25.4.3"]
         steps:
             - uses: actions/checkout@v3
             - name: Set up Python ${{ matrix.python-version }}

CHANGES.rst

@@ -1,6 +1,36 @@
 Changes
 =======
 
+1.32.0
+------
+
+Added the ``having`` clause, which is useful when working with ``group_by``.
+
+For example, here we get the number of albums per band, but exclude any bands
+with less than 2 albums:
+
+.. code-block:: python
+
+    >>> from piccolo.query.functions.aggregate import Count
+
+    >>> await Album.select(
+    ...     Album.band.name.as_alias('band_name'),
+    ...     Count()
+    ... ).group_by(
+    ...     Album.band
+    ... ).having(
+    ...     Count() >= 2
+    ... )
+
+    [
+        {"band_name": "Pythonistas", "count": 2},
+    ]
+
+We also updated our CockroachDB support to the latest version (thanks to
+@sinisaos for this).
+
+-------------------------------------------------------------------------------
+
 1.31.0
 ------
 

docs/src/piccolo/api_reference/index.rst

@@ -111,6 +111,32 @@ UUID
 ~~~~
 
 .. autoclass:: UUID4
+
+.. autoclass:: UUID7
+
+
+Timestamp
+~~~~~~~~~
+
+.. autoclass:: TimestampCustom
+    :members:
+
+.. autoclass:: TimestampOffset
+    :members:
+
+.. autoclass:: TimestampNow
+    :members:
+
+Timestamptz
+~~~~~~~~~~~
+
+.. autoclass:: TimestamptzCustom
+    :members:
+
+.. autoclass:: TimestamptzOffset
+    :members:
+
+.. autoclass:: TimestamptzNow
     :members:
 
 -------------------------------------------------------------------------------
@@ -144,3 +170,15 @@ QueryString
 .. currentmodule:: piccolo.querystring
 
 .. autoclass:: QueryString
+
+-------------------------------------------------------------------------------
+
+Custom Types
+------------
+
+BasicTypes
+~~~~~~~~~~
+
+.. currentmodule:: piccolo.custom_types
+
+.. autoclass:: BasicTypes

docs/src/piccolo/contributing/index.rst

@@ -22,8 +22,8 @@ Make sure the test database exists:
 .. code-block:: console
 
     cockroach sql --insecure
-    >>> create database piccolo
-    >>> use piccolo
+    >>> create database piccolo;
+    >>> use piccolo;
 
 -------------------------------------------------------------------------------
 

docs/src/piccolo/functions/conditional.rst

@@ -0,0 +1,9 @@
+Conditional functions
+=====================
+
+.. currentmodule:: piccolo.query.functions.conditional
+
+Coalesce
+--------
+
+.. autoclass:: Coalesce

docs/src/piccolo/functions/index.rst

@@ -13,6 +13,7 @@ Functions can be used to modify how queries are run, and what is returned.
     ./basic_usage
     ./aggregate
     ./array
+    ./conditional
     ./datetime
     ./math
     ./string

docs/src/piccolo/query_clauses/having.rst

@@ -0,0 +1,40 @@
+.. _having:
+
+having
+======
+
+You can use the ``having`` clause with the following queries:
+
+* :ref:`Select`
+
+It is used in combination with the :ref:`group_by` clause, to filter the
+grouped rows.
+
+The syntax is identical to the :ref:`where` clause.
+
+-------------------------------------------------------------------------------
+
+Example
+-------
+
+In the following example, we get the number of albums per band (filtering out
+any bands with less than 2 albums).
+
+.. hint:: You can run this query in the :ref:`playground`.
+
+.. code-block:: python
+
+    >>> from piccolo.query.functions.aggregate import Count
+
+    >>> await Album.select(
+    ...     Album.band.name.as_alias('band_name'),
+    ...     Count()
+    ... ).group_by(
+    ...     Album.band
+    ... ).having(
+    ...     Count() >= 2
+    ... )
+
+    [
+        {"band_name": "Pythonistas", "count": 2},
+    ]

docs/src/piccolo/query_clauses/index.rst

@@ -25,6 +25,7 @@ by modifying the return values.
     ./distinct
     ./freeze
     ./group_by
+    ./having
     ./lock_rows
     ./offset
     ./on_conflict

piccolo/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.31.0"
+__VERSION__ = "1.32.0"

piccolo/apps/migrations/auto/migration_manager.py

@@ -18,6 +18,7 @@
 from piccolo.columns import Column, column_types
 from piccolo.columns.column_types import ForeignKey, Serial
 from piccolo.engine import engine_finder
+from piccolo.engine.cockroach import CockroachTransaction
 from piccolo.query import Query
 from piccolo.query.base import DDL
 from piccolo.query.constraints import get_fk_constraint_name
@@ -984,7 +985,11 @@ async def run(self, backwards: bool = False):
             engine.transaction()
             if self.wrap_in_transaction
             else SkippedTransaction()
-        ):
+        ) as transaction:
+            if isinstance(transaction, CockroachTransaction):
+                # To enable DDL rollbacks in CockroachDB.
+                await transaction.autocommit_before_ddl(enabled=False)
+
             if not self.preview:
                 if direction == "backwards":
                     raw_list = self.raw_backwards