diff options
| author | tusooa <tusooa@kazv.moe> | 2022-08-24 15:24:07 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-08-24 15:24:07 +0000 |
| commit | 59109f8f740939569968d470bfc7d4edd31706fa (patch) | |
| tree | 58bc31c2ac7a9c9ef3dd7f074fb7febb0624ab4e /lib/pleroma | |
| parent | 85c1e1ff4dafa6cd396ded55e3484ad059a71576 (diff) | |
| parent | 47e3a72b6ecff3fcc9eedf0dc23bffef5f8c9060 (diff) | |
| download | pleroma-59109f8f740939569968d470bfc7d4edd31706fa.tar.gz | |
Merge branch 'fix_flaky_test_user_relationship_test.exs_81' into 'develop'
fix flaky test_user_relationship_test.exs:81
See merge request pleroma/pleroma!3697
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 |