about summary refs log tree commit diff
path: root/db
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2018-01-05 03:38:29 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-01-04 19:38:29 +0100
commit7347d4f8bb6471c892d4feb58e1e0a4d13a229c4 (patch)
tree55ef68a7d2f4fe6e140229310a9a3e4eeb731e72 /db
parent7571c37c991c7bcaf83c524105f4a3b64b19670c (diff)
Use disable_ddl_transaction! to prevent warnings on migration (#6183)
Migration is wrapped by transaction, so manual `commit_db_transaction` without transaction restarting causes "there is no transaction in progress" warnings. We should use `disable_ddl_transaction!` instead, if we can omit transaction completely.
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20171129172043_add_index_on_stream_entries.rb3
-rw-r--r--db/migrate/20171226094803_more_faster_index_on_notifications.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/db/migrate/20171129172043_add_index_on_stream_entries.rb b/db/migrate/20171129172043_add_index_on_stream_entries.rb
index 478530c7f..181c4f288 100644
--- a/db/migrate/20171129172043_add_index_on_stream_entries.rb
+++ b/db/migrate/20171129172043_add_index_on_stream_entries.rb
@@ -1,6 +1,7 @@
 class AddIndexOnStreamEntries < ActiveRecord::Migration[5.1]
+  disable_ddl_transaction!
+
   def change
-    commit_db_transaction
     add_index :stream_entries, [:account_id, :activity_type, :id], algorithm: :concurrently
     remove_index :stream_entries, name: :index_stream_entries_on_account_id
   end
diff --git a/db/migrate/20171226094803_more_faster_index_on_notifications.rb b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
index b2e53b82d..0273a4e7c 100644
--- a/db/migrate/20171226094803_more_faster_index_on_notifications.rb
+++ b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
@@ -1,6 +1,7 @@
 class MoreFasterIndexOnNotifications < ActiveRecord::Migration[5.1]
+  disable_ddl_transaction!
+
   def change
-    commit_db_transaction
     add_index :notifications, [:account_id, :id], order: { id: :desc }, algorithm: :concurrently
     remove_index :notifications, name: :index_notifications_on_id_and_account_id_and_activity_type
   end