[Sqlalchemy-commits] [1499] sqlalchemy/branches/schema/test: more fixes to dependency sorting
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1499] sqlalchemy/branches/schema/test: more fixes to dependency sorting
|
From: <co...@sq...> - 2006-05-24 21:53:31
|
<!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>[1499] sqlalchemy/branches/schema/test: more fixes to dependency sorting</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1499</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-24 16:53:18 -0500 (Wed, 24 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>more fixes to dependency sorting</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormdependencypy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/dependency.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormunitofworkpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/unitofwork.py</a></li> <li><a href="#sqlalchemybranchesschematestcascadepy">sqlalchemy/branches/schema/test/cascade.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyormdependencypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/dependency.py (1498 => 1499)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/dependency.py 2006-05-24 18:42:09 UTC (rev 1498) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/dependency.py 2006-05-24 21:53:18 UTC (rev 1499) </span><span class="lines">@@ -359,6 +359,8 @@ </span><span class="cx"> for the many-to-many update task.""" </span><span class="cx"> def __init__(self, mapper): </span><span class="cx"> self.mapper = mapper </span><ins>+ def register_dependencies(self, uowcommit): + pass </ins><span class="cx"> def save_obj(self, *args, **kwargs): </span><span class="cx"> pass </span><span class="cx"> def delete_obj(self, *args, **kwargs): </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormunitofworkpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/unitofwork.py (1498 => 1499)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/unitofwork.py 2006-05-24 18:42:09 UTC (rev 1498) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/unitofwork.py 2006-05-24 21:53:18 UTC (rev 1499) </span><span class="lines">@@ -325,7 +325,9 @@ </span><span class="cx"> try: </span><span class="cx"> return self.tasks[mapper] </span><span class="cx"> except KeyError: </span><del>- return UOWTask(self, mapper) </del><ins>+ task = UOWTask(self, mapper) + task.mapper.register_dependencies(self) + return task </ins><span class="cx"> </span><span class="cx"> def register_dependency(self, mapper, dependency): </span><span class="cx"> """called by mapper.PropertyLoader to register the objects handled by </span><span class="lines">@@ -355,8 +357,8 @@ </span><span class="cx"> </span><span class="cx"> def execute(self, echo=False): </span><span class="cx"> # tell all related mappers to set up dependency processors </span><del>- for task in self.tasks.values(): - task.mapper.register_dependencies(self) </del><ins>+ #for task in self.tasks.values(): + # task.mapper.register_dependencies(self) </ins><span class="cx"> </span><span class="cx"> # pre-execute dependency processors. this process may </span><span class="cx"> # result in new tasks and/or dependency processors being added, </span></span></pre></div> <a id="sqlalchemybranchesschematestcascadepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/cascade.py (1498 => 1499)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/cascade.py 2006-05-24 18:42:09 UTC (rev 1498) +++ sqlalchemy/branches/schema/test/cascade.py 2006-05-24 21:53:18 UTC (rev 1499) </span><span class="lines">@@ -7,13 +7,15 @@ </span><span class="cx"> class O2MCascadeTest(testbase.AssertMixin): </span><span class="cx"> def tearDown(self): </span><span class="cx"> ctx.current.clear() </span><ins>+ tables.delete() </ins><span class="cx"> </span><span class="cx"> def tearDownAll(self): </span><span class="cx"> clear_mappers() </span><del>- </del><ins>+ tables.drop() + </ins><span class="cx"> def setUpAll(self): </span><span class="cx"> global ctx, data </span><del>- ctx = SessionContext(create_session) </del><ins>+ ctx = SessionContext(lambda: create_session(echo_uow=True)) </ins><span class="cx"> tables.create() </span><span class="cx"> mapper(tables.User, tables.users, properties = dict( </span><span class="cx"> address = relation(mapper(tables.Address, tables.addresses), lazy = False, uselist = False, private = True), </span><span class="lines">@@ -71,11 +73,6 @@ </span><span class="cx"> ctx.current.flush() </span><span class="cx"> ctx.current.clear() </span><span class="cx"> </span><del>- def tearDown(self): - tables.delete() - - def tearDownAll(self): - clear_mappers() </del><span class="cx"> </span><span class="cx"> def testdelete(self): </span><span class="cx"> l = ctx.current.query(tables.User).select() </span><span class="lines">@@ -118,7 +115,8 @@ </span><span class="cx"> </span><span class="cx"> def tearDownAll(self): </span><span class="cx"> clear_mappers() </span><del>- </del><ins>+ metadata.drop_all() + </ins><span class="cx"> def setUpAll(self): </span><span class="cx"> global ctx, data, metadata, User, Pref </span><span class="cx"> ctx = SessionContext(create_session) </span></span></pre> </div> </div> </body> </html> |
