# HG changeset patch # User Sylvain Thénault # Date 1255416651 -7200 # Node ID 665c3754406022f59cda0b9fa0d4688d0b0edf66 # Parent 2941f4a0aab9505855a6e3063249538c1fb97b69 on entity deletion query, return eids of deleted entities diff -r 2941f4a0aab9 -r 665c37544060 server/ssplanner.py --- a/server/ssplanner.py Tue Oct 13 08:50:19 2009 +0200 +++ b/server/ssplanner.py Tue Oct 13 08:50:51 2009 +0200 @@ -376,6 +376,7 @@ def execute(self): """execute this step""" + results = self.execute_child() todelete = frozenset(typed_eid(eid) for eid, in self.execute_child()) session = self.plan.session delete = session.repo.glob_delete_entity @@ -385,7 +386,7 @@ pending |= actual for eid in actual: delete(session, eid) - + return results class DeleteRelationsStep(Step): """step consisting in deleting relations""" diff -r 2941f4a0aab9 -r 665c37544060 server/test/unittest_querier.py --- a/server/test/unittest_querier.py Tue Oct 13 08:50:19 2009 +0200 +++ b/server/test/unittest_querier.py Tue Oct 13 08:50:51 2009 +0200 @@ -907,7 +907,8 @@ self.execute("INSERT Personne Y: Y nom 'toto'") rset = self.execute('Personne X WHERE X nom "toto"') self.assertEqual(len(rset.rows), 1) - self.execute("DELETE Personne Y WHERE Y nom 'toto'") + drset = self.execute("DELETE Personne Y WHERE Y nom 'toto'") + self.assertEqual(drset.rows, rset.rows) rset = self.execute('Personne X WHERE X nom "toto"') self.assertEqual(len(rset.rows), 0)