diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 10:43:47 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 10:43:47 +0300 |
| commit | 02c3dd2e3d52a636c0fa13e8791da5d3cfe18707 (patch) | |
| tree | b393fb557f20f051c296f74f92bb5ca284203da3 /lib | |
| parent | b12f3064730648de992f934cf5a23cadb5206b9d (diff) | |
| download | pleroma-02c3dd2e3d52a636c0fa13e8791da5d3cfe18707.tar.gz pleroma-02c3dd2e3d52a636c0fa13e8791da5d3cfe18707.zip | |
update ecto
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/user_relationship.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 3899c34c2..3c86cdb38 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1512,7 +1512,7 @@ defmodule Pleroma.User do data |> Map.put(:name, blank?(data[:name]) || data[:nickname]) |> remote_user_creation() - |> Repo.insert(on_conflict: :replace_all_except_primary_key, conflict_target: :nickname) + |> Repo.insert(on_conflict: {:replace_all_except, [:id]}, conflict_target: :nickname) |> set_cache() end diff --git a/lib/pleroma/user_relationship.ex b/lib/pleroma/user_relationship.ex index 24c724549..3149e10e9 100644 --- a/lib/pleroma/user_relationship.ex +++ b/lib/pleroma/user_relationship.ex @@ -58,7 +58,7 @@ defmodule Pleroma.UserRelationship do target_id: target.id }) |> Repo.insert( - on_conflict: :replace_all_except_primary_key, + on_conflict: {:replace_all_except, [:id]}, conflict_target: [:source_id, :relationship_type, :target_id] ) end |