Raise if conflict_target it not set on upsert for PG

Author: josevalim

lib/ecto/adapters/myxql/connection.ex

@@ -153,7 +153,7 @@ if Code.ensure_loaded?(MyXQL) do
     end
 
     defp on_conflict({_, _, [_ | _]}, _header) do
-      error!(nil, "The :conflict_target option is not supported in insert/insert_all by MySQL")
+      error!(nil, ":conflict_target is not supported in insert/insert_all by MySQL")
     end
     defp on_conflict({:raise, _, []}, _header) do
       []

lib/ecto/adapters/postgres/connection.ex

@@ -178,9 +178,14 @@ if Code.ensure_loaded?(Postgrex) do
     defp on_conflict({:nothing, _, targets}, _header),
       do: [" ON CONFLICT ", conflict_target(targets) | "DO NOTHING"]
     defp on_conflict({fields, _, targets}, _header) when is_list(fields),
-      do: [" ON CONFLICT ", conflict_target(targets), "DO " | replace(fields)]
+      do: [" ON CONFLICT ", conflict_target!(targets), "DO " | replace(fields)]
     defp on_conflict({query, _, targets}, _header),
-      do: [" ON CONFLICT ", conflict_target(targets), "DO " | update_all(query, "UPDATE SET ")]
+      do: [" ON CONFLICT ", conflict_target!(targets), "DO " | update_all(query, "UPDATE SET ")]
+
+    defp conflict_target!([]),
+      do: error!(nil, "the :conflict_target option is required on upserts by PostgreSQL")
+    defp conflict_target!(target),
+      do: conflict_target(target)
 
     defp conflict_target({:constraint, constraint}),
       do: ["ON CONSTRAINT ", quote_name(constraint), ?\s]

test/ecto/adapters/myxql_test.exs

@@ -958,7 +958,7 @@ defmodule Ecto.Adapters.MyXQLTest do
     query = insert(nil, "schema", [:x, :y], [[:x, :y]], {[:x, :y], [], []}, [])
     assert query == ~s{INSERT INTO `schema` (`x`,`y`) VALUES (?,?) ON DUPLICATE KEY UPDATE `x` = VALUES(`x`),`y` = VALUES(`y`)}
 
-    assert_raise ArgumentError, "The :conflict_target option is not supported in insert/insert_all by MySQL", fn ->
+    assert_raise ArgumentError, ":conflict_target is not supported in insert/insert_all by MySQL", fn ->
       insert(nil, "schema", [:x, :y], [[:x, :y]], {[:x, :y], [], [:x]}, [])
     end
 

test/ecto/adapters/postgres_test.exs

@@ -1142,14 +1142,15 @@ defmodule Ecto.Adapters.PostgresTest do
     query = insert(nil, "schema", [:x, :y], [[:x, :y]], {[:x, :y], [], [:id]}, [])
     assert query == ~s{INSERT INTO "schema" ("x","y") VALUES ($1,$2) ON CONFLICT ("id") DO UPDATE SET "x" = EXCLUDED."x","y" = EXCLUDED."y"}
 
-    query = insert(nil, "schema", [:x, :y], [[:x, :y]], {[:x, :y], [], []}, [])
-    assert query == ~s{INSERT INTO "schema" ("x","y") VALUES ($1,$2) ON CONFLICT DO UPDATE SET "x" = EXCLUDED."x","y" = EXCLUDED."y"}
-
     query = insert(nil, "schema", [:x, :y], [[:x, :y]], {[:x, :y], [], {:constraint, :foo}}, [])
     assert query == ~s{INSERT INTO "schema" ("x","y") VALUES ($1,$2) ON CONFLICT ON CONSTRAINT \"foo\" DO UPDATE SET "x" = EXCLUDED."x","y" = EXCLUDED."y"}
 
     query = insert(nil, "schema", [:x, :y], [[:x, :y]], {[:x, :y], [], {:unsafe_fragment, "(\"id\")"}}, [])
     assert query == ~s{INSERT INTO "schema" ("x","y") VALUES ($1,$2) ON CONFLICT (\"id\") DO UPDATE SET "x" = EXCLUDED."x","y" = EXCLUDED."y"}
+
+    assert_raise ArgumentError, "the :conflict_target option is required on upserts by PostgreSQL", fn ->
+      insert(nil, "schema", [:x, :y], [[:x, :y]], {[:x, :y], [], []}, [])
+    end
   end
 
   test "insert with query" do