Merge branch...

Merge branch '343394-ignore-plans-and-gitlab-subscriptions-in-cross-modification-check' into 'master'

Ignore plans and gitlab_subscriptions in cross modification check

See merge request gitlab-org/gitlab!72665

spec/support/database/cross-database-modification-allowlist.yml

@@ -378,7 +378,6 @@
 - "./ee/spec/models/ci/build_spec.rb"
 - "./ee/spec/models/ci/minutes/additional_pack_spec.rb"
 - "./ee/spec/models/ci/pipeline_spec.rb"
-- "./ee/spec/models/ci/subscriptions/project_spec.rb"
 - "./ee/spec/models/concerns/approval_rule_like_spec.rb"
 - "./ee/spec/models/concerns/approver_migrate_hook_spec.rb"
 - "./ee/spec/models/dora/daily_metrics_spec.rb"

spec/support/database/prevent_cross_database_modification.rb

@@ -84,6 +84,11 @@ module Database
       parsed_query = PgQuery.parse(sql)
       tables = sql.downcase.include?(' for update') ? parsed_query.tables : parsed_query.dml_tables
 
+      # We have some code where plans and gitlab_subscriptions are lazily
+      # created and this causes lots of spec failures
+      # https://gitlab.com/gitlab-org/gitlab/-/issues/343394
+      tables -= %w[plans gitlab_subscriptions]
+
       return if tables.empty?
 
       cross_database_context[:modified_tables_by_db][database].merge(tables)