summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2022-01-09 16:29:56 -0600
committerAlex Gleason <alex@alexgleason.me>2022-01-09 16:29:56 -0600
commit0b67c794b287265326c676a5c283c4e0f6ec6d11 (patch)
tree193ec2486488b792b266be9b1ca7829a2c86a72b
parentfaadb2f325e9912da0cb1f15e98fbc67cd9079a7 (diff)
CombineActivitiesAndObjects: add back "ON CONFLICT DO NOTHING"
-rw-r--r--priv/repo/migrations/20211218181647_combine_activities_and_objects.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/repo/migrations/20211218181647_combine_activities_and_objects.exs b/priv/repo/migrations/20211218181647_combine_activities_and_objects.exs
index 92ede0934..7fabf72f3 100644
--- a/priv/repo/migrations/20211218181647_combine_activities_and_objects.exs
+++ b/priv/repo/migrations/20211218181647_combine_activities_and_objects.exs
@@ -44,7 +44,7 @@ defmodule Pleroma.Repo.Migrations.CombineActivitiesAndObjects do
# Copy all activities into the newly formatted objects table
execute(
- "INSERT INTO objects (id, data, local, actor, recipients, inserted_at, updated_at) SELECT id, data, local, actor, recipients, inserted_at, updated_at FROM activities"
+ "INSERT INTO objects (id, data, local, actor, recipients, inserted_at, updated_at) SELECT id, data, local, actor, recipients, inserted_at, updated_at FROM activities ON CONFLICT DO NOTHING"
)
# Update notifications foreign key