Merge pull request #5292 from tgxworld/drop_email_column
Drop unused email column from users table.
This commit is contained in:
commit
36ba0dfde3
|
@ -19,6 +19,9 @@ class User < ActiveRecord::Base
|
||||||
include Roleable
|
include Roleable
|
||||||
include HasCustomFields
|
include HasCustomFields
|
||||||
|
|
||||||
|
# TODO: Remove this after 7th Jan 2018
|
||||||
|
self.ignored_columns = %w{email}
|
||||||
|
|
||||||
has_many :posts
|
has_many :posts
|
||||||
has_many :notifications, dependent: :destroy
|
has_many :notifications, dependent: :destroy
|
||||||
has_many :topic_users, dependent: :destroy
|
has_many :topic_users, dependent: :destroy
|
||||||
|
|
|
@ -33,11 +33,11 @@ UserOption.where(user_id: -1).update_all(
|
||||||
|
|
||||||
Group.user_trust_level_change!(-1, TrustLevel[4])
|
Group.user_trust_level_change!(-1, TrustLevel[4])
|
||||||
|
|
||||||
# TODO drop email with ignored_columns pattern in rails 5.1
|
|
||||||
ColumnDropper.drop(
|
ColumnDropper.drop(
|
||||||
table: 'users',
|
table: 'users',
|
||||||
after_migration: 'CreateUserEmails',
|
after_migration: 'DropEmailFromUsers',
|
||||||
columns: %w[
|
columns: %w[
|
||||||
|
email
|
||||||
email_always
|
email_always
|
||||||
mailing_list_mode
|
mailing_list_mode
|
||||||
email_digests
|
email_digests
|
||||||
|
@ -54,7 +54,8 @@ ColumnDropper.drop(
|
||||||
new_topic_duration_minutes
|
new_topic_duration_minutes
|
||||||
last_redirected_to_top_at
|
last_redirected_to_top_at
|
||||||
auth_token
|
auth_token
|
||||||
auth_token_updated_at ],
|
auth_token_updated_at
|
||||||
|
],
|
||||||
on_drop: ->() {
|
on_drop: ->() {
|
||||||
STDERR.puts 'Removing superflous users columns!'
|
STDERR.puts 'Removing superflous users columns!'
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
class DropEmailFromUsers < ActiveRecord::Migration[5.1]
|
||||||
|
def up
|
||||||
|
# Defer dropping of the columns until the new application code has been deployed.
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
raise ActiveRecord::IrreversibleMigration
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue