Avoid add_foreign_key within with_lock_retries in analytics migrations

db/migrate/20200123090839_remove_analytics_repository_table_fks_on_projects.rb

@@ -5,22 +5,26 @@ class RemoveAnalyticsRepositoryTableFksOnProjects < ActiveRecord::Migration[5.2]
 
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
-    with_lock_retries do
     # Requires ExclusiveLock on all tables. analytics_* tables are empty
-      remove_foreign_key :analytics_repository_files, :projects
-      remove_foreign_key :analytics_repository_file_edits, :projects if table_exists?(:analytics_repository_file_edits) # this table might be already dropped on development environment
-      remove_foreign_key :analytics_repository_file_commits, :projects
+    with_lock_retries do
+      remove_foreign_key_if_exists(:analytics_repository_files, :projects)
     end
+
+    with_lock_retries do
+      remove_foreign_key_if_exists(:analytics_repository_file_edits, :projects) if table_exists?(:analytics_repository_file_edits) # this table might be already dropped on development environment
     end
 
-  def down
     with_lock_retries do
-      # rubocop:disable Migration/AddConcurrentForeignKey
-      add_foreign_key :analytics_repository_files, :projects, on_delete: :cascade
-      add_foreign_key :analytics_repository_file_edits, :projects, on_delete: :cascade
-      add_foreign_key :analytics_repository_file_commits, :projects, on_delete: :cascade
-      # rubocop:enable Migration/AddConcurrentForeignKey
+      remove_foreign_key_if_exists(:analytics_repository_file_commits, :projects)
+    end
   end
+
+  def down
+    add_concurrent_foreign_key(:analytics_repository_files, :projects, column: :project_id, on_delete: :cascade)
+    add_concurrent_foreign_key(:analytics_repository_file_edits, :projects, column: :project_id, on_delete: :cascade)
+    add_concurrent_foreign_key(:analytics_repository_file_commits, :projects, column: :project_id, on_delete: :cascade)
   end
 end

db/migrate/20200123091422_remove_analytics_repository_files_fk_on_other_analytics_tables.rb

@@ -5,20 +5,21 @@ class RemoveAnalyticsRepositoryFilesFkOnOtherAnalyticsTables < ActiveRecord::Mig
 
   DOWNTIME = false
 
+  disable_ddl_transaction!
+
   def up
-    with_lock_retries do
     # Requires ExclusiveLock on all tables. analytics_* tables are empty
-      remove_foreign_key :analytics_repository_file_edits, :analytics_repository_files if table_exists?(:analytics_repository_file_edits) # this table might be already dropped on development environment
-      remove_foreign_key :analytics_repository_file_commits, :analytics_repository_files
-    end
+    with_lock_retries do
+      remove_foreign_key_if_exists(:analytics_repository_file_edits, :analytics_repository_files) if table_exists?(:analytics_repository_file_edits) # this table might be already dropped on development environment
     end
 
-  def down
     with_lock_retries do
-      # rubocop:disable Migration/AddConcurrentForeignKey
-      add_foreign_key :analytics_repository_file_edits, :analytics_repository_files, on_delete: :cascade
-      add_foreign_key :analytics_repository_file_commits, :analytics_repository_files, on_delete: :cascade
-      # rubocop:enable Migration/AddConcurrentForeignKey
+      remove_foreign_key_if_exists(:analytics_repository_file_commits, :analytics_repository_files)
+    end
   end
+
+  def down
+    add_concurrent_foreign_key(:analytics_repository_file_edits, :analytics_repository_files, column: :analytics_repository_file_id, on_delete: :cascade)
+    add_concurrent_foreign_key(:analytics_repository_file_commits, :analytics_repository_files, column: :analytics_repository_file_id, on_delete: :cascade)
   end
 end