Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop

2 files changed, 15 insertions, 0 deletions

diff --git a/priv/repo/migrations/20170620133028_add_object_activity_index.exs b/priv/repo/migrations/20170620133028_add_object_activity_index.exs
new file mode 100644
index 000000000..1abbd7802
--- /dev/null
+++ b/priv/repo/migrations/20170620133028_add_object_activity_index.exs
@@ -0,0 +1,7 @@
+defmodule Pleroma.Repo.Migrations.AddObjectActivityIndex do
+  use Ecto.Migration
+
+  def change do
+    create index(:objects, ["(data->'object'->>'id')", "(data->>'type')"], name: :activities_create_objects_index)
+  end
+end
diff --git a/priv/repo/migrations/20170620142420_add_object_activity_index_part_two.exs b/priv/repo/migrations/20170620142420_add_object_activity_index_part_two.exs
new file mode 100644
index 000000000..705a05f82
--- /dev/null
+++ b/priv/repo/migrations/20170620142420_add_object_activity_index_part_two.exs
@@ -0,0 +1,8 @@
+defmodule Pleroma.Repo.Migrations.AddObjectActivityIndexPartTwo do
+  use Ecto.Migration
+
+  def change do
+    drop index(:objects, ["(data->'object'->>'id')", "(data->>'type')"], name: :activities_create_objects_index)
+    create index(:activities, ["(data->'object'->>'id')", "(data->>'type')"], name: :activities_create_objects_index)
+  end
+end