[Sqlalchemy-commits] [1538] sqlalchemy/trunk/test: extra tests...
Brought to you by:
zzzeek
From: <co...@sq...> - 2006-05-28 19:02:23
|
<!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>[1538] sqlalchemy/trunk/test: extra tests...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1538</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-28 14:02:09 -0500 (Sun, 28 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>extra tests...</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyenginethreadlocalpy">sqlalchemy/trunk/lib/sqlalchemy/engine/threadlocal.py</a></li> <li><a href="#sqlalchemytrunktestparseconnectpy">sqlalchemy/trunk/test/parseconnect.py</a></li> <li><a href="#sqlalchemytrunktesttestbasepy">sqlalchemy/trunk/test/testbase.py</a></li> <li><a href="#sqlalchemytrunktesttransactionpy">sqlalchemy/trunk/test/transaction.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyenginethreadlocalpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/engine/threadlocal.py (1537 => 1538)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/engine/threadlocal.py 2006-05-28 18:01:22 UTC (rev 1537) +++ sqlalchemy/trunk/lib/sqlalchemy/engine/threadlocal.py 2006-05-28 19:02:09 UTC (rev 1538) </span><span class="lines">@@ -14,7 +14,12 @@ </span><span class="cx"> try: </span><span class="cx"> return self.__transaction </span><span class="cx"> except AttributeError: </span><del>- return base.Connection(self.engine, close_with_result=close_with_result) </del><ins>+ return TLConnection(self, close_with_result=close_with_result) + def set_transaction(self, tlconnection, trans): + if self.__tcount == 0: + self.__transaction = tlconnection + self.__trans = trans + self.__tcount += 1 </ins><span class="cx"> def begin(self): </span><span class="cx"> if self.__tcount == 0: </span><span class="cx"> self.__transaction = self.get_connection() </span><span class="lines">@@ -41,7 +46,12 @@ </span><span class="cx"> def is_begun(self): </span><span class="cx"> return self.__tcount > 0 </span><span class="cx"> </span><del>- </del><ins>+class TLConnection(base.Connection): + def __init__(self, session, close_with_result): + base.Connection.__init__(self, session.engine, close_with_result=close_with_result) + self.__session = session + # TODO: get begin() to communicate with the Session to maintain the same transactional state + </ins><span class="cx"> class TLEngine(base.ComposedSQLEngine): </span><span class="cx"> """a ComposedSQLEngine that includes support for thread-local managed transactions. This engine </span><span class="cx"> is better suited to be used with threadlocal Pool object.""" </span></span></pre></div> <a id="sqlalchemytrunktestparseconnectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/parseconnect.py (1537 => 1538)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/parseconnect.py 2006-05-28 18:01:22 UTC (rev 1537) +++ sqlalchemy/trunk/test/parseconnect.py 2006-05-28 19:02:09 UTC (rev 1538) </span><span class="lines">@@ -17,10 +17,12 @@ </span><span class="cx"> 'dbtype:///:memory:', </span><span class="cx"> 'dbtype:///foo/bar/im/a/file', </span><span class="cx"> 'dbtype:///E:/work/src/LEM/db/hello.db', </span><del>- 'dbtype://' </del><ins>+ 'dbtype://', + 'dbtype://username:password@/db' </ins><span class="cx"> ): </span><span class="cx"> u = url.make_url(text) </span><span class="cx"> print u, text </span><ins>+ print u.username, u.password, u.database </ins><span class="cx"> assert str(u) == text </span><span class="cx"> </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemytrunktesttestbasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/testbase.py (1537 => 1538)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/testbase.py 2006-05-28 18:01:22 UTC (rev 1537) +++ sqlalchemy/trunk/test/testbase.py 2006-05-28 19:02:09 UTC (rev 1538) </span><span class="lines">@@ -157,8 +157,6 @@ </span><span class="cx"> raise "Invalid" </span><span class="cx"> </span><span class="cx"> def do_get(self): </span><del>- if getattr(self, 'breakpoint', False): - raise "breakpoint" </del><span class="cx"> assert self.connection is not None </span><span class="cx"> c = self.connection </span><span class="cx"> self.connection = None </span></span></pre></div> <a id="sqlalchemytrunktesttransactionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/transaction.py (1537 => 1538)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/transaction.py 2006-05-28 18:01:22 UTC (rev 1537) +++ sqlalchemy/trunk/test/transaction.py 2006-05-28 19:02:09 UTC (rev 1538) </span><span class="lines">@@ -143,6 +143,13 @@ </span><span class="cx"> self.assert_(external_connection.scalar("select count(1) from query_users") == 0) </span><span class="cx"> finally: </span><span class="cx"> external_connection.close() </span><ins>+ + def testconnections(self): + """tests that contextual_connect is threadlocal""" + c1 = tlengine.contextual_connect() + c2 = tlengine.contextual_connect() + assert c1.connection is c2.connection + c1.close() </ins><span class="cx"> </span><span class="cx"> if __name__ == "__main__": </span><span class="cx"> testbase.main() </span></span></pre> </div> </div> </body> </html> |