From 06facb7576eb22ec0db9dc0310e8410cb0999014 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Thu, 7 Mar 2019 16:29:09 +0000 Subject: [PATCH 1/2] Removing the foreign from to users from Notification_history. The relationship is not used and it prevents us from deleting users. It would be good to delete users that are never activated. --- app/models.py | 3 +-- .../versions/0278_remove_fk_to_users.py | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 migrations/versions/0278_remove_fk_to_users.py diff --git a/app/models.py b/app/models.py index b9c7799bd..c2c92bb4f 100644 --- a/app/models.py +++ b/app/models.py @@ -1574,8 +1574,7 @@ class NotificationHistory(db.Model, HistoryModel): phone_prefix = db.Column(db.String, nullable=True) rate_multiplier = db.Column(db.Float(asdecimal=False), nullable=True) - created_by = db.relationship('User') - created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), nullable=True) + created_by_id = db.Column(UUID(as_uuid=True), nullable=True) postage = db.Column(db.String, nullable=True) CheckConstraint(""" diff --git a/migrations/versions/0278_remove_fk_to_users.py b/migrations/versions/0278_remove_fk_to_users.py new file mode 100644 index 000000000..355ff54d0 --- /dev/null +++ b/migrations/versions/0278_remove_fk_to_users.py @@ -0,0 +1,21 @@ +""" + +Revision ID: 0278_remove_fk_to_users +Revises: 0277_consent_to_research_null +Create Date: 2019-03-06 16:49:28.674498 + +""" +from alembic import op +import sqlalchemy as sa + + +revision = '0278_remove_fk_to_users' +down_revision = '0277_consent_to_research_null' + + +def upgrade(): + op.drop_constraint('notification_history_created_by_id_fkey', 'notification_history', type_='foreignkey') + + +def downgrade(): + op.create_foreign_key('notification_history_created_by_id_fkey', 'notification_history', 'users', ['created_by_id'], ['id']) From 2cbcf2b80567847c78c792e71754cd49b2712a0b Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 11 Mar 2019 11:43:16 +0000 Subject: [PATCH 2/2] Fix merge conflicts --- ...emove_fk_to_users.py => 0279_remove_fk_to_users.py} | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) rename migrations/versions/{0278_remove_fk_to_users.py => 0279_remove_fk_to_users.py} (65%) diff --git a/migrations/versions/0278_remove_fk_to_users.py b/migrations/versions/0279_remove_fk_to_users.py similarity index 65% rename from migrations/versions/0278_remove_fk_to_users.py rename to migrations/versions/0279_remove_fk_to_users.py index 355ff54d0..b4a7c841a 100644 --- a/migrations/versions/0278_remove_fk_to_users.py +++ b/migrations/versions/0279_remove_fk_to_users.py @@ -1,16 +1,14 @@ """ -Revision ID: 0278_remove_fk_to_users -Revises: 0277_consent_to_research_null +Revision ID: 0279_remove_fk_to_users +Revises: 0278_add_more_stuff_to_orgs Create Date: 2019-03-06 16:49:28.674498 """ from alembic import op -import sqlalchemy as sa - -revision = '0278_remove_fk_to_users' -down_revision = '0277_consent_to_research_null' +revision = '0279_remove_fk_to_users' +down_revision = '0278_add_more_stuff_to_orgs' def upgrade():