Merge branch 'fix/revert-citext-uri' into 'develop'

Revert citext user URI migration

Closes #2188

See merge request pleroma/pleroma!3042

3 files changed, 16 insertions, 15 deletions

diff --git a/priv/repo/migrations/20200925065249_make_user_ids_ci.exs b/priv/repo/migrations/20200925065249_make_user_ids_ci.exs
index b7305f137..8ea0f2cf1 100644
--- a/priv/repo/migrations/20200925065249_make_user_ids_ci.exs
+++ b/priv/repo/migrations/20200925065249_make_user_ids_ci.exs
@@ -1,19 +1,9 @@
 defmodule Pleroma.Repo.Migrations.MakeUserIdsCI do
   use Ecto.Migration
 
-  def up do
-    alter table(:users) do
-      modify(:uri, :citext)
-    end
-
-    create(unique_index(:users, :uri))
-  end
-
-  def don do
-    drop(unique_index(:users, :uri))
-
-    alter table(:users) do
-      modify(:uri, :text)
-    end
+  def change do
+    # Migration retired, see
+    # https://git.pleroma.social/pleroma/pleroma/-/issues/2188
+    :noop
   end
 end
diff --git a/priv/repo/migrations/20200928145912_revert_citext_change.exs b/priv/repo/migrations/20200928145912_revert_citext_change.exs
new file mode 100644
index 000000000..ab232f607
--- /dev/null
+++ b/priv/repo/migrations/20200928145912_revert_citext_change.exs
@@ -0,0 +1,11 @@
+defmodule Pleroma.Repo.Migrations.RevertCitextChange do
+  use Ecto.Migration
+
+  def change do
+    alter table(:users) do
+      modify(:uri, :text)
+    end
+
+    create_if_not_exists(unique_index(:users, :uri))
+  end
+end
diff --git a/test/user_search_test.exs b/test/user_search_test.exs
index b99a77b57..cc14e9741 100644
--- a/test/user_search_test.exs
+++ b/test/user_search_test.exs
@@ -41,7 +41,7 @@ defmodule Pleroma.UserSearchTest do
         insert(:user, %{
           nickname: "no_relation",
           ap_id: "https://lain.com/users/lain",
-          uri: "https://lain.com/@Lain"
+          uri: "https://lain.com/@lain"
         })
 
       _user = insert(:user, %{nickname: "com_user"})