Sfoglia il codice sorgente

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

Revert citext user URI migration

Closes #2188

See merge request pleroma/pleroma!3042
features/ap_c2s_proxyUrl
rinpatch 3 anni fa
parent
commit
30b79b0eb3
3 ha cambiato i file con 16 aggiunte e 15 eliminazioni
  1. +4
    -14
      priv/repo/migrations/20200925065249_make_user_ids_ci.exs
  2. +11
    -0
      priv/repo/migrations/20200928145912_revert_citext_change.exs
  3. +1
    -1
      test/user_search_test.exs

+ 4
- 14
priv/repo/migrations/20200925065249_make_user_ids_ci.exs Vedi File

@@ -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

+ 11
- 0
priv/repo/migrations/20200928145912_revert_citext_change.exs Vedi File

@@ -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

+ 1
- 1
test/user_search_test.exs Vedi File

@@ -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"})


Loading…
Annulla
Salva