Merge develop branch upstream

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

diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index 2136ddb0243a4d414066663ad0405cc3567694a8..57f73d12baa0bc70e6a11e243358a9c66aeec14e 100644 (file)
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -96,6 +96,15 @@ defmodule Mix.Tasks.Pleroma.Database do
     )
     |> Repo.delete_all(timeout: :infinity)
 
+    prune_hashtags_query = """
+    DELETE FROM hashtags AS ht
+    WHERE NOT EXISTS (
+      SELECT 1 FROM hashtags_objects hto
+      WHERE ht.id = hto.hashtag_id)
+    """
+
+    Repo.query(prune_hashtags_query)
+
     if Keyword.get(options, :vacuum) do
       Maintenance.vacuum("full")
     end
@@ -231,19 +240,18 @@ defmodule Mix.Tasks.Pleroma.Database do
           re = ~r/^#{version}_.*\.exs/
           path = Ecto.Migrator.migrations_path(repo)
 
-          with {:find, "" <> file} <- {:find, Enum.find(File.ls!(path), &String.match?(&1, re))},
-               {:compile, [{mod, _} | _]} <- {:compile, Code.compile_file(Path.join(path, file))},
-               {:rollback, :ok} <- {:rollback, Ecto.Migrator.down(repo, version, mod)} do
+          with {_, "" <> file} <- {:find, Enum.find(File.ls!(path), &String.match?(&1, re))},
+               {_, [{mod, _} | _]} <- {:compile, Code.compile_file(Path.join(path, file))},
+               {_, :ok} <- {:rollback, Ecto.Migrator.down(repo, version, mod)} do
             {:ok, "Reversed migration: #{file}"}
           else
             {:find, _} -> {:error, "No migration found with version prefix: #{version}"}
             {:compile, e} -> {:error, "Problem compiling migration module: #{inspect(e)}"}
             {:rollback, e} -> {:error, "Problem reversing migration: #{inspect(e)}"}
-            e -> {:error, "Something unexpected happened: #{inspect(e)}"}
           end
         end)
 
-      IO.inspect(result)
+      shell_info(inspect(result))
     end
   end
 end