Skip to content

Typespec fixes #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josevalim merged 3 commits into from
Aug 23, 2021
Merged

Typespec fixes #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7331314
Fix Mix.EctoSQL.ensure_migrations_path/2 spec
michallepicki Aug 23, 2021
4145d1c
Fix Ecto.Adapters.SQL.format_table/1 spec
michallepicki Aug 23, 2021
4e7fda0
Loosen Ecto.Adapters.SQL.query spec
michallepicki Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/ecto/adapters/sql.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ defmodule Ecto.Adapters.SQL do
@doc """
Same as `query/4` but raises on invalid queries.
"""
@spec query!(Ecto.Repo.t | Ecto.Adapter.adapter_meta, String.t, [term], Keyword.t) ::
@spec query!(Ecto.Repo.t | Ecto.Adapter.adapter_meta, iodata, [term], Keyword.t) ::
%{:rows => nil | [[term] | binary],
:num_rows => non_neg_integer,
optional(atom) => any}
Expand Down Expand Up @@ -398,7 +398,7 @@ defmodule Ecto.Adapters.SQL do
{:ok, %{rows: [[42]], num_rows: 1}}

"""
@spec query(pid() | Ecto.Repo.t | Ecto.Adapter.adapter_meta, String.t, [term], Keyword.t) ::
@spec query(pid() | Ecto.Repo.t | Ecto.Adapter.adapter_meta, iodata, [term], Keyword.t) ::
{:ok, %{:rows => nil | [[term] | binary],
:num_rows => non_neg_integer,
optional(atom) => any}}
Expand Down Expand Up @@ -454,7 +454,7 @@ defmodule Ecto.Adapters.SQL do
# | My Post Title | 1 | NULL |
# +---------------+---------+--------+
@doc false
@spec format_table(%{columns: [String.t] | nil, rows: [term()] | nil}) :: String.t
@spec format_table(%{:columns => [String.t] | nil, :rows => [term()] | nil, optional(atom) => any()}) :: String.t
def format_table(result)

def format_table(nil), do: ""
Expand Down
2 changes: 1 addition & 1 deletion lib/mix/ecto_sql.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Mix.EctoSQL do
@doc """
Ensures the given repository's migrations paths exists on the file system.
"""
@spec ensure_migrations_paths(Ecto.Repo.t, Keyword.t) :: String.t
@spec ensure_migrations_paths(Ecto.Repo.t, Keyword.t) :: [String.t]
def ensure_migrations_paths(repo, opts) do
paths = Keyword.get_values(opts, :migrations_path)
paths = if paths == [], do: [Path.join(source_repo_priv(repo), "migrations")], else: paths
Expand Down