Merge branch 'feature/federator-behaviours' into 'develop'

[akkoma] / lib / mix / tasks / pleroma / database.ex

diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index ce3252af5bfef05b7923b98704a210542177e5ab..ab9a3a7ff95eb9d43ff357ae2c64c538a4de1abe 100644 (file)
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -4,6 +4,7 @@
 
 defmodule Mix.Tasks.Pleroma.Database do
   alias Mix.Tasks.Pleroma.Common
+  require Logger
   use Mix.Task
 
   @shortdoc "A collection of database related tasks"
@@ -29,16 +30,21 @@ defmodule Mix.Tasks.Pleroma.Database do
       )
 
     Common.start_pleroma()
+    Logger.info("Removing embedded objects")
 
-    Ecto.Adapters.SQL.query!(
-      Pleroma.Repo,
-      "update activities set data = jsonb_set(data, '{object}'::text[], data->'object'->'id') where data->'object'->>'id' is not null;"
+    Pleroma.Repo.query!(
+      "update activities set data = jsonb_set(data, '{object}'::text[], data->'object'->'id') where data->'object'->>'id' is not null;",
+      [],
+      timeout: :infinity
     )
 
     if Keyword.get(options, :vacuum) do
-      Ecto.Adapters.SQL.query!(
-        Pleroma.Repo,
-        "vacuum full;"
+      Logger.info("Runnning VACUUM FULL")
+
+      Pleroma.Repo.query!(
+        "vacuum full;",
+        [],
+        timeout: :infinity
       )
     end
   end