diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-23 18:11:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-23 18:11:27 +0300 |
commit | 003d7f2a09668af85f94e48ed49d60862b96d8f8 (patch) | |
tree | 10f9baf4674416a5a7ca376bcc651973a56917b5 /scripts | |
parent | e10ea43772b9a6be150a074be7e26bfd6fa0380e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/decomposition/generate-loose-foreign-key | 5 |
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 |