Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/lib/gitlab/database/query_analyzer_spec.rb b/spec/lib/gitlab/database/query_analyzer_spec.rb
index 82a1c7143d5..34c72893c53 100644
--- a/spec/lib/gitlab/database/query_analyzer_spec.rb
+++ b/spec/lib/gitlab/database/query_analyzer_spec.rb
@@ -128,11 +128,20 @@ RSpec.describe Gitlab::Database::QueryAnalyzer, query_analyzers: false do
 
     it 'does not call analyze on suppressed analyzers' do
       expect(analyzer).to receive(:suppressed?).and_return(true)
+      expect(analyzer).to receive(:requires_tracking?).and_return(false)
       expect(analyzer).not_to receive(:analyze)
 
       expect { process_sql("SELECT 1 FROM projects") }.not_to raise_error
     end
 
+    it 'does call analyze on suppressed analyzers if some queries require tracking' do
+      expect(analyzer).to receive(:suppressed?).and_return(true)
+      expect(analyzer).to receive(:requires_tracking?).and_return(true)
+      expect(analyzer).to receive(:analyze)
+
+      expect { process_sql("SELECT 1 FROM projects") }.not_to raise_error
+    end
+
     def process_sql(sql)
       described_class.instance.within do
         ApplicationRecord.load_balancer.read_write do |connection|