Merge branch 'piccolo-orm:master' into composite_index

sinisaos · web-flow · commit 9c53f80d1785 · 2026-01-14T07:22:18.000+01:00
diff --git a/README.md b/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/), [Litestar](https://litestar.dev/), [Esmerald](https://esmerald.dev/), [Lilya](https://lilya.dev), [Quart](https://quart.palletsprojects.com/en/latest/), [Falcon](https://falconframework.org/) and [Sanic](https://sanic.dev/en/) are currently supported.
+[Starlette](https://www.starlette.io/), [FastAPI](https://fastapi.tiangolo.com/), [BlackSheep](https://www.neoteroi.dev/blacksheep/), [Litestar](https://litestar.dev/), [Ravyn](https://www.ravyn.dev/), [Lilya](https://lilya.dev/), [Quart](https://quart.palletsprojects.com/en/latest/), [Falcon](https://falconframework.org/) and [Sanic](https://sanic.dev/en/) are currently supported.
 
 ## Piccolo ecosystem
 
diff --git a/docs/src/index.rst b/docs/src/index.rst
@@ -60,7 +60,7 @@ Give me an ASGI web app!
 
    piccolo asgi new
 
-FastAPI, Starlette, BlackSheep, Litestar, Esmerald, Lilya, Quart, Falcon and Sanic  
+FastAPI, Starlette, BlackSheep, Litestar, Ravyn, Lilya, Quart, Falcon and Sanic  
 are currently supported, with more coming soon.
 
 ----------------------------------------------------------------------------------
diff --git a/docs/src/piccolo/asgi/index.rst b/docs/src/piccolo/asgi/index.rst
@@ -22,7 +22,7 @@ Routing frameworks
 
 `Starlette <https://www.starlette.io/>`_, `FastAPI <https://fastapi.tiangolo.com/>`_,
 `BlackSheep <https://www.neoteroi.dev/blacksheep/>`_,
-`Litestar <https://litestar.dev/>`_, `Esmerald <https://esmerald.dev/>`_,
+`Litestar <https://litestar.dev/>`_, `Ravyn <https://www.ravyn.dev/>`_,
 `Lilya <https://lilya.dev/>`_,
 `Quart <https://quart.palletsprojects.com/en/latest/>`_,
 `Falcon <https://falconframework.org/>`_
@@ -31,8 +31,8 @@ and `Sanic <https://sanic.dev/en/>`_ are supported.
 Which to use?
 =============
 
-All are great choices. FastAPI is built on top of Starlette and Esmerald is built on top of Lilya, so they're
-very similar. FastAPI, BlackSheep, Litestar and Esmerald are great if you want to document a REST
+All are great choices. FastAPI is built on top of Starlette and Ravyn is built on top of Lilya, so they're
+very similar. FastAPI, BlackSheep, Litestar and Ravyn are great if you want to document a REST
 API, as they have built-in OpenAPI support.
 
 -------------------------------------------------------------------------------
diff --git a/docs/src/piccolo/query_clauses/on_conflict.rst b/docs/src/piccolo/query_clauses/on_conflict.rst
@@ -78,6 +78,7 @@ Instead, if we want to update the ``popularity``:
     ...     Band(name="Pythonistas", popularity=1200)
     ... ).on_conflict(
     ...     action="DO UPDATE",
+    ...     target=Band.name,
     ...     values=[Band.popularity]
     ... )
 
@@ -93,8 +94,9 @@ If we fetch the data from the database, we'll see that it was updated:
 
 Using the ``target`` argument, we can specify which constraint we're concerned
 with. By specifying ``target=Band.name`` we're only concerned with the unique
-constraint for the ``band`` column. If you omit the ``target`` argument, then
-it works for all constraints on the table.
+constraint for the ``band`` column. If you omit the ``target`` argument on
+``DO NOTHING`` action, then it works for all constraints on the table. For 
+``DO UPDATE`` action, ``target`` is mandatory and must be provided.
 
 .. code-block:: python
     :emphasize-lines: 5
diff --git a/piccolo/apps/asgi/commands/new.py b/piccolo/apps/asgi/commands/new.py
@@ -14,7 +14,7 @@
     "fastapi": ["fastapi"],
     "blacksheep": ["blacksheep[full]"],
     "litestar": ["litestar"],
-    "esmerald": ["esmerald"],
+    "ravyn": ["ravyn"],
     "lilya": ["lilya"],
     "quart": ["quart", "quart_schema"],
     "falcon": ["falcon"],
diff --git a/piccolo/apps/asgi/commands/templates/app/_ravyn_app.py.jinja b/piccolo/apps/asgi/commands/templates/app/_ravyn_app.py.jinja
@@ -1,9 +1,9 @@
 from typing import Any
 from pathlib import Path
 
-from esmerald import (
+from ravyn import (
     APIView,
-    Esmerald,
+    Ravyn,
     Gateway,
     HTTPException,
     Include,
@@ -12,7 +12,7 @@ from esmerald import (
     post,
     put,
 )
-from esmerald.core.config import StaticFilesConfig
+from ravyn.core.config import StaticFilesConfig
 from piccolo.engine import engine_finder
 from piccolo.utils.pydantic import create_pydantic_model
 from piccolo_admin.endpoints import create_admin
@@ -107,7 +107,7 @@ class TaskAPIView(APIView):
         await task.remove()
 
 
-app = Esmerald(
+app = Ravyn(
     routes=[
         Gateway("/", handler=home),
         Gateway("/tasks", handler=TaskAPIView),
diff --git a/piccolo/apps/asgi/commands/templates/app/app.py.jinja b/piccolo/apps/asgi/commands/templates/app/app.py.jinja
@@ -6,8 +6,8 @@
     {% include '_blacksheep_app.py.jinja' %}
 {% elif router == 'litestar' %}
     {% include '_litestar_app.py.jinja' %}
-{% elif router == 'esmerald' %}
-    {% include '_esmerald_app.py.jinja' %}
+{% elif router == 'ravyn' %}
+    {% include '_ravyn_app.py.jinja' %}
 {% elif router == 'lilya' %}
     {% include '_lilya_app.py.jinja' %}
 {% elif router == 'quart' %}
diff --git a/piccolo/apps/asgi/commands/templates/app/home/_ravyn_endpoints.py.jinja b/piccolo/apps/asgi/commands/templates/app/home/_ravyn_endpoints.py.jinja
@@ -1,8 +1,8 @@
 import os
 
 import jinja2
-from esmerald import Request, Response, get
-from esmerald.responses import HTMLResponse
+from ravyn import Request, Response, get
+from ravyn.responses import HTMLResponse
 
 ENVIRONMENT = jinja2.Environment(
     loader=jinja2.FileSystemLoader(
diff --git a/piccolo/apps/asgi/commands/templates/app/home/endpoints.py.jinja b/piccolo/apps/asgi/commands/templates/app/home/endpoints.py.jinja
@@ -4,8 +4,8 @@
     {% include '_blacksheep_endpoints.py.jinja' %}
 {% elif router == 'litestar' %}
     {% include '_litestar_endpoints.py.jinja' %}
-{% elif router == 'esmerald' %}
-    {% include '_esmerald_endpoints.py.jinja' %}
+{% elif router == 'ravyn' %}
+    {% include '_ravyn_endpoints.py.jinja' %}
 {% elif router == 'lilya' %}
     {% include '_lilya_endpoints.py.jinja' %}
 {% elif router == 'quart' %}
diff --git a/piccolo/apps/asgi/commands/templates/app/home/templates/home.html.jinja_raw b/piccolo/apps/asgi/commands/templates/app/home/templates/home.html.jinja_raw
@@ -56,7 +56,7 @@
                 <li><a href="/admin/">Admin</a></li>
                 <li><a href="/schema/swagger">Swagger API</a></li>
             </ul>
-            <h3>Esmerald</h3>
+            <h3>Ravyn</h3>
             <ul>
                 <li><a href="/admin/">Admin</a></li>
                 <li><a href="/docs/swagger">Swagger API</a></li>
diff --git a/piccolo/apps/migrations/auto/migration_manager.py b/piccolo/apps/migrations/auto/migration_manager.py
@@ -659,11 +659,12 @@ async def _run_alter_columns(self, backwards: bool = False):
                     constraint_name = await get_fk_constraint_name(
                         column=fk_column
                     )
-                    await self._run_query(
-                        _Table.alter().drop_constraint(
-                            constraint_name=constraint_name
+                    if constraint_name:
+                        await self._run_query(
+                            _Table.alter().drop_constraint(
+                                constraint_name=constraint_name
+                            )
                         )
-                    )
 
                     # Then add a new foreign key constraint
                     await self._run_query(
diff --git a/piccolo/columns/defaults/uuid.py b/piccolo/columns/defaults/uuid.py
@@ -17,7 +17,7 @@ class UUID4(Default):
 
     @property
     def postgres(self):
-        return "uuid_generate_v4()"
+        return "gen_random_uuid()"
 
     @property
     def cockroach(self):
diff --git a/piccolo/engine/postgres.py b/piccolo/engine/postgres.py
@@ -354,7 +354,7 @@ class PostgresEngine(Engine[PostgresTransaction]):
     def __init__(
         self,
         config: dict[str, Any],
-        extensions: Sequence[str] = ("uuid-ossp",),
+        extensions: Sequence[str] = tuple(),
         log_queries: bool = False,
         log_responses: bool = False,
         extra_nodes: Optional[Mapping[str, PostgresEngine]] = None,
diff --git a/piccolo/query/constraints.py b/piccolo/query/constraints.py
@@ -1,10 +1,11 @@
 from dataclasses import dataclass
+from typing import Optional
 
 from piccolo.columns import ForeignKey
 from piccolo.columns.base import OnDelete, OnUpdate
 
 
-async def get_fk_constraint_name(column: ForeignKey) -> str:
+async def get_fk_constraint_name(column: ForeignKey) -> Optional[str]:
     """
     Checks what the foreign key constraint is called in the database.
     """
@@ -40,7 +41,10 @@ async def get_fk_constraint_name(column: ForeignKey) -> str:
         column_name,
     )
 
-    return constraints[0]["fk_constraint_name"]
+    # if we change the column type from a non-FK column to
+    # an FK column, the previous column type has no FK constraints
+    # and we skip this to allow the migration to continue
+    return constraints[0]["fk_constraint_name"] if constraints else None
 
 
 @dataclass
diff --git a/piccolo/query/mixins.py b/piccolo/query/mixins.py
@@ -769,6 +769,11 @@ def on_conflict(
         else:
             raise ValueError("Unrecognised `on conflict` action.")
 
+        if target is None and action_ == OnConflictAction.do_update:
+            raise ValueError(
+                "The `target` option must be provided with DO UPDATE."
+            )
+
         if where and action_ == OnConflictAction.do_nothing:
             raise ValueError(
                 "The `where` option can only be used with DO NOTHING."
diff --git a/tests/apps/migrations/auto/integration/test_migrations.py b/tests/apps/migrations/auto/integration/test_migrations.py
@@ -437,7 +437,7 @@ def test_uuid_column(self):
                 [
                     x.data_type == "uuid",
                     x.is_nullable == "NO",
-                    x.column_default == "uuid_generate_v4()",
+                    x.column_default == "gen_random_uuid()",
                 ]
             ),
         )
diff --git a/tests/table/test_insert.py b/tests/table/test_insert.py
@@ -174,6 +174,27 @@ def test_do_update_tuple_values(self):
             ],
         )
 
+    def test_do_update_no_target(self):
+        """
+        Make sure that `DO UPDATE` with no `target` raises an exception.
+        """
+        Band = self.Band
+
+        new_popularity = self.band.popularity + 1000
+
+        with self.assertRaises(ValueError) as manager:
+            Band.insert(
+                Band(name=self.band.name, popularity=new_popularity)
+            ).on_conflict(
+                action="DO UPDATE",
+                values=[(Band.popularity, new_popularity + 2000)],
+            ).run_sync()
+
+        self.assertEqual(
+            manager.exception.__str__(),
+            "The `target` option must be provided with DO UPDATE.",
+        )
+
     def test_do_update_no_values(self):
         """
         Make sure that `DO UPDATE` with no `values` raises an exception.
