Skip to content

Commit 8760894

Browse files
authored
Fix Join.escape/3 and quoted_type specs (#4804)
1 parent 6e34e6f commit 8760894

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

‎lib/ecto/query/builder.ex‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ defmodule Ecto.Query.Builder do
5252
which include all primitive types and custom user types. Also
5353
note custom user types do not show up during compilation time.
5454
"""
55-
@type quoted_type :: Ecto.Type.primitive() | {non_neg_integer, atom | Macro.t()}
55+
@type quoted_type ::
56+
Ecto.Type.primitive()
57+
| :atom
58+
| {:tuple, [quoted_type]}
59+
| {non_neg_integer, atom | Macro.t()}
5660

5761
@typedoc """
5862
The accumulator during escape.

‎lib/ecto/query/builder/join.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ defmodule Ecto.Query.Builder.Join do
4343
4444
"""
4545
@spec escape(Macro.t(), Keyword.t(), Macro.Env.t()) ::
46-
{atom, Macro.t() | nil, Macro.t() | nil, list}
46+
{atom, Macro.t() | nil, Macro.t() | nil, Macro.t() | nil, list}
4747
def escape({:in, _, [{var, _, context}, expr]}, vars, env)
4848
when is_atom(var) and is_atom(context) do
4949
{_, expr, assoc, prelude, params} = escape(expr, vars, env)

0 commit comments

Comments
 (0)