diff --git a/src/main/java/com/commafeed/backend/DatabaseCleaner.java b/src/main/java/com/commafeed/backend/DatabaseCleaner.java index 21833318..a3a02b8c 100644 --- a/src/main/java/com/commafeed/backend/DatabaseCleaner.java +++ b/src/main/java/com/commafeed/backend/DatabaseCleaner.java @@ -96,7 +96,6 @@ public class DatabaseCleaner { sub.setFeed(into); } feedSubscriptionDAO.saveOrUpdate(subs); - feedDAO.deleteRelationships(feed); feedDAO.delete(feed); } feedDAO.saveOrUpdate(into); diff --git a/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/src/main/java/com/commafeed/backend/dao/FeedDAO.java index 78b6884b..4b08b7f2 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedDAO.java @@ -4,7 +4,6 @@ import java.util.Date; import java.util.List; import javax.ejb.Stateless; -import javax.persistence.Query; import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Expression; @@ -87,12 +86,6 @@ public class FeedDAO extends GenericDAO { 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) { CriteriaQuery query = builder.createQuery(getType()); Root root = query.from(getType()); @@ -105,10 +98,7 @@ public class FeedDAO extends GenericDAO { List list = q.getResultList(); int deleted = list.size(); - for (Feed feed : list) { - deleteRelationships(feed); - delete(feed); - } + delete(list); return deleted; }