Support Elixir 1.18

elixir-ecto · Jan 10, 2025 · 1c1f61f · 1c1f61f
1 parent 9efff67
commit 1c1f61f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/test/ecto/query/builder_test.exs b/test/ecto/query/builder_test.exs
@@ -224,8 +224,8 @@ defmodule Ecto.Query.BuilderTest do
 
   test "escape parameterized types" do
     parameterized_type = Ecto.ParameterizedType.init(ParameterizedPrefixedString, prefix: "p")
-    assert {Macro.escape(quote do type(&0.y(), unquote(parameterized_type)) end), []} ==
-          escape(quote do type(field(x, :y), unquote(parameterized_type)) end, [x: 0], __ENV__)
+    assert {Macro.escape(quote do type(&0.y(), unquote(Macro.escape(parameterized_type))) end), []} ==
+          escape(quote do type(field(x, :y), unquote(Macro.escape(parameterized_type))) end, [x: 0], __ENV__)
   end
 
   defmacro wrapped_sum(a) do

diff --git a/test/ecto/query_test.exs b/test/ecto/query_test.exs
@@ -1069,7 +1069,7 @@ defmodule Ecto.QueryTest do
 
     test "casts queryable to query" do
       assert_raise Protocol.UndefinedError,
-                   ~r"protocol Ecto.Queryable not implemented for \[\]",
+                   ~r"protocol Ecto.Queryable not implemented for.* type List",
                    fn -> has_named_binding?([], :posts) end
     end
 
@@ -1144,7 +1144,7 @@ defmodule Ecto.QueryTest do
 
     test "casts queryable to query" do
       assert_raise Protocol.UndefinedError,
-                   ~r"protocol Ecto.Queryable not implemented for \[\]",
+                   ~r"protocol Ecto.Queryable not implemented for.* type List",
                    fn -> with_named_binding([], :posts, & &1) end
     end
   end

diff --git a/test/ecto/schema_test.exs b/test/ecto/schema_test.exs
@@ -260,7 +260,7 @@ defmodule Ecto.SchemaTest do
   end
 
   test "embedded schema does not have metadata" do
-    refute match?(%{__meta__: _}, %EmbeddedSchema{})
+    refute :__meta__ in Map.keys(%EmbeddedSchema{})
   end
 
   test "embedded redacted_fields" do

diff --git a/test/support/test_repo.exs b/test/support/test_repo.exs
@@ -99,7 +99,7 @@ defmodule Ecto.TestAdapter do
   def insert(_, %{context: nil, prefix: prefix} = meta, fields, on_conflict, returning, _opts) do
     meta = Map.merge(meta, %{fields: fields, on_conflict: on_conflict, returning: returning, prefix: prefix})
     send(self(), {:insert, meta})
-    {:ok, Enum.zip(returning, 1..length(returning))}
+    {:ok, Enum.zip(returning, 1..length(returning)//1)}
   end
 
   def insert(_, %{context: context}, _fields, _on_conflict, _returning, _opts) do
@@ -110,7 +110,7 @@ defmodule Ecto.TestAdapter do
   def update(_, %{context: nil} = meta, [_ | _] = changes, filters, returning, _opts) do
     meta = Map.merge(meta, %{changes: changes, filters: filters, returning: returning})
     send(self(), {:update, meta})
-    {:ok, Enum.zip(returning, 1..length(returning))}
+    {:ok, Enum.zip(returning, 1..length(returning)//1)}
   end
 
   def update(_, %{context: context}, [_ | _], _filters, _returning, _opts) do
@@ -120,7 +120,7 @@ defmodule Ecto.TestAdapter do
   def delete(_, %{context: nil} = meta, filters, returning, _opts) do
     meta = Map.merge(meta, %{filters: filters, returning: returning})
     send(self(), {:delete, meta})
-    {:ok, Enum.zip(returning, 1..length(returning))}
+    {:ok, Enum.zip(returning, 1..length(returning)//1)}
   end
 
   def delete(_, %{context: context}, _filters, _returning, _opts) do