diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-03 22:30:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 22:30:38 +0200 |
| commit | db5baf3d1a93cbf6961f721205cff0beaf71bffd (patch) | |
| tree | a052f6043b22122a84eb1219f0ffba3ba8870a6a /app/models/concerns | |
| parent | 02dffa8edd097014578774aed30249ed08d2f3a4 (diff) | |
| parent | 1ac5427ddceb166764b63ba92421f04a0f6fde38 (diff) | |
Merge pull request #1547 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/account_counters.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/concerns/account_counters.rb b/app/models/concerns/account_counters.rb index fd3f161ad..3fabb5205 100644 --- a/app/models/concerns/account_counters.rb +++ b/app/models/concerns/account_counters.rb @@ -49,7 +49,6 @@ module AccountCounters ON CONFLICT (account_id) DO UPDATE SET #{key} = account_stats.#{key} + :value, last_status_at = now(), - lock_version = account_stats.lock_version + 1, updated_at = now() RETURNING id; SQL @@ -59,7 +58,6 @@ module AccountCounters VALUES (:account_id, :default_value, now(), now()) ON CONFLICT (account_id) DO UPDATE SET #{key} = account_stats.#{key} + :value, - lock_version = account_stats.lock_version + 1, updated_at = now() RETURNING id; SQL |