Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/lib/gitlab/database/batch_count_spec.rb b/spec/lib/gitlab/database/batch_count_spec.rb
index ec161cd6dcb..7842323d009 100644
--- a/spec/lib/gitlab/database/batch_count_spec.rb
+++ b/spec/lib/gitlab/database/batch_count_spec.rb
@@ -49,6 +49,12 @@ describe Gitlab::Database::BatchCount do
       [1, 2, 4, 5, 6].each { |i| expect(described_class.batch_count(model, batch_size: i)).to eq(5) }
     end
 
+    it 'will raise an error if distinct count is requested' do
+      expect do
+        described_class.batch_count(model.distinct(column))
+      end.to raise_error 'Use distinct count for optimized distinct counting'
+    end
+
     context 'in a transaction' do
       let(:in_transaction) { true }