Add separate post migration to change default of notified_of_own_activity

3 files changed, 22 insertions, 2 deletions

diff --git a/db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb b/db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb
index a96193d3da6..52c0b682fc8 100644
--- a/db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb
+++ b/db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb
@@ -5,7 +5,7 @@ class ReaddNotifiedOfOwnActivityToUsers < ActiveRecord::Migration
   DOWNTIME = false
 
   def up
-    add_column_with_default :users, :notified_of_own_activity, :boolean, default: false
+    add_column :users, :notified_of_own_activity, :boolean
   end
 
   def down
diff --git a/db/post_migrate/20170317131326_add_notified_of_own_activity_default.rb b/db/post_migrate/20170317131326_add_notified_of_own_activity_default.rb
new file mode 100644
index 00000000000..f01ef6b4119
--- /dev/null
+++ b/db/post_migrate/20170317131326_add_notified_of_own_activity_default.rb
@@ -0,0 +1,20 @@
+class AddNotifiedOfOwnActivityDefault < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  DOWNTIME = false
+
+  def up
+    begin
+      update_column_in_batches(:users, :notified_of_own_activity, false) do |table, query|
+        query.where(table[:notified_of_own_activity].eq(nil))
+      end
+
+      change_column :users, :notified_of_own_activity, :boolean, default: false, null: false
+    end
+  end
+
+  def down
+    change_column_default :users, :notified_of_own_activity, nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fe59c090056..cef2f0b0510 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170316061730) do
+ActiveRecord::Schema.define(version: 20170317131326) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"