[#3213] Explicitly defined PKs in hashtags_objects and data_migration_failed_ids...

diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index 4ddace9c97f58a0006435ff504903f3e3bcdc348..30c0d2bf17c467d6f561a3bc46873ae039cd08e0 100644 (file)
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -20,6 +20,30 @@ defmodule Mix.Tasks.Pleroma.Database do
   @shortdoc "A collection of database related tasks"
   @moduledoc File.read!("docs/administration/CLI_tasks/database.md")
 
+  # Rolls back a specific migration (leaving subsequent migrations applied)
+  # Based on https://stackoverflow.com/a/53825840
+  def run(["rollback", version]) do
+    start_pleroma()
+
+    version = String.to_integer(version)
+    re = ~r/^#{version}_.*\.exs/
+    path = Application.app_dir(:pleroma, Path.join(["priv", "repo", "migrations"]))
+
+    result =
+      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
+        {: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
+
+    IO.inspect(result)
+  end
+
   def run(["remove_embedded_objects" | args]) do
     {options, [], []} =
       OptionParser.parse(

diff --git a/priv/repo/migrations/20201221203824_create_hashtags_objects.exs b/priv/repo/migrations/20201221203824_create_hashtags_objects.exs
index 214ea81c335dfb042726ed540bf24d4f08587058..efd60369d70a5ff918ccb99631f22fd6c8cf5d32 100644 (file)
--- a/priv/repo/migrations/20201221203824_create_hashtags_objects.exs
+++ b/priv/repo/migrations/20201221203824_create_hashtags_objects.exs
@@ -3,8 +3,8 @@ defmodule Pleroma.Repo.Migrations.CreateHashtagsObjects do
 
   def change do
     create_if_not_exists table(:hashtags_objects, primary_key: false) do
-      add(:hashtag_id, references(:hashtags), null: false)
-      add(:object_id, references(:objects), null: false)
+      add(:hashtag_id, references(:hashtags), null: false, primary_key: true)
+      add(:object_id, references(:objects), null: false, primary_key: true)
     end
 
     create_if_not_exists(unique_index(:hashtags_objects, [:hashtag_id, :object_id]))

diff --git a/priv/repo/migrations/20210106183301_data_migration_create_populate_hashtags_table.exs b/priv/repo/migrations/20210106183301_data_migration_create_populate_hashtags_table.exs
index 2a965f0758ab84b6de6474056d64e4674b02a0e6..cf3cf26a0f94fc9bcf7b518c814acd1cfbecb3b0 100644 (file)
--- a/priv/repo/migrations/20210106183301_data_migration_create_populate_hashtags_table.exs
+++ b/priv/repo/migrations/20210106183301_data_migration_create_populate_hashtags_table.exs
@@ -10,5 +10,7 @@ defmodule Pleroma.Repo.Migrations.DataMigrationCreatePopulateHashtagsTable do
     )
   end
 
-  def down, do: :ok
+  def down do
+    execute("DELETE FROM data_migrations WHERE name = 'populate_hashtags_table';")
+  end
 end

diff --git a/priv/repo/migrations/20210111172254_create_data_migration_failed_ids.exs b/priv/repo/migrations/20210111172254_create_data_migration_failed_ids.exs
index ba0be98af6212c17408ac7a562e8a6118e26ecae..18afa74acfc31ac4f37983955cd9f02b7bdb2023 100644 (file)
--- a/priv/repo/migrations/20210111172254_create_data_migration_failed_ids.exs
+++ b/priv/repo/migrations/20210111172254_create_data_migration_failed_ids.exs
@@ -3,8 +3,8 @@ defmodule Pleroma.Repo.Migrations.CreateDataMigrationFailedIds do
 
   def change do
     create_if_not_exists table(:data_migration_failed_ids, primary_key: false) do
-      add(:data_migration_id, references(:data_migrations), null: false)
-      add(:record_id, :bigint, null: false)
+      add(:data_migration_id, references(:data_migrations), null: false, primary_key: true)
+      add(:record_id, :bigint, null: false, primary_key: true)
     end
 
     create_if_not_exists(