From 55d28efa1f1fb0d2ce074ac3ebecf6d4e67aaa90 Mon Sep 17 00:00:00 2001
From: Adam Hegyi <ahegyi@gitlab.com>
Date: Wed, 28 Aug 2019 13:38:50 +0000
Subject: Adding NOT NULL constraint to private_profile

This change sets NOT NULL constraint to users.private profile.

closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57538
---
 ...ot-null-constraint-on-users-private-profile.yml |  5 +++++
 ...080128_set_not_null_on_users_private_profile.rb | 26 ++++++++++++++++++++++
 db/schema.rb                                       |  2 +-
 spec/models/user_spec.rb                           |  2 +-
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/57538-not-null-constraint-on-users-private-profile.yml
 create mode 100644 db/post_migrate/20190725080128_set_not_null_on_users_private_profile.rb

diff --git a/changelogs/unreleased/57538-not-null-constraint-on-users-private-profile.yml b/changelogs/unreleased/57538-not-null-constraint-on-users-private-profile.yml
new file mode 100644
index 00000000000..bcbd8e3f11e
--- /dev/null
+++ b/changelogs/unreleased/57538-not-null-constraint-on-users-private-profile.yml
@@ -0,0 +1,5 @@
+---
+title: Setting NOT NULL constraint to users.private_profile column
+merge_request: 14838
+author:
+type: other
diff --git a/db/post_migrate/20190725080128_set_not_null_on_users_private_profile.rb b/db/post_migrate/20190725080128_set_not_null_on_users_private_profile.rb
new file mode 100644
index 00000000000..db42e949d3f
--- /dev/null
+++ b/db/post_migrate/20190725080128_set_not_null_on_users_private_profile.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class SetNotNullOnUsersPrivateProfile < ActiveRecord::Migration[5.1]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    Gitlab::BackgroundMigration.steal('MigrateNullPrivateProfileToFalse')
+
+    # rubocop:disable Migration/UpdateLargeTable
+    # rubocop:disable Migration/UpdateColumnInBatches
+    # Data has been migrated previously, count should be close to 0
+    update_column_in_batches(:users, :private_profile, false) do |table, query|
+      query.where(table[:private_profile].eq(nil))
+    end
+
+    change_column_null :users, :private_profile, false
+  end
+
+  def down
+    change_column_null :users, :private_profile, true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f30dad3d030..6c6c2796b9a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3499,7 +3499,7 @@ ActiveRecord::Schema.define(version: 2019_08_20_163320) do
     t.integer "theme_id", limit: 2
     t.integer "accepted_term_id"
     t.string "feed_token"
-    t.boolean "private_profile", default: false
+    t.boolean "private_profile", default: false, null: false
     t.boolean "include_private_contributions"
     t.string "commit_email"
     t.boolean "auditor", default: false, null: false
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8338d2b5b39..f1408194250 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1176,7 +1176,7 @@ describe User do
         expect(user.can_create_group).to eq(Gitlab.config.gitlab.default_can_create_group)
         expect(user.theme_id).to eq(Gitlab.config.gitlab.default_theme)
         expect(user.external).to be_falsey
-        expect(user.private_profile).to eq false
+        expect(user.private_profile).to eq(false)
       end
     end
 
-- 
cgit v1.2.1