diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-09-03 02:50:40 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-09-03 02:50:40 +0000 |
| commit | 299255b9bb2fe9692fda724cbad700e36fa7d5bb (patch) | |
| tree | e132d62d0c1133be9fb9028f9d4900cda2011451 /lib/mix/tasks | |
| parent | e40c221c310ace1187d83160329148cfd50a39c7 (diff) | |
| parent | f047088a937ddf95d5fd7f84ad69fd97decbffc0 (diff) | |
| download | pleroma-299255b9bb2fe9692fda724cbad700e36fa7d5bb.tar.gz pleroma-299255b9bb2fe9692fda724cbad700e36fa7d5bb.zip | |
Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop'
Add function to calculate associated object id
Closes #2307
See merge request pleroma/pleroma!3692
Diffstat (limited to 'lib/mix/tasks')
| -rw-r--r-- | lib/mix/tasks/pleroma/database.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex index 6b8f0ef68..ed560c177 100644 --- a/lib/mix/tasks/pleroma/database.ex +++ b/lib/mix/tasks/pleroma/database.ex @@ -154,9 +154,8 @@ defmodule Mix.Tasks.Pleroma.Database do |> join(:inner, [a], o in Object, on: fragment( - "(?->>'id') = COALESCE((?)->'object'->> 'id', (?)->>'object')", + "(?->>'id') = associated_object_id((?))", o.data, - a.data, a.data ) ) |