From 738ad9759ad1c38fb096d3fa567c48bd7a8f49e9 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 30 May 2019 14:30:38 +0300 Subject: Change default to single column UI (#10847) Keep current setting for users who were active within the last month --- ...0529143559_preserve_old_layout_for_existing_users.rb | 17 +++++++++++++++++ db/schema.rb | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb (limited to 'db') diff --git a/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb new file mode 100644 index 000000000..72b7c609d --- /dev/null +++ b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb @@ -0,0 +1,17 @@ +class PreserveOldLayoutForExistingUsers < ActiveRecord::Migration[5.2] + disable_ddl_transaction! + + def up + # Assume that currently active users are already using the layout that they + # want to use, therefore ensure that it is saved explicitly and not based + # on the to-be-changed default + + User.where(User.arel_table[:current_sign_in_at].gteq(1.month.ago)).find_each do |user| + next if Setting.unscoped.where(thing_type: 'User', thing_id: user.id, var: 'advanced_layout').exists? + user.settings.advanced_layout = true + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index cff545be5..f633f4e3f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_19_130537) do +ActiveRecord::Schema.define(version: 2019_05_29_143559) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" -- cgit From 1c78d600d3bac761869b089736d3348033ab4416 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 30 May 2019 21:35:29 +0200 Subject: Fix old migrations failing because of new version of `strong_migrations` (#10904) --- db/migrate/20171005102658_create_account_moderation_notes.rb | 2 +- .../20171010023049_add_foreign_key_to_account_moderation_notes.rb | 2 +- db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'db') diff --git a/db/migrate/20171005102658_create_account_moderation_notes.rb b/db/migrate/20171005102658_create_account_moderation_notes.rb index 974ed9940..010b94586 100644 --- a/db/migrate/20171005102658_create_account_moderation_notes.rb +++ b/db/migrate/20171005102658_create_account_moderation_notes.rb @@ -8,6 +8,6 @@ class CreateAccountModerationNotes < ActiveRecord::Migration[5.1] t.timestamps end - add_foreign_key :account_moderation_notes, :accounts, column: :target_account_id + safety_assured { add_foreign_key :account_moderation_notes, :accounts, column: :target_account_id } end end diff --git a/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb b/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb index fc1e1ab91..cdcd15934 100644 --- a/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb +++ b/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb @@ -1,5 +1,5 @@ class AddForeignKeyToAccountModerationNotes < ActiveRecord::Migration[5.1] def change - add_foreign_key :account_moderation_notes, :accounts + safety_assured { add_foreign_key :account_moderation_notes, :accounts } end end diff --git a/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb b/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb index 0c8a894cc..586ef6f02 100644 --- a/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb +++ b/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb @@ -1,6 +1,6 @@ class AddMovedToAccountIdToAccounts < ActiveRecord::Migration[5.1] def change add_column :accounts, :moved_to_account_id, :bigint, null: true, default: nil - add_foreign_key :accounts, :accounts, column: :moved_to_account_id, on_delete: :nullify + safety_assured { add_foreign_key :accounts, :accounts, column: :moved_to_account_id, on_delete: :nullify } end end -- cgit