Skip to content

Commit 7ffcb50

Browse files
author
Leo B
committed
Fix all tests 🎉
1 parent d1161fa commit 7ffcb50

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

lib/ecto/association.ex

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,9 @@ defmodule Ecto.Association do
249249
values = List.wrap(values)
250250

251251
query = case {join_to, dest_out_key, values} do
252+
{nil, single_key, [single_value]} when is_atom(single_key) and not is_list(single_value) ->
253+
query
254+
|> where([{dest, final_bind}], field(dest, ^single_key) == ^single_value)
252255
{nil, [single_key], [single_value]} ->
253256
query
254257
|> where([{dest, final_bind}], field(dest, ^single_key) == ^single_value)

lib/ecto/changeset.ex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3792,7 +3792,8 @@ defmodule Ecto.Changeset do
37923792
|> merge_related_keys(changes, types, msg_func, &traverse_validations/2)
37933793
end
37943794

3795-
defp atom_concat(atoms) do
3795+
defp atom_concat(atom) when is_atom(atom), do: Atom.to_string(atom)
3796+
defp atom_concat(atoms) when is_list(atoms) do
37963797
atoms
37973798
|> Enum.map(&Atom.to_string/1)
37983799
|> Enum.join("_")

0 commit comments

Comments
 (0)