Merge branch 'develop' into feature/account-export

2 files changed, 34 insertions, 0 deletions

diff --git a/priv/repo/migrations/20200919182636_remoteip_plug_rename.exs b/priv/repo/migrations/20200919182636_remoteip_plug_rename.exs
new file mode 100644
index 000000000..77c3b6db1
--- /dev/null
+++ b/priv/repo/migrations/20200919182636_remoteip_plug_rename.exs
@@ -0,0 +1,19 @@
+defmodule Pleroma.Repo.Migrations.RemoteipPlugRename do
+  use Ecto.Migration
+
+  import Ecto.Query
+
+  def up do
+    config =
+      from(c in Pleroma.ConfigDB, where: c.group == ^:pleroma and c.key == ^Pleroma.Plugs.RemoteIp)
+      |> Pleroma.Repo.one()
+
+    if config do
+      config
+      |> Ecto.Changeset.change(key: Pleroma.Web.Plugs.RemoteIp)
+      |> Pleroma.Repo.update()
+    end
+  end
+
+  def down, do: :ok
+end
diff --git a/priv/repo/migrations/20201013141127_refactor_locked_user_field.exs b/priv/repo/migrations/20201013141127_refactor_locked_user_field.exs
new file mode 100644
index 000000000..6cd23dbac
--- /dev/null
+++ b/priv/repo/migrations/20201013141127_refactor_locked_user_field.exs
@@ -0,0 +1,15 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Repo.Migrations.RefactorLockedUserField do
+  use Ecto.Migration
+
+  def up do
+    execute("ALTER TABLE users RENAME COLUMN locked TO is_locked;")
+  end
+
+  def down do
+    execute("ALTER TABLE users RENAME COLUMN is_locked TO locked;")
+  end
+end