heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use better relationships to delete collections.

Browse Source 
When deleting a User, his/her collections can be deleted by
sqlalchemy: Collections do not need any special code to be
executed on deletion.
This commit is contained in:
Elrond 2013-01-22 22:00:41 +01:00
parent d63cc34e71
commit 6194344bf9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mediagoblin/db/models.py
View File

@ -84,9 +84,7 @@ class User(Base, UserMixin):
def delete(self, **kwargs): def delete(self, **kwargs):
"""Deletes a User and all related entries/comments/files/...""" """Deletes a User and all related entries/comments/files/..."""
# Delete this user's Collections and all contained CollectionItems # Collections get deleted by relationships.
for collection in self.collections:
collection.delete(commit=False)
media_entries = MediaEntry.query.filter(MediaEntry.uploader == self.id) media_entries = MediaEntry.query.filter(MediaEntry.uploader == self.id)
for media in media_entries: for media in media_entries:
@ -415,7 +413,10 @@ class Collection(Base, CollectionMixin):
# TODO: No of items in Collection. Badly named, can we migrate to num_items? # TODO: No of items in Collection. Badly named, can we migrate to num_items?
items = Column(Integer, default=0) items = Column(Integer, default=0)
get_creator = relationship(User, backref="collections") # Cascade: Collections are owned by their creator. So do the full thing.
get_creator = relationship(User,
backref=backref("collections",
cascade="all, delete-orphan"))
def get_collection_items(self, ascending=False): def get_collection_items(self, ascending=False):
#TODO, is this still needed with self.collection_items being available? #TODO, is this still needed with self.collection_items being available?
@ -436,7 +437,9 @@ class CollectionItem(Base, CollectionItemMixin):
note = Column(UnicodeText, nullable=True) note = Column(UnicodeText, nullable=True)
added = Column(DateTime, nullable=False, default=datetime.datetime.now) added = Column(DateTime, nullable=False, default=datetime.datetime.now)
position = Column(Integer) position = Column(Integer)
in_collection = relationship("Collection",
# Cascade: CollectionItems are owned by their Collection. So do the full thing.
in_collection = relationship(Collection,
backref=backref( backref=backref(
"collection_items", "collection_items",
cascade="all, delete-orphan")) cascade="all, delete-orphan"))