Skip to content
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.

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

model: add cascade to all foreign keys #121

Merged
merged 1 commit into from
Jul 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#
# This file is part of Invenio.
# Copyright (C) 2017 CERN.
#
# Invenio is free software; you can redistribute it
# and/or modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# Invenio is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Invenio; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307, USA.
#
# In applying this license, CERN does not
# waive the privileges and immunities granted to it by virtue of its status
# as an Intergovernmental Organization or submit itself to any jurisdiction.

"""Add on delete cascade constraint."""

from alembic import op

# revision identifiers, used by Alembic.
revision = '2069a982633b'
down_revision = '2f63be7b7572'
branch_labels = ()
depends_on = None


def upgrade():
"""Upgrade database."""
op.create_index(op.f('ix_access_actionsroles_role_id'),
'access_actionsroles', ['role_id'], unique=False)
op.drop_constraint(u'fk_access_actionsroles_role_id_accounts_role',
'access_actionsroles', type_='foreignkey')
op.create_foreign_key(op.f('fk_access_actionsroles_role_id_accounts_role'),
'access_actionsroles', 'accounts_role', ['role_id'],
['id'], ondelete='CASCADE')
op.create_index(op.f('ix_access_actionsusers_user_id'),
'access_actionsusers', ['user_id'], unique=False)
op.drop_constraint(u'fk_access_actionsusers_user_id_accounts_user',
'access_actionsusers', type_='foreignkey')
op.create_foreign_key(op.f('fk_access_actionsusers_user_id_accounts_user'),
'access_actionsusers', 'accounts_user', ['user_id'],
['id'], ondelete='CASCADE')


def downgrade():
"""Downgrade database."""
op.drop_constraint(op.f('fk_access_actionsusers_user_id_accounts_user'),
'access_actionsusers', type_='foreignkey')
op.drop_index(op.f('ix_access_actionsusers_user_id'),
table_name='access_actionsusers')
op.create_foreign_key(u'fk_access_actionsusers_user_id_accounts_user',
'access_actionsusers', 'accounts_user', ['user_id'],
['id'])
op.drop_constraint(op.f('fk_access_actionsroles_role_id_accounts_role'),
'access_actionsroles', type_='foreignkey')
op.drop_index(op.f('ix_access_actionsroles_role_id'),
table_name='access_actionsroles')
op.create_foreign_key(u'fk_access_actionsroles_role_id_accounts_role',
'access_actionsroles', 'accounts_role', ['role_id'],
['id'])
16 changes: 12 additions & 4 deletions invenio_access/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,13 @@ class ActionUsers(ActionNeedMixin, db.Model):
name='access_actionsusers_unique'),
)

user_id = db.Column(db.Integer(), db.ForeignKey(User.id), nullable=True)
user_id = db.Column(db.Integer(),
db.ForeignKey(User.id, ondelete='CASCADE'),
nullable=True, index=True)

user = db.relationship("User")
user = db.relationship("User",
backref=db.backref("actionusers",
cascade="all, delete-orphan"))

@property
def need(self):
Expand All @@ -157,9 +161,13 @@ class ActionRoles(ActionNeedMixin, db.Model):
name='access_actionsroles_unique'),
)

role_id = db.Column(db.Integer(), db.ForeignKey(Role.id), nullable=False)
role_id = db.Column(db.Integer(),
db.ForeignKey(Role.id, ondelete='CASCADE'),
nullable=False, index=True)

role = db.relationship("Role")
role = db.relationship("Role",
backref=db.backref("actionusers",
cascade="all, delete-orphan"))

@property
def need(self):
Expand Down