diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-08-17 17:59:08 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-08-17 17:59:08 +0000 |
| commit | 95748cfc024a9fa875c0ec9323ec5266bb4725c5 (patch) | |
| tree | 6473ca891975813e5abea96912a2fdc20a6dce48 /lib/sqlalchemy/pool.py | |
| parent | 3469724a42acff29c8e064b3cfaf8d073790624b (diff) | |
| download | sqlalchemy-95748cfc024a9fa875c0ec9323ec5266bb4725c5.tar.gz | |
- added extra argument con_proxy to ConnectionListener interface checkout/checkin methods
- changed testing connection closer to work on _ConnectionFairy instances, resulting in
pool checkins, not actual closes
- disabled session two phase test for now, needs work
- added some two-phase support to TLEngine, not tested
- TLTransaction is now a wrapper
Diffstat (limited to 'lib/sqlalchemy/pool.py')
| -rw-r--r-- | lib/sqlalchemy/pool.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py index 5dbee8993..b3fe2c09b 100644 --- a/lib/sqlalchemy/pool.py +++ b/lib/sqlalchemy/pool.py @@ -318,7 +318,7 @@ class _ConnectionFairy(object): while attempts > 0: try: for l in self._pool._on_checkout: - l.checkout(self.connection, self._connection_record) + l.checkout(self.connection, self._connection_record, self) return self except exceptions.DisconnectionError, e: self._pool.log( @@ -372,7 +372,7 @@ class _ConnectionFairy(object): self._pool.log("Connection %s being returned to pool" % repr(self.connection)) if self._pool._on_checkin: for l in self._pool._on_checkin: - l.checkin(self.connection, self._connection_record) + l.checkin(self.connection, self._connection_record, self) self._pool.return_conn(self) self.connection = None self._connection_record = None |