logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 30b79b0eb3379db5d5e82ce8c6ecbc00013eb69c
parent: 35157f5dc845483e9d65236b87461f15c77ad634
Author: rinpatch <rinpatch@sdf.org>
Date:   Mon, 28 Sep 2020 15:44:20 +0000

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

Revert citext user URI migration

Closes #2188

See merge request pleroma/pleroma!3042

Diffstat:

Mpriv/repo/migrations/20200925065249_make_user_ids_ci.exs18++++--------------
Apriv/repo/migrations/20200928145912_revert_citext_change.exs11+++++++++++
Mtest/user_search_test.exs2+-
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 @@ -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 @@ -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 @@ -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"})