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/pleroma | |
| 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/pleroma')
| -rw-r--r-- | lib/pleroma/object.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/user.ex | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index cdfbacb0e..d9b41d710 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -181,7 +181,7 @@ defmodule Pleroma.Object do data: fragment( """ - jsonb_set(?, '{repliesCount}', + safe_jsonb_set(?, '{repliesCount}', (coalesce((?->>'repliesCount')::int, 0) + 1)::varchar::jsonb, true) """, o.data, @@ -204,7 +204,7 @@ defmodule Pleroma.Object do data: fragment( """ - jsonb_set(?, '{repliesCount}', + safe_jsonb_set(?, '{repliesCount}', (greatest(0, (?->>'repliesCount')::int - 1))::varchar::jsonb, true) """, o.data, diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 917bcf2ef..d0d3e1f9a 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -727,7 +727,7 @@ defmodule Pleroma.User do set: [ info: fragment( - "jsonb_set(?, '{note_count}', ((?->>'note_count')::int + 1)::varchar::jsonb, true)", + "safe_jsonb_set(?, '{note_count}', ((?->>'note_count')::int + 1)::varchar::jsonb, true)", u.info, u.info ) @@ -748,7 +748,7 @@ defmodule Pleroma.User do set: [ info: fragment( - "jsonb_set(?, '{note_count}', (greatest(0, (?->>'note_count')::int - 1))::varchar::jsonb, true)", + "safe_jsonb_set(?, '{note_count}', (greatest(0, (?->>'note_count')::int - 1))::varchar::jsonb, true)", u.info, u.info ) @@ -818,7 +818,7 @@ defmodule Pleroma.User do set: [ info: fragment( - "jsonb_set(?, '{follower_count}', ?::varchar::jsonb, true)", + "safe_jsonb_set(?, '{follower_count}', ?::varchar::jsonb, true)", u.info, s.count ) |