trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing primary keys

This commit is contained in:
Cayo Puigdefabregas 2021-02-26 13:25:21 +01:00
parent 159eab29c2
commit ac032c7902
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ereuse_devicehub/migrations/versions/6a2a939d5668_drop_unique_org_for_tag.py
View File

@ -24,10 +24,9 @@ def get_inv():
def upgrade(): def upgrade():
op.drop_constraint('one tag id per organization', 'tag', schema=f'{get_inv()}') op.drop_constraint('one tag id per organization', 'tag', schema=f'{get_inv()}')
op.drop_constraint('one secondary tag per organization', 'tag', schema=f'{get_inv()}') op.create_primary_key('one tag id per owner', 'tag', ['id', 'owner_id'], schema=f'{get_inv()}'),
op.create_unique_constraint('one tag id per owner', 'tag', ['id', 'owner_id'], schema=f'{get_inv()}')
def downgrade(): def downgrade():
op.create_unique_constraint('one tag id per organization', 'tag', ['id', 'org_id'], schema=f'{get_inv()}') op.drop_constraint('one tag id per owner', 'tag', schema=f'{get_inv()}')
op.create_unique_constraint('one secondary tag per organization', 'tag', ['id', 'secondary'], schema=f'{get_inv()}') op.create_primary_key('one tag id per organization', 'tag', ['id', 'org_id'], schema=f'{get_inv()}'),

5
ereuse_devicehub/resources/tag/model.py
View File

@ -30,12 +30,12 @@ class Tag(Thing):
id.comment = """The ID of the tag.""" id.comment = """The ID of the tag."""
owner_id = Column(UUID(as_uuid=True), owner_id = Column(UUID(as_uuid=True),
ForeignKey(User.id), ForeignKey(User.id),
primary_key=True,
nullable=False, nullable=False,
default=lambda: g.user.id) default=lambda: g.user.id)
owner = relationship(User, primaryjoin=owner_id == User.id) owner = relationship(User, primaryjoin=owner_id == User.id)
org_id = Column(UUID(as_uuid=True), org_id = Column(UUID(as_uuid=True),
ForeignKey(Organization.id), ForeignKey(Organization.id),
primary_key=True,
# If we link with the Organization object this instance # If we link with the Organization object this instance
# will be set as persistent and added to session # will be set as persistent and added to session
# which is something we don't want to enforce by default # which is something we don't want to enforce by default
@ -98,8 +98,7 @@ class Tag(Thing):
__table_args__ = ( __table_args__ = (
UniqueConstraint(id, owner_id, name='one tag id per owner'), UniqueConstraint(id, owner_id, name='one tag id per owner'),
# UniqueConstraint(id, org_id, name='one tag id per organization'), UniqueConstraint(secondary, org_id, name='one secondary tag per organization')
# UniqueConstraint(secondary, org_id, name='one secondary tag per organization')
) )
@property @property