cubicweb: comparison dbapi.py

equal deleted inserted replaced

-:384d34e76d6d
+:4495b9bc49df
 if eid_key is not None:
 warn('[3.8] eid_key is deprecated, you can safely remove this argument',
 DeprecationWarning, stacklevel=2)
 # XXX use named argument for build_descr in case repo is < 3.8
 rset = self._repo.execute(self._sessid, rql, args,
-build_descr=build_descr, txid=self._txid())
+build_descr=build_descr, **self._txid())
 rset.req = self.req
 return rset
 class LogCursor(Cursor):
 self._close_on_del = getattr(cnxprops, 'close_on_del', True)
 self._cnxtype = getattr(cnxprops, 'cnxtype', 'pyro')
 if cnxprops and cnxprops.log_queries:
 self.executed_queries = []
 self.cursor_class = LogCursor
+if self._cnxtype == 'pyro':
+# check client/server compat
+if self._repo.get_versions()['cubicweb'] < (3, 8, 6):
+self._txid = lambda cursor=None: {}
 def __repr__(self):
 if self.anonymous_connection:
 return '<Connection %s (anonymous)>' % self.sessionid
 return '<Connection %s>' % self.sessionid
 else:
 self.rollback()
 return False #propagate the exception
 def _txid(self, cursor=None): # XXX could now handle various isolation level!
-return currentThread().getName()
+# return a dict as bw compat trick
+return {'txid': currentThread().getName()}
 def request(self):
 return DBAPIRequest(self.vreg, DBAPISession(self))
 def check(self):
 pass
 def describe(self, eid):
 if self._closed is not None:
 raise ProgrammingError('Closed connection')
-return self._repo.describe(self.sessionid, eid, txid=self._txid())
+return self._repo.describe(self.sessionid, eid, **self._txid())
 def close(self):
 """Close the connection now (rather than whenever __del__ is called).
 The connection will be unusable from this point forward; an Error (or
 connection.  Note that closing a connection without committing the
 changes first will cause an implicit rollback to be performed.
 """
 if self._closed:
 raise ProgrammingError('Connection is already closed')
-self._repo.close(self.sessionid, txid=self._txid())
+self._repo.close(self.sessionid, **self._txid())
 del self._repo # necessary for proper garbage collection
 self._closed = 1
 def commit(self):
 """Commit pending transaction for this connection to the repository.
 If the transaction is undoable, a transaction id will be returned.
 """
 if not self._closed is None:
 raise ProgrammingError('Connection is already closed')
-return self._repo.commit(self.sessionid, txid=self._txid())
+return self._repo.commit(self.sessionid, **self._txid())
 def rollback(self):
 """This method is optional since not all databases provide transaction
 support.
 a connection without committing the changes first will cause an implicit
 rollback to be performed.
 """
 if not self._closed is None:
 raise ProgrammingError('Connection is already closed')
-self._repo.rollback(self.sessionid, txid=self._txid())
+self._repo.rollback(self.sessionid, **self._txid())
 def cursor(self, req=None):
 """Return a new Cursor Object using the connection.
 On pyro connection, you should get cursor after calling if
 * `public`: when additional filtering is provided, their are by default
 only searched in 'public' actions, unless a `public` argument is given
 and set to false.
 """
+actionfilters.update(self._txid())
 txinfos = self._repo.undoable_transactions(self.sessionid, ueid,
-txid=self._txid(),
 **actionfilters)
 if req is None:
 req = self.request()
 for txinfo in txinfos:
 txinfo.req = req
 raise `NoSuchTransaction` if not found or if session's user is not
 allowed (eg not in managers group and the transaction doesn't belong to
 him).
 """
 txinfo = self._repo.transaction_info(self.sessionid, txuuid,
-txid=self._txid())
+**self._txid())
 if req is None:
 req = self.request()
 txinfo.req = req
 return txinfo
 raise `NoSuchTransaction` if the transaction is not found or if
 session's user is not allowed (eg not in managers group and the
 transaction doesn't belong to him).
 """
 return self._repo.transaction_actions(self.sessionid, txuuid, public,
-txid=self._txid())
+**self._txid())
 def undo_transaction(self, txuuid):
 """Undo the given transaction. Return potential restoration errors.
 raise `NoSuchTransaction` if not found or if session's user is not
 allowed (eg not in managers group and the transaction doesn't belong to
 him).
 """
 return self._repo.undo_transaction(self.sessionid, txuuid,
-txid=self._txid())
+**self._txid())

changeset 5863	4495b9bc49df
parent 5815	282194aa43f3
parent 5859	3da3574fe397
child 6012	d56fd78006cd
child 6061	7cb29eab1c9d