equal
deleted
inserted
replaced
40 from cubicweb.utils import QueryCache, RepeatList |
40 from cubicweb.utils import QueryCache, RepeatList |
41 from cubicweb.server.utils import cleanup_solutions |
41 from cubicweb.server.utils import cleanup_solutions |
42 from cubicweb.server.rqlannotation import SQLGenAnnotator, set_qdata |
42 from cubicweb.server.rqlannotation import SQLGenAnnotator, set_qdata |
43 from cubicweb.server.ssplanner import READ_ONLY_RTYPES, add_types_restriction |
43 from cubicweb.server.ssplanner import READ_ONLY_RTYPES, add_types_restriction |
44 from cubicweb.server.edition import EditedEntity |
44 from cubicweb.server.edition import EditedEntity |
45 from cubicweb.server.session import security_enabled |
|
46 |
45 |
47 |
46 |
48 ETYPE_PYOBJ_MAP[Binary] = 'Bytes' |
47 ETYPE_PYOBJ_MAP[Binary] = 'Bytes' |
49 |
48 |
50 |
49 |
260 args.update(self.args) |
259 args.update(self.args) |
261 self.args = args |
260 self.args = args |
262 cached = True |
261 cached = True |
263 else: |
262 else: |
264 noinvariant = set() |
263 noinvariant = set() |
265 with security_enabled(self.session, read=False): |
264 with self.session.security_enabled(read=False): |
266 self._insert_security(union, noinvariant) |
265 self._insert_security(union, noinvariant) |
267 if key is not None: |
266 if key is not None: |
268 self.session.transaction_data[key] = (union, self.args) |
267 self.session.transaction_data[key] = (union, self.args) |
269 else: |
268 else: |
270 noinvariant = () |
269 noinvariant = () |