Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions lib/ecto/adapters/postgres/connection.ex
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ if Code.ensure_loaded?(Postgrex) do
quote_name(prefix, table),
insert_as(on_conflict),
values,
on_conflict(on_conflict, header) | returning(returning)
on_conflict(on_conflict) | returning(returning)
]
end

Expand All @@ -259,16 +259,16 @@ if Code.ensure_loaded?(Postgrex) do
[]
end

defp on_conflict({:raise, _, []}, _header),
defp on_conflict({:raise, _, []}),
do: []

defp on_conflict({:nothing, _, targets}, _header),
defp on_conflict({:nothing, _, targets}),
do: [" ON CONFLICT ", conflict_target(targets) | "DO NOTHING"]

defp on_conflict({fields, _, targets}, _header) when is_list(fields),
defp on_conflict({fields, _, targets}) when is_list(fields),
do: [" ON CONFLICT ", conflict_target!(targets), "DO " | replace(fields)]

defp on_conflict({query, _, targets}, _header),
defp on_conflict({query, _, targets}),
do: [" ON CONFLICT ", conflict_target!(targets), "DO " | update_all(query, "UPDATE SET ")]

defp conflict_target!([]),
Expand Down
Loading