Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 3 deletions

diff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-key
index 1ea1728732b..fbffebb6086 100755
--- a/scripts/decomposition/generate-loose-foreign-key
+++ b/scripts/decomposition/generate-loose-foreign-key
@@ -168,9 +168,8 @@ def generate_migration(definition)
         return unless foreign_key_exists?(:#{definition.from_table}, :#{definition.to_table}, name: "#{definition.name}")
 
         with_lock_retries do
-          execute('LOCK #{definition.to_table}, #{definition.from_table} IN ACCESS EXCLUSIVE MODE') if transaction_open?
-
-          remove_foreign_key_if_exists(:#{definition.from_table}, :#{definition.to_table}, name: "#{definition.name}")
+          remove_foreign_key_if_exists(:#{definition.from_table}, :#{definition.to_table},
+            name: "#{definition.name}", reverse_lock_order: true)
         end
       end