cubicweb: comparison server/sources/pyrorql.py

equal deleted inserted replaced

-:6a9e66d788b3
+:26695dd703d8
 if dexturi == 'system' or not (
 dexturi in self.repo.sources_by_uri or self._skip_externals):
 return self.repo.extid2eid(self, str(extid), etype, session), True
 if dexturi in self.repo.sources_by_uri:
 source = self.repo.sources_by_uri[dexturi]
-cnx = session.pool.connection(source.uri)
+cnx = session.cnxset.connection(source.uri)
 eid = source.local_eid(cnx, dextid, session)[0]
 return eid, False
 return None, None
 def synchronize(self, mtime=None):
 def check_connection(self, cnx):
 """check connection validity, return None if the connection is still valid
 else a new connection
 """
 # we have to transfer manually thread ownership. This can be done safely
-# since the pool to which belong the connection is affected to one
+# since the connections set holding the connection is affected to one
 # session/thread and can't be called simultaneously
 try:
 cnx._repo._transferThread(threading.currentThread())
 except AttributeError:
 # inmemory connection
 results (but not the results themselves) may be cached using this key.
 """
 if not args is None:
 args = args.copy()
 # get cached cursor anyway
-cu = session.pool[self.uri]
+cu = session.cnxset[self.uri]
 if cu is None:
 # this is a ConnectionWrapper instance
 msg = session._("can't connect to source %s, some data may be missing")
 session.set_shared_data('sources_error', msg % self.uri)
 return []
 for i, etype in enumerate(descr[0]):
 if (etype is None or not self.schema.eschema(etype).final
 or uidtype(union, i, etype, args)):
 needtranslation.append(i)
 if needtranslation:
-cnx = session.pool.connection(self.uri)
+cnx = session.cnxset.connection(self.uri)
 for rowindex in xrange(rset.rowcount - 1, -1, -1):
 row = rows[rowindex]
 localrow = False
 for colindex in needtranslation:
 if row[colindex] is not None: # optional variable
 raise NotImplementedError()
 def update_entity(self, session, entity):
 """update an entity in the source"""
 relations, kwargs = self._entity_relations_and_kwargs(session, entity)
-cu = session.pool[self.uri]
+cu = session.cnxset[self.uri]
 cu.execute('SET %s WHERE X eid %%(x)s' % ','.join(relations), kwargs)
 self._query_cache.clear()
 entity.cw_clear_all_caches()
 def delete_entity(self, session, entity):
 """delete an entity from the source"""
-cu = session.pool[self.uri]
+cu = session.cnxset[self.uri]
 cu.execute('DELETE %s X WHERE X eid %%(x)s' % entity.__regid__,
 {'x': self.eid2extid(entity.eid, session)})
 self._query_cache.clear()
 def add_relation(self, session, subject, rtype, object):
 """add a relation to the source"""
-cu = session.pool[self.uri]
+cu = session.cnxset[self.uri]
 cu.execute('SET X %s Y WHERE X eid %%(x)s, Y eid %%(y)s' % rtype,
 {'x': self.eid2extid(subject, session),
 'y': self.eid2extid(object, session)})
 self._query_cache.clear()
 session.entity_from_eid(subject).cw_clear_all_caches()
 session.entity_from_eid(object).cw_clear_all_caches()
 def delete_relation(self, session, subject, rtype, object):
 """delete a relation from the source"""
-cu = session.pool[self.uri]
+cu = session.cnxset[self.uri]
 cu.execute('DELETE X %s Y WHERE X eid %%(x)s, Y eid %%(y)s' % rtype,
 {'x': self.eid2extid(subject, session),
 'y': self.eid2extid(object, session)})
 self._query_cache.clear()
 session.entity_from_eid(subject).cw_clear_all_caches()

changeset 7398	26695dd703d8
parent 7293	97505b798975
child 7399	972ed1843bd8