Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[server] hold connection to the db in tx_actions
authorJulien Cristau <julien.cristau@logilab.fr>
Mon, 15 Sep 2014 10:06:07 +0200
changeset 9996 65bb21409292
parent 9995 c9f1111e0ee8
child 9997 1ad8e2ebaf5c
[server] hold connection to the db in tx_actions We can be called without a cnxset (e.g. from repoapi).
server/sources/native.py file | annotate | diff | comparison | revisions
server/test/unittest_undo.py file | annotate | diff | comparison | revisions 
--- a/server/sources/native.py	Mon Sep 15 17:23:22 2014 +0200
+++ b/server/sources/native.py	Mon Sep 15 10:06:07 2014 +0200
@@ -1017,14 +1017,16 @@
         sql = self.sqlgen.select('tx_entity_actions', restr,
                                  ('txa_action', 'txa_public', 'txa_order',
                                   'etype', 'eid', 'changes'))
-        cu = self.doexec(cnx, sql, restr)
-        actions = [tx.EntityAction(a,p,o,et,e,c and loads(self.binary_to_str(c)))
-                   for a,p,o,et,e,c in cu.fetchall()]
+        with cnx.ensure_cnx_set:
+            cu = self.doexec(cnx, sql, restr)
+            actions = [tx.EntityAction(a,p,o,et,e,c and loads(self.binary_to_str(c)))
+                       for a,p,o,et,e,c in cu.fetchall()]
         sql = self.sqlgen.select('tx_relation_actions', restr,
                                  ('txa_action', 'txa_public', 'txa_order',
                                   'rtype', 'eid_from', 'eid_to'))
-        cu = self.doexec(cnx, sql, restr)
-        actions += [tx.RelationAction(*args) for args in cu.fetchall()]
+        with cnx.ensure_cnx_set:
+            cu = self.doexec(cnx, sql, restr)
+            actions += [tx.RelationAction(*args) for args in cu.fetchall()]
         return sorted(actions, key=lambda x: x.order)
 
     def undo_transaction(self, cnx, txuuid):
--- a/server/test/unittest_undo.py	Mon Sep 15 17:23:22 2014 +0200
+++ b/server/test/unittest_undo.py	Mon Sep 15 10:06:07 2014 +0200
@@ -75,6 +75,8 @@
         self.assertTrue(self.txuuid)
         # test transaction api
         with self.admin_access.client_cnx() as cnx:
+            tx_actions = cnx.transaction_actions(self.txuuid)
+            self.assertEqual(len(tx_actions), 2, tx_actions)
             self.assertRaises(NoSuchTransaction,
                               cnx.transaction_info, 'hop')
             self.assertRaises(NoSuchTransaction,
cubicweb