From cefe19e9027ac16c769008269bc8c00ce185373c Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Fri, 4 Sep 2015 09:30:55 -0400
Subject: [PATCH] Revert "Fix dataset-purge Paster command"

---
 ckan/lib/cli.py     | 10 ----------
 ckan/model/group.py | 11 +++++------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py
index 968e078e47c..fe976ed6420 100644
--- a/ckan/lib/cli.py
+++ b/ckan/lib/cli.py
@@ -18,7 +18,6 @@
 import paste.script
 from paste.registry import Registry
 from paste.script.util.logging_config import fileConfig
-from sqlalchemy import or_, and_
 
 #NB No CKAN imports are allowed until after the config file is loaded.
 #   i.e. do the imports in methods, after _load_config is called.
@@ -926,16 +925,7 @@ def purge(self, dataset_ref):
         name = dataset.name
 
         rev = model.repo.new_revision()
-
-        # Purge membership to several groups
-        q_member = model.Session.query(model.Member).filter(and_(
-            model.Member.table_name == 'package',
-            model.Member.table_id == dataset.id))
-        for memb in q_member.all():
-            memb.purge()
-        # Purge actual dataset
         dataset.purge()
-
         model.repo.commit_and_remove()
         print '%s purged' % name
 
diff --git a/ckan/model/group.py b/ckan/model/group.py
index 98843e1d9ea..0d2102375f2 100644
--- a/ckan/model/group.py
+++ b/ckan/model/group.py
@@ -102,14 +102,13 @@ def related_packages(self):
             id=self.table_id).all()
 
     def __unicode__(self):
-        # Try to refer to objects by name, not ID, to help debugging
-        # Note A referenced object may be already deleted into the same transaction 
+        # refer to objects by name, not ID, to help debugging
         if self.table_name == 'package':
-            pkg = meta.Session.query(_package.Package).get(self.table_id)
-            table_info = 'package=%s' % (pkg.name if pkg else self.table_id)
+            table_info = 'package=%s' % meta.Session.query(_package.Package).\
+                get(self.table_id).name
         elif self.table_name == 'group':
-            grp = meta.Session.query(Group).get(self.table_id)
-            table_info = 'group=%s' % (grp.name if grp else self.table_id)
+            table_info = 'group=%s' % meta.Session.query(Group).\
+                get(self.table_id).name
         else:
             table_info = 'table_name=%s table_id=%s' % (self.table_name,
                                                         self.table_id)