diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-09 21:52:00 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-05-09 21:52:00 +0000 |
| commit | b3e6953d23250393010adb01fc604f97fd17eb96 (patch) | |
| tree | 79f917be3ba27de80e752db6ec3f6fdb8802f0ff | |
| parent | d73e8b6b1262d12ec27c4478ce9ec5cad76d9ebb (diff) | |
| parent | 0ad89762a1cfdbb953a12e0434153a5e577f183a (diff) | |
| download | pleroma-b3e6953d23250393010adb01fc604f97fd17eb96.tar.gz | |
Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'
insert skeletons migration: fix for non-local locals
Closes #1746
See merge request pleroma/pleroma!2502
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | priv/repo/migrations/20200428221338_insert_skeletons_for_deleted_users.exs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d469793f0..4b7fb603d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Healthcheck reporting the number of memory currently used, rather than allocated in total +- `InsertSkeletonsForDeletedUsers` failing on some instances ## [2.0.3] - 2020-05-02 diff --git a/priv/repo/migrations/20200428221338_insert_skeletons_for_deleted_users.exs b/priv/repo/migrations/20200428221338_insert_skeletons_for_deleted_users.exs index 11d9a70ba..2adc38186 100644 --- a/priv/repo/migrations/20200428221338_insert_skeletons_for_deleted_users.exs +++ b/priv/repo/migrations/20200428221338_insert_skeletons_for_deleted_users.exs @@ -30,7 +30,7 @@ defmodule Pleroma.Repo.Migrations.InsertSkeletonsForDeletedUsers do Repo, "select distinct unnest(nonexistent_locals.recipients) from activities, lateral (select array_agg(recipient) as recipients from unnest(activities.recipients) as recipient where recipient similar to '#{ instance_uri - }/users/[A-Za-z0-9]*' and not(recipient in (select ap_id from users where local = true))) nonexistent_locals;", + }/users/[A-Za-z0-9]*' and not(recipient in (select ap_id from users))) nonexistent_locals;", [], timeout: :infinity ) |