Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete relationships before deleting the feed reference

Browse Source
This commit is contained in:
Athou
2013-07-08 07:44:43 +02:00
parent e3adc676df
commit d361d689e8
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/commafeed/backend/DatabaseCleaner.java
View File

@@ -79,6 +79,7 @@ public class DatabaseCleaner {
sub.setFeed(into); sub.setFeed(into);
} }
feedSubscriptionDAO.saveOrUpdate(subs); feedSubscriptionDAO.saveOrUpdate(subs);
feedDAO.deleteRelationships(feed);
feedDAO.delete(feed); feedDAO.delete(feed);
} }
feedDAO.saveOrUpdate(into); feedDAO.saveOrUpdate(into);

12
src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -96,6 +96,13 @@ public class FeedDAO extends GenericDAO<Feed> {
return findByField(Feed_.pushTopicHash, DigestUtils.sha1Hex(topic)); return findByField(Feed_.pushTopicHash, DigestUtils.sha1Hex(topic));
} }
public void deleteRelationships(Feed feed) {
Query relationshipDeleteQuery = em
.createNamedQuery("Feed.deleteEntryRelationships");
relationshipDeleteQuery.setParameter("feedId", feed.getId());
relationshipDeleteQuery.executeUpdate();
}
public int deleteWithoutSubscriptions(int max) { public int deleteWithoutSubscriptions(int max) {
CriteriaQuery<Feed> query = builder.createQuery(getType()); CriteriaQuery<Feed> query = builder.createQuery(getType());
Root<Feed> root = query.from(getType()); Root<Feed> root = query.from(getType());
@@ -110,10 +117,7 @@ public class FeedDAO extends GenericDAO<Feed> {
int deleted = list.size(); int deleted = list.size();
for (Feed feed : list) { for (Feed feed : list) {
Query relationshipDeleteQuery = em deleteRelationships(feed);
.createNamedQuery("Feed.deleteEntryRelationships");
relationshipDeleteQuery.setParameter("feedId", feed.getId());
relationshipDeleteQuery.executeUpdate();
delete(feed); delete(feed);
} }
return deleted; return deleted;