From 81f58ad6fcb88fe4a92996aca90eb1a2dde0824a Mon Sep 17 00:00:00 2001 From: Jesse Williams Date: Mon, 22 Jun 2026 09:38:05 -0700 Subject: [PATCH] update ecto to 3.14.0 --- lib/ecto/adapters/clickhouse/connection.ex | 2 +- lib/ecto/adapters/clickhouse/queryable.ex | 2 +- lib/ecto/adapters/clickhouse/schema.ex | 2 +- mix.exs | 3 ++- mix.lock | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/ecto/adapters/clickhouse/connection.ex b/lib/ecto/adapters/clickhouse/connection.ex index 0c2894a..ca47f8d 100644 --- a/lib/ecto/adapters/clickhouse/connection.ex +++ b/lib/ecto/adapters/clickhouse/connection.ex @@ -216,7 +216,7 @@ defmodule Ecto.Adapters.ClickHouse.Connection do end @impl true - def insert(prefix, table, header, rows, _on_conflict, returning, _placeholders) do + def insert(prefix, table, header, rows, _on_conflict, returning, _placeholders, _opts) do unless returning == [] do raise ArgumentError, "ClickHouse does not support RETURNING on INSERT statements" end diff --git a/lib/ecto/adapters/clickhouse/queryable.ex b/lib/ecto/adapters/clickhouse/queryable.ex index 13024cb..f504224 100644 --- a/lib/ecto/adapters/clickhouse/queryable.ex +++ b/lib/ecto/adapters/clickhouse/queryable.ex @@ -24,7 +24,7 @@ defmodule Ecto.Adapters.ClickHouse.Queryable do query = Ecto.Query.Planner.attach_prefix(query, opts) {query_meta, {:nocache, {:update_all, query}}, cast_params, dump_params} = - Ecto.Query.Planner.query(query, :update_all, cache, adapter, 0) + Ecto.Query.Planner.query(query, :update_all, cache, adapter, 0, false) %{select: nil} = query_meta opts = [cast_params: cast_params] ++ opts diff --git a/lib/ecto/adapters/clickhouse/schema.ex b/lib/ecto/adapters/clickhouse/schema.ex index 2eb8783..16e3c97 100644 --- a/lib/ecto/adapters/clickhouse/schema.ex +++ b/lib/ecto/adapters/clickhouse/schema.ex @@ -23,7 +23,7 @@ defmodule Ecto.Adapters.ClickHouse.Schema do %{num_rows: num_rows} = case rows do {%Ecto.Query{} = _query, params} -> - sql = @conn.insert(prefix, source, header, rows, on_conflict, returning, placeholders) + sql = @conn.insert(prefix, source, header, rows, on_conflict, returning, placeholders, opts) Ecto.Adapters.SQL.query!(adapter_meta, sql, params, opts) rows when is_list(rows) -> diff --git a/mix.exs b/mix.exs index f254dc5..771e3a9 100644 --- a/mix.exs +++ b/mix.exs @@ -54,7 +54,8 @@ defmodule EctoCh.MixProject do defp deps do [ {:ch, "~> 0.8.2"}, - {:ecto_sql, "~> 3.13.0"}, + {:ecto, "~> 3.14", override: true}, + {:ecto_sql, "~> 3.14"}, {:benchee, "~> 1.1", only: :bench}, {:dialyxir, "~> 1.2", only: [:dev, :test], runtime: false}, {:ex_doc, ">= 0.0.0", only: :docs}, diff --git a/mix.lock b/mix.lock index 53bfadd..ad87fba 100644 --- a/mix.lock +++ b/mix.lock @@ -6,8 +6,8 @@ "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"}, "dialyxir": {:hex, :dialyxir, "1.4.7", "dda948fcee52962e4b6c5b4b16b2d8fa7d50d8645bbae8b8685c3f9ecb7f5f4d", [:mix], [{:erlex, ">= 0.2.8", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "b34527202e6eb8cee198efec110996c25c5898f43a4094df157f8d28f27d9efe"}, "earmark_parser": {:hex, :earmark_parser, "1.4.44", "f20830dd6b5c77afe2b063777ddbbff09f9759396500cdbe7523efd58d7a339c", [:mix], [], "hexpm", "4778ac752b4701a5599215f7030989c989ffdc4f6df457c5f36938cc2d2a2750"}, - "ecto": {:hex, :ecto, "3.13.6", "352135b474f91d1ab99a1b502171d207e9db60421c9e3d0ecab4c7ab96b24d14", [:mix], [{:decimal, "~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8afa059bc16cd2c94739ec0a11e3e5df69d828125119109bef35f20a21a76af2"}, - "ecto_sql": {:hex, :ecto_sql, "3.13.5", "2f8282b2ad97bf0f0d3217ea0a6fff320ead9e2f8770f810141189d182dc304e", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "aa36751f4e6a2b56ae79efb0e088042e010ff4935fc8684e74c23b1f49e25fdc"}, + "ecto": {:hex, :ecto, "3.14.0", "2fa64521eebfcb2670d907a86e4ad947290e9933706bb315e6fb5c21b172cb26", [:mix], [{:decimal, "~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "130d69ffb4285f9ce4792b65dfbb994fd13ea4cbc3cbea2524b199aa3de84af3"}, + "ecto_sql": {:hex, :ecto_sql, "3.14.0", "06446ab8410d2f85bfbb80857ee224ab3b693700cbb38f6535d507449a627b2e", [:mix], [{:db_connection, "~> 2.9", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.14.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.8", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f4d8d36faf294c9417b5a37ec7ac8217ee2abdef5fcf197ba690f361548d3949"}, "erlex": {:hex, :erlex, "0.2.9", "7debbbaa9f4f368b8cd648983e0f1d7963028508e9c59e9d4ed504e94ef52a55", [:mix], [], "hexpm", "8cfffc0ec7159e6d73de2ab28a588064de80f88b2798d5cbe4482cbbc200178b"}, "ex_doc": {:hex, :ex_doc, "0.40.3", "4a972ffe64bc07dc605af487e98fc19b72a4185f55ca031b94c0552d6071c1d9", [: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", "2756e357742fecd9749b489b85d67c9ce99c465f2e75728d9e6dc8d704b973de"}, "excoveralls": {:hex, :excoveralls, "0.18.5", "e229d0a65982613332ec30f07940038fe451a2e5b29bce2a5022165f0c9b157e", [:mix], [{:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "523fe8a15603f86d64852aab2abe8ddbd78e68579c8525ae765facc5eae01562"},