diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-18 12:42:09 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-18 12:42:09 +0000 |
| commit | 30a59ae97d79b2e3aa528a16f934e03d9ac80d72 (patch) | |
| tree | 111924886f98da15734aa3d72f08f5a283ac0a8e /lib/mix/tasks | |
| parent | 724f611b0edf3d7fd819ee748df2f6b00d211fa2 (diff) | |
| parent | b085cd26602cca8fdb1343a2b72adb4e9575ab67 (diff) | |
| download | pleroma-30a59ae97d79b2e3aa528a16f934e03d9ac80d72.tar.gz | |
Merge branch 'backport/develop-safe-jsonb' into 'develop'
Backport safe_jsonb_set fixes to develop
See merge request pleroma/pleroma!1858
Diffstat (limited to 'lib/mix/tasks')
| -rw-r--r-- | lib/mix/tasks/pleroma/database.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex index cfd9eeada..8a827ca80 100644 --- a/lib/mix/tasks/pleroma/database.ex +++ b/lib/mix/tasks/pleroma/database.ex @@ -28,7 +28,7 @@ defmodule Mix.Tasks.Pleroma.Database do Logger.info("Removing embedded objects") Repo.query!( - "update activities set data = jsonb_set(data, '{object}'::text[], data->'object'->'id') where data->'object'->>'id' is not null;", + "update activities set data = safe_jsonb_set(data, '{object}'::text[], data->'object'->'id') where data->'object'->>'id' is not null;", [], timeout: :infinity ) @@ -126,7 +126,7 @@ defmodule Mix.Tasks.Pleroma.Database do set: [ data: fragment( - "jsonb_set(?, '{likes}', '[]'::jsonb, true)", + "safe_jsonb_set(?, '{likes}', '[]'::jsonb, true)", object.data ) ] |