about summary refs log tree commit diff
path: root/db
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-01-10 21:52:24 +0100
committerYamagishi Kazutoshi <ykzts@desire.sh>2020-01-11 05:52:24 +0900
commit7583679ecfb7aab7de15e1c1df23d793c5447062 (patch)
tree1c301fa4d2fc76fb9fbd9c4edfb070936afe90ae /db
parente326b0dda1cd9b85519c185fbed624ad0eb4d91d (diff)
Fix old migrations failing because of strong_migrations update (#12787)
Fixes #12768

Some migrations were overlooked in #12692
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20180206000000_change_user_id_nonnullable.rb6
-rw-r--r--db/migrate/20191031163205_change_list_account_follow_nullable.rb4
2 files changed, 7 insertions, 3 deletions
diff --git a/db/migrate/20180206000000_change_user_id_nonnullable.rb b/db/migrate/20180206000000_change_user_id_nonnullable.rb
index 4eecb6154..2d2cf20d3 100644
--- a/db/migrate/20180206000000_change_user_id_nonnullable.rb
+++ b/db/migrate/20180206000000_change_user_id_nonnullable.rb
@@ -1,6 +1,8 @@
 class ChangeUserIdNonnullable < ActiveRecord::Migration[5.1]
   def change
-    change_column_null :invites, :user_id, false
-    change_column_null :web_settings, :user_id, false
+    safety_assured do
+      change_column_null :invites, :user_id, false
+      change_column_null :web_settings, :user_id, false
+    end
   end
 end
diff --git a/db/migrate/20191031163205_change_list_account_follow_nullable.rb b/db/migrate/20191031163205_change_list_account_follow_nullable.rb
index ff8911546..65ff93365 100644
--- a/db/migrate/20191031163205_change_list_account_follow_nullable.rb
+++ b/db/migrate/20191031163205_change_list_account_follow_nullable.rb
@@ -1,5 +1,7 @@
 class ChangeListAccountFollowNullable < ActiveRecord::Migration[5.1]
   def change
-    change_column_null :list_accounts, :follow_id, true
+    safety_assured do
+      change_column_null :list_accounts, :follow_id, true
+    end
   end
 end