Merge branch 'develop' into activation-meta

[akkoma] / priv / repo / optional_migrations / rum_indexing / 20190510135645_add_fts_index_to_objects_two.exs

diff --git a/priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs b/priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs
index 79bde163d286f575a92753856f7ae845f042514c..757afa129fb3ec7e5a83bd4fbc28cb786183abd5 100644 (file)
--- a/priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs
+++ b/priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs
@@ -2,29 +2,24 @@ defmodule Pleroma.Repo.Migrations.AddFtsIndexToObjectsTwo do
   use Ecto.Migration
 
   def up do
-    if Pleroma.Config.get([:database, :rum_enabled]) do
-      execute("create extension if not exists rum")
-      drop_if_exists index(:objects, ["(to_tsvector('english', data->>'content'))"], using: :gin, name: :objects_fts)
-      alter table(:objects) do
-        add(:fts_content, :tsvector)
-      end
+    execute("create extension if not exists rum")
+    drop_if_exists index(:objects, ["(to_tsvector('english', data->>'content'))"], using: :gin, name: :objects_fts)
+    alter table(:objects) do
+      add(:fts_content, :tsvector)
+    end
 
-      execute("CREATE FUNCTION objects_fts_update() RETURNS trigger AS $$
-      begin
-      new.fts_content := to_tsvector('english', new.data->>'content');
-      return new;
-      end
-      $$ LANGUAGE plpgsql")
-      execute("create index if not exists objects_fts on objects using RUM (fts_content rum_tsvector_addon_ops, inserted_at) with (attach = 'inserted_at', to = 'fts_content');")
+    execute("CREATE FUNCTION objects_fts_update() RETURNS trigger AS $$
+    begin
+    new.fts_content := to_tsvector('english', new.data->>'content');
+    return new;
+    end
+    $$ LANGUAGE plpgsql")
+    execute("create index if not exists objects_fts on objects using RUM (fts_content rum_tsvector_addon_ops, inserted_at) with (attach = 'inserted_at', to = 'fts_content');")
 
-      execute("CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE ON objects
-      FOR EACH ROW EXECUTE PROCEDURE objects_fts_update()")
+    execute("CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE ON objects
+    FOR EACH ROW EXECUTE PROCEDURE objects_fts_update()")
 
-      execute("UPDATE objects SET updated_at = NOW()")
-    else
-        raise Ecto.MigrationError,
-          message: "Migration is not allowed. You can change this behavior by setting `database/rum_enabled` to true."
-    end
+    execute("UPDATE objects SET updated_at = NOW()")
   end
 
   def down do