diff options
author | Valery Sizov <valery@gitlab.com> | 2017-05-30 15:26:22 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2017-05-30 15:26:22 +0300 |
commit | 4d632e2137f02c61ba91130b7c5e2a021be5b81b (patch) | |
tree | 5fc7b39ce4e9cd1284ab1d5cc8031824c9cb8779 | |
parent | c5b0c530bf93e4525f8573dea14abd3f927b0f90 (diff) | |
download | gitlab-ce-fix_cleanup_concurrent_column_rename.tar.gz |
Fix cleanup_concurrent_column_rename helperfix_cleanup_concurrent_column_rename
-rw-r--r-- | lib/gitlab/database/migration_helpers.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb index a412bb6dbd2..36209349fa8 100644 --- a/lib/gitlab/database/migration_helpers.rb +++ b/lib/gitlab/database/migration_helpers.rb @@ -438,14 +438,14 @@ module Gitlab # Removes the triggers used for renaming a PostgreSQL column concurrently. def remove_rename_triggers_for_postgresql(table, trigger) - execute("DROP TRIGGER #{trigger} ON #{table}") - execute("DROP FUNCTION #{trigger}()") + execute("DROP TRIGGER IF EXISTS #{trigger} ON #{table}") + execute("DROP FUNCTION IF EXISTS #{trigger}()") end # Removes the triggers used for renaming a MySQL column concurrently. def remove_rename_triggers_for_mysql(trigger) - execute("DROP TRIGGER #{trigger}_insert") - execute("DROP TRIGGER #{trigger}_update") + execute("DROP TRIGGER IF EXISTS #{trigger}_insert") + execute("DROP TRIGGER IF EXISTS #{trigger}_update") end # Returns the (base) name to use for triggers when renaming columns. |