From 003d7f2a09668af85f94e48ed49d60862b96d8f8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 23 Mar 2023 15:11:27 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- scripts/decomposition/generate-loose-foreign-key | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.1