Commit dd85269a authored by Ash McKenzie's avatar Ash McKenzie Committed by Alex Buijs

Allow UsageData.count to use count_by:

parent ad3ee493
......@@ -190,8 +190,8 @@ module Gitlab
{} # augmented in EE
end
def count(relation, fallback: -1)
relation.count
def count(relation, count_by: nil, fallback: -1)
count_by ? relation.count(count_by) : relation.count
rescue ActiveRecord::StatementInvalid
fallback
end
......
......@@ -271,6 +271,12 @@ describe Gitlab::UsageData do
expect(described_class.count(relation)).to eq(1)
end
it 'returns the count for count_by when provided' do
allow(relation).to receive(:count).with(:creator_id).and_return(2)
expect(described_class.count(relation, count_by: :creator_id)).to eq(2)
end
it 'returns the fallback value when counting fails' do
allow(relation).to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment