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

fix feed cleanup

Browse Source
This commit is contained in:
Athou
2013-07-28 14:35:10 +02:00
parent e3e476555a
commit 7ad9c24879
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,6 @@ 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

@@ -4,7 +4,6 @@ import java.util.Date;
import java.util.List; import java.util.List;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.Query;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression; import javax.persistence.criteria.Expression;
@@ -87,12 +86,6 @@ 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());
@@ -105,10 +98,7 @@ public class FeedDAO extends GenericDAO<Feed> {
List<Feed> list = q.getResultList(); List<Feed> list = q.getResultList();
int deleted = list.size(); int deleted = list.size();
for (Feed feed : list) { delete(list);
deleteRelationships(feed);
delete(feed);
}
return deleted; return deleted;
} }