diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-06-03 20:47:02 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-06-03 20:47:02 +0200 |
commit | 0157caacefe34838ff5d5093dc188f5491cb7b15 (patch) | |
tree | a5b56590b7660b6ed3257f929bf209a26cb25a15 /app/models | |
parent | 02dffa8edd097014578774aed30249ed08d2f3a4 (diff) | |
parent | f6088922c06f3da02e9051b39f3a7111f19298dd (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/account_stat.rb | 3 | ||||
-rw-r--r-- | app/models/concerns/account_counters.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/account_stat.rb b/app/models/account_stat.rb index a826a9af3..44da4f0d0 100644 --- a/app/models/account_stat.rb +++ b/app/models/account_stat.rb @@ -11,10 +11,11 @@ # created_at :datetime not null # updated_at :datetime not null # last_status_at :datetime -# lock_version :integer default(0), not null # class AccountStat < ApplicationRecord + self.locking_column = nil + belongs_to :account, inverse_of: :account_stat update_index('accounts#account', :account) 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 |