hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix_flaky_test_user_relationship_test.exs_81' into 'develop'

Browse source 
fix flaky test_user_relationship_test.exs:81

See merge request pleroma/pleroma!3697
This commit is contained in:
tusooa 2022-08-24 15:24:07 +00:00
commit 59109f8f74
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/user_relationship.ex
View file

@ -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