Skip to content
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

Jump to bottom

lib/ecto/adapters/myxql/connection.ex: refactored improper lists #587

Closed
wants to merge 5 commits into from
Closed

lib/ecto/adapters/myxql/connection.ex: refactored improper lists #587

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab76d6f
refactor to map_join
bradhanks Jan 8, 2024
57f8bbb
map_intersperse
bradhanks Jan 10, 2024
1045aef
Merge branch 'elixir-ecto:master' into master
bradhanks Jan 10, 2024
a1bbc69
Merge branch 'master' of https://github.com/elixir-ecto/ecto_sql
bradhanks Jan 10, 2024
366bb12
refactored 9 improper lists by wrapping the last element in a list: s…
bradhanks Jan 12, 2024
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
20 changes: 10 additions & 10 deletions lib/ecto/adapters/myxql/connection.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ if Code.ensure_loaded?(MyXQL) do

case dir do
:asc -> str
:desc -> [str | " DESC"]
:desc -> [str | [" DESC"]]
_ -> error!(query, "#{dir} is not supported in ORDER BY in MySQL")
end
end
Expand Down Expand Up @@ -593,7 +593,7 @@ if Code.ensure_loaded?(MyXQL) do
end

defp lock(%{lock: nil}, _sources), do: []
defp lock(%{lock: binary}, _sources) when is_binary(binary), do: [?\s | binary]
defp lock(%{lock: binary}, _sources) when is_binary(binary), do: [?\s | [binary]]
defp lock(%{lock: expr} = query, sources), do: [?\s | expr(expr, sources, query)]

defp boolean(_name, [], _sources, _query), do: []
Expand Down Expand Up @@ -676,7 +676,7 @@ if Code.ensure_loaded?(MyXQL) do
end

defp expr({:is_nil, _, [arg]}, sources, query) do
[expr(arg, sources, query) | " IS NULL"]
[expr(arg, sources, query) | [" IS NULL"]]
end

defp expr({:not, _, [expr]}, sources, query) do
Expand Down Expand Up @@ -731,7 +731,7 @@ if Code.ensure_loaded?(MyXQL) do
"date_add(",
expr(datetime, sources, query),
", ",
interval(count, interval, sources, query) | ")"
interval(count, interval, sources, query) | [")"]
]
end

Expand All @@ -740,7 +740,7 @@ if Code.ensure_loaded?(MyXQL) do
"CAST(date_add(",
expr(date, sources, query),
", ",
interval(count, interval, sources, query) | ") AS date)"
interval(count, interval, sources, query) | [") AS date)"]
]
end

Expand Down Expand Up @@ -860,7 +860,7 @@ if Code.ensure_loaded?(MyXQL) do
end

defp interval(count, "millisecond", sources, query) do
["INTERVAL (", expr(count, sources, query) | " * 1000) microsecond"]
["INTERVAL (", expr(count, sources, query) | [" * 1000) microsecond"]]
end

defp interval(count, interval, sources, query) do
Expand Down Expand Up @@ -895,17 +895,17 @@ if Code.ensure_loaded?(MyXQL) do
defp create_name(sources, pos, as_prefix) do
case elem(sources, pos) do
{:fragment, _, _} ->
{nil, as_prefix ++ [?f | Integer.to_string(pos)], nil}
{nil, as_prefix ++ [?f | [Integer.to_string(pos)]], nil}

{:values, _, _} ->
{nil, as_prefix ++ [?v | Integer.to_string(pos)], nil}
{nil, as_prefix ++ [?v | [Integer.to_string(pos)]], nil}

{table, schema, prefix} ->
name = as_prefix ++ [create_alias(table) | Integer.to_string(pos)]
name = as_prefix ++ [create_alias(table) | [Integer.to_string(pos)]]
{quote_table(prefix, table), name, schema}

%Ecto.SubQuery{} ->
{nil, as_prefix ++ [?s | Integer.to_string(pos)], nil}
{nil, as_prefix ++ [?s | [Integer.to_string(pos)]], nil}
end
end

Expand Down