summaryrefslogtreecommitdiff
path: root/config/initializers/database_query_analyzers.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers/database_query_analyzers.rb')
-rw-r--r--config/initializers/database_query_analyzers.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/config/initializers/database_query_analyzers.rb b/config/initializers/database_query_analyzers.rb
index d1010e054af..2e73fbb79a2 100644
--- a/config/initializers/database_query_analyzers.rb
+++ b/config/initializers/database_query_analyzers.rb
@@ -3,9 +3,13 @@
# Currently we register validator only for `dev` or `test` environment
Gitlab::Database::QueryAnalyzer.instance.hook!
Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasMetrics)
+Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(
+ ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification
+)
-if Rails.env.test? || Gitlab::Utils.to_boolean(ENV['ENABLE_CROSS_DATABASE_MODIFICATION_DETECTION'], default: false)
- Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification)
+if Gitlab.dev_or_test_env?
+ query_analyzer = ::Gitlab::Database::QueryAnalyzers::GitlabSchemasValidateConnection
+ Gitlab::Database::QueryAnalyzer.instance.all_analyzers.append(query_analyzer)
end
Gitlab::Application.configure do |config|