Resolve merge conflicts and remove IO.inspects

[akkoma] / priv / repo / migrations / 20170501133231_add_id_contraints_to_activities_and_objects_part_two.exs

diff --git a/priv/repo/migrations/20170501133231_add_id_contraints_to_activities_and_objects_part_two.exs b/priv/repo/migrations/20170501133231_add_id_contraints_to_activities_and_objects_part_two.exs
index 12eea136923b23924d34a5548e1fb34fc3b9fd78..1472b60b4cd8a369e3083e834d297918716677ae 100644 (file)
--- a/priv/repo/migrations/20170501133231_add_id_contraints_to_activities_and_objects_part_two.exs
+++ b/priv/repo/migrations/20170501133231_add_id_contraints_to_activities_and_objects_part_two.exs
@@ -2,8 +2,8 @@ defmodule Pleroma.Repo.Migrations.AddIdContraintsToActivitiesAndObjectsPartTwo d
   use Ecto.Migration
 
   def change do
-    drop index(:objects, ["(data->>\"id\")"], name: :objects_unique_apid_index)
-    drop index(:activities, ["(data->>\"id\")"], name: :activities_unique_apid_index)
+    drop_if_exists index(:objects, ["(data->>\"id\")"], name: :objects_unique_apid_index)
+    drop_if_exists index(:activities, ["(data->>\"id\")"], name: :activities_unique_apid_index)
     create unique_index(:objects, ["(data->>'id')"], name: :objects_unique_apid_index)
     create unique_index(:activities, ["(data->>'id')"], name: :activities_unique_apid_index)
   end