Merge branch 'master' into dbern/safe-ecto-migration

Author: dbernheisel

CHANGELOG.md

@@ -9,6 +9,10 @@
   * [sandbox] Label the sandbox owner process
   * [sql] Allow fragment tuple sources in adapters
 
+## v3.13.5 (2026-03-03)
+
+  * [postgrex] Map `:restrict_violation` to `:foreign_key` constraint (required by PostgreSQL 18)
+
 ## v3.13.4 (2025-12-27)
 
 ### Bug fixes

lib/ecto/adapters/postgres/connection.ex

@@ -1204,6 +1204,9 @@ if Code.ensure_loaded?(Postgrex) do
     defp returning([]),
       do: []
 
+    defp returning({:unsafe_fragment, fragment}),
+      do: [" RETURNING ", fragment]
+
     defp returning(returning),
       do: [" RETURNING " | quote_names(returning)]
 

lib/ecto/adapters/sql.ex

@@ -895,7 +895,7 @@ defmodule Ecto.Adapters.SQL do
     {name, config} = Keyword.pop(config, :name, config[:repo])
     {pool_count, config} = Keyword.pop(config, :pool_count, 1)
     {pool, config} = pool_config(config)
-    child_spec = connection.child_spec(config)
+    child_spec = connection.child_spec([label: name] ++ config)
 
     meta = %{
       telemetry: telemetry,

lib/ecto/adapters/tds/connection.ex

@@ -1027,6 +1027,9 @@ if Code.ensure_loaded?(Tds) do
 
     defp returning([], _verb), do: []
 
+    defp returning({:unsafe_fragment, fragment}, _verb),
+      do: [" OUTPUT ", fragment]
+
     defp returning(returning, verb) when is_list(returning) do
       [" OUTPUT ", Enum.map_intersperse(returning, ", ", &[verb, ?., quote_name(&1)])]
     end

mix.lock

@@ -7,7 +7,7 @@
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.44", "f20830dd6b5c77afe2b063777ddbbff09f9759396500cdbe7523efd58d7a339c", [:mix], [], "hexpm", "4778ac752b4701a5599215f7030989c989ffdc4f6df457c5f36938cc2d2a2750"},
   "ecto": {:git, "https://github.com/elixir-ecto/ecto.git", "bf242348cdf89c056a977668da707b9937208efe", [branch: "master"]},
-  "ex_doc": {:hex, :ex_doc, "0.39.3", "519c6bc7e84a2918b737aec7ef48b96aa4698342927d080437f61395d361dcee", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "0590955cf7ad3b625780ee1c1ea627c28a78948c6c0a9b0322bd976a079996e1"},
+  "ex_doc": {:hex, :ex_doc, "0.40.1", "67542e4b6dde74811cfd580e2c0149b78010fd13001fda7cfeb2b2c2ffb1344d", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "bcef0e2d360d93ac19f01a85d58f91752d930c0a30e2681145feea6bd3516e00"},
   "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
   "makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"},
   "makeup_elixir": {:hex, :makeup_elixir, "1.0.1", "e928a4f984e795e41e3abd27bfc09f51db16ab8ba1aebdba2b3a575437efafc2", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "7284900d412a3e5cfd97fdaed4f5ed389b8f2b4cb49efc0eb3bd10e2febf9507"},

test/ecto/adapters/postgres_test.exs

@@ -1877,6 +1877,13 @@ defmodule Ecto.Adapters.PostgresTest do
 
     query = insert("prefix", "schema", [], [[]], {:raise, [], []}, [])
     assert query == ~s{INSERT INTO "prefix"."schema" VALUES (DEFAULT)}
+
+    # With unsafe_fragment in returning
+    fragment = ~s{"id", ("x" = "y") AS "was_equal"}
+    query = insert("prefix", "schema", [], [[]], {:raise, [], []}, {:unsafe_fragment, fragment})
+
+    assert query ==
+             ~s{INSERT INTO "prefix"."schema" VALUES (DEFAULT) RETURNING #{fragment}}
   end
 
   test "insert with on conflict" do