[Sqlalchemy-commits] [1144] sqlalchemy/trunk: added unique_connection() method to engine, connection
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1144] sqlalchemy/trunk: added unique_connection() method to engine, connection pool to return a connection
|
From: <co...@sq...> - 2006-03-14 19:51:15
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[1144] sqlalchemy/trunk: added unique_connection() method to engine, connection pool to return a connection</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1144</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-14 13:51:03 -0600 (Tue, 14 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>added unique_connection() method to engine, connection pool to return a connection that is not part of the thread-local context or any current transaction</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkCHANGES">sqlalchemy/trunk/CHANGES</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyenginepy">sqlalchemy/trunk/lib/sqlalchemy/engine.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemypoolpy">sqlalchemy/trunk/lib/sqlalchemy/pool.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkCHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/CHANGES (1143 => 1144)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/CHANGES 2006-03-14 16:56:05 UTC (rev 1143) +++ sqlalchemy/trunk/CHANGES 2006-03-14 19:51:03 UTC (rev 1144) </span><span class="lines">@@ -1,6 +1,8 @@ </span><span class="cx"> 0.1.5 </span><span class="cx"> - fixed attributes bug where if an object is committed, its lazy-loaded list got </span><span class="cx"> blown away if it hadnt been loaded </span><ins>+- added unique_connection() method to engine, connection pool to return a connection +that is not part of the thread-local context or any current transaction </ins><span class="cx"> </span><span class="cx"> 0.1.4 </span><span class="cx"> - create_engine() now uses genericized parameters; host/hostname, db/dbname/database, </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyenginepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/engine.py (1143 => 1144)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/engine.py 2006-03-14 16:56:05 UTC (rev 1143) +++ sqlalchemy/trunk/lib/sqlalchemy/engine.py 2006-03-14 19:51:03 UTC (rev 1144) </span><span class="lines">@@ -395,6 +395,10 @@ </span><span class="cx"> """returns a managed DBAPI connection from this SQLEngine's connection pool.""" </span><span class="cx"> return self._pool.connect() </span><span class="cx"> </span><ins>+ def unique_connection(self): + """returns a DBAPI connection from this SQLEngine's connection pool that is distinct from the current thread's connection.""" + return self._pool.unique_connection() + </ins><span class="cx"> def multi_transaction(self, tables, func): </span><span class="cx"> """provides a transaction boundary across tables which may be in multiple databases. </span><span class="cx"> If you have three tables, and a function that operates upon them, providing the tables as a </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemypoolpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/pool.py (1143 => 1144)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/pool.py 2006-03-14 16:56:05 UTC (rev 1143) +++ sqlalchemy/trunk/lib/sqlalchemy/pool.py 2006-03-14 19:51:03 UTC (rev 1144) </span><span class="lines">@@ -75,7 +75,10 @@ </span><span class="cx"> self._use_threadlocal = use_threadlocal </span><span class="cx"> self._echo = echo </span><span class="cx"> self._logger = logger or util.Logger(origin='pool') </span><del>- </del><ins>+ + def unique_connection(self): + return ConnectionFairy(self) + </ins><span class="cx"> def connect(self): </span><span class="cx"> if not self._use_threadlocal: </span><span class="cx"> return ConnectionFairy(self) </span><span class="lines">@@ -120,14 +123,17 @@ </span><span class="cx"> self.logger.write(msg) </span><span class="cx"> </span><span class="cx"> class ConnectionFairy(object): </span><del>- def __init__(self, pool): </del><ins>+ def __init__(self, pool, connection=None): </ins><span class="cx"> self.pool = pool </span><del>- try: - self.connection = pool.get() - except: - self.connection = None - self.pool.return_invalid() - raise </del><ins>+ if connection is not None: + self.connection = connection + else: + try: + self.connection = pool.get() + except: + self.connection = None + self.pool.return_invalid() + raise </ins><span class="cx"> def cursor(self): </span><span class="cx"> return CursorFairy(self, self.connection.cursor()) </span><span class="cx"> def __getattr__(self, key): </span><span class="lines">@@ -157,6 +163,9 @@ </span><span class="cx"> def status(self): </span><span class="cx"> return "SingletonThreadPool size: %d" % len(self._conns) </span><span class="cx"> </span><ins>+ def unique_connection(self): + return ConnectionFairy(self, self._creator()) + </ins><span class="cx"> def do_return_conn(self, conn): </span><span class="cx"> pass </span><span class="cx"> def do_return_invalid(self): </span></span></pre> </div> </div> </body> </html> |
