diff options
| author | Ilja <672-ilja@users.noreply.git.pleroma.social> | 2022-08-24 15:24:07 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-08-24 15:24:07 +0000 |
| commit | 47e3a72b6ecff3fcc9eedf0dc23bffef5f8c9060 (patch) | |
| tree | 3dc345e0a894af732cb5268fee3bb55d080404e3 /lib/pleroma | |
| parent | 0814d0e0cb11ef82809babe34e4842f6c5676d70 (diff) | |
| download | pleroma-47e3a72b6ecff3fcc9eedf0dc23bffef5f8c9060.tar.gz | |
fix flaky test_user_relationship_test.exs:81
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/user_relationship.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/user_relationship.ex b/lib/pleroma/user_relationship.ex index 5b3e593d3..fbecf3129 100644 --- a/lib/pleroma/user_relationship.ex +++ b/lib/pleroma/user_relationship.ex @@ -91,8 +91,9 @@ defmodule Pleroma.UserRelationship do expires_at: expires_at }) |> Repo.insert( - on_conflict: {:replace_all_except, [:id]}, - conflict_target: [:source_id, :relationship_type, :target_id] + on_conflict: {:replace_all_except, [:id, :inserted_at]}, + conflict_target: [:source_id, :relationship_type, :target_id], + returning: true ) end |