Skip to content

Drop users email columns #6488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mitchellhenke merged 1 commit into from
Jun 21, 2022
Merged

Drop users email columns #6488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class User < ApplicationRecord
self.ignored_columns = %w[totp_timestamp email_fingerprint encrypted_email]
self.ignored_columns = %w[totp_timestamp]
include NonNullUuid

include ::NewRelic::Agent::MethodTracer
Expand Down
8 changes: 8 additions & 0 deletions db/primary_migrate/20220621170346_drop_users_email_columns.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
class DropUsersEmailColumns < ActiveRecord::Migration[6.1]
def change
safety_assured do
remove_column :users, :encrypted_email, type: :text, default: '', null: false
remove_column :users, :email_fingerprint, type: :text, default: '', null: false
end
end
end
4 changes: 1 addition & 3 deletions db/schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2022_06_13_174442) do
ActiveRecord::Schema.define(version: 2022_06_21_170346) do

# These are extensions that must be enabled in order to support this database
enable_extension "pg_stat_statements"
Expand Down Expand Up @@ -576,8 +576,6 @@
t.string "direct_otp"
t.datetime "direct_otp_sent_at"
t.string "unique_session_id"
t.string "email_fingerprint", default: "", null: false
t.text "encrypted_email", default: "", null: false
t.text "encrypted_phone"
Copy link
Copy Markdown
Contributor

@zachmargolis zachmargolis Jun 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀 oooo definitely not for this PR but I suspect this is another column we could drop because we moved to phone_configurations

Copy link
Copy Markdown
Contributor Author

@mitchellhenke mitchellhenke Jun 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely. Likewise I think totp_timestamp could be dropped

t.integer "otp_delivery_preference", default: 0, null: false
t.integer "totp_timestamp"
Expand Down