[Sqlalchemy-commits] [1465] sqlalchemy/branches/schema/test: fixes to keep decorated __init__ method
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1465] sqlalchemy/branches/schema/test: fixes to keep decorated __init__ method on the class local to the classes correct mapper, some selectresults fixes, unittests
<!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>[1465] sqlalchemy/branches/schema/test: fixes to keep decorated __init__ method on the class local to the classes correct mapper, some selectresults fixes, unittests</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1465</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-15 19:13:50 -0500 (Mon, 15 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>fixes to keep decorated __init__ method on the class local to the classes correct mapper, some selectresults fixes, unittests</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyextselectresultspy">sqlalchemy/branches/schema/lib/sqlalchemy/ext/selectresults.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py</a></li> <li><a href="#sqlalchemybranchesschematestalltestspy">sqlalchemy/branches/schema/test/alltests.py</a></li> <li><a href="#sqlalchemybranchesschematestmapperpy">sqlalchemy/branches/schema/test/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyextselectresultspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/ext/selectresults.py (1464 => 1465)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/ext/selectresults.py 2006-05-15 23:48:45 UTC (rev 1464) +++ sqlalchemy/branches/schema/lib/sqlalchemy/ext/selectresults.py 2006-05-16 00:13:50 UTC (rev 1465) </span><span class="lines">@@ -5,7 +5,7 @@ </span><span class="cx"> </span><span class="cx"> class SelectResultsExt(orm.MapperExtension): </span><span class="cx"> def select_by(self, query, *args, **params): </span><del>- return SelectResults(query, query._by_clause(*args, **params)) </del><ins>+ return SelectResults(query, query.join_by(*args, **params)) </ins><span class="cx"> def select(self, query, arg=None, **kwargs): </span><span class="cx"> if arg is not None and isinstance(arg, sql.Selectable): </span><span class="cx"> return orm.EXT_PASS </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py (1464 => 1465)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-15 23:48:45 UTC (rev 1464) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-05-16 00:13:50 UTC (rev 1465) </span><span class="lines">@@ -322,10 +322,8 @@ </span><span class="cx"> instance._entity_name = self.entity_name </span><span class="cx"> </span><span class="cx"> def _init_class(self): </span><del>- """sets up our classes' overridden __init__ method, this mappers hash key as its - '_mapper' property, and our columns as its 'c' property. if the class already had a - mapper, the old __init__ method is kept the same.""" - ext = self.extension </del><ins>+ """decorates the __init__ method on the mapped class to include auto-session attachment logic, + and assocites this Mapper with its class via the mapper_registry.""" </ins><span class="cx"> oldinit = self.class_.__init__ </span><span class="cx"> def init(self, *args, **kwargs): </span><span class="cx"> self._entity_name = kwargs.pop('_sa_entity_name', None) </span><span class="lines">@@ -337,15 +335,19 @@ </span><span class="cx"> if kwargs.has_key('_sa_session'): </span><span class="cx"> session = kwargs.pop('_sa_session') </span><span class="cx"> else: </span><del>- session = ext.get_session() - if session is EXT_PASS: </del><ins>+ # works for whatever mapper the class is associated with + mapper = mapper_registry.get(ClassKey(self.__class__, self._entity_name)) + if mapper is not None: + session = mapper.extension.get_session() + if session is EXT_PASS: + session = None + else: </ins><span class="cx"> session = None </span><span class="cx"> if session is not None: </span><span class="cx"> session._register_new(self) </span><span class="cx"> if oldinit is not None: </span><span class="cx"> oldinit(self, *args, **kwargs) </span><del>- # override oldinit, insuring that its not already one of our - # own modified inits </del><ins>+ # override oldinit, insuring that its not already a Mapper-decorated init method </ins><span class="cx"> if oldinit is None or not hasattr(oldinit, '_sa_mapper_init'): </span><span class="cx"> init._sa_mapper_init = True </span><span class="cx"> self.class_.__init__ = init </span></span></pre></div> <a id="sqlalchemybranchesschematestalltestspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/alltests.py (1464 => 1465)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/alltests.py 2006-05-15 23:48:45 UTC (rev 1464) +++ sqlalchemy/branches/schema/test/alltests.py 2006-05-16 00:13:50 UTC (rev 1465) </span><span class="lines">@@ -14,7 +14,6 @@ </span><span class="cx"> </span><span class="cx"> # connectivity, execution </span><span class="cx"> 'pool', </span><del>- 'engine', </del><span class="cx"> 'transaction', </span><span class="cx"> </span><span class="cx"> # schema/tables </span></span></pre></div> <a id="sqlalchemybranchesschematestmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/mapper.py (1464 => 1465)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/mapper.py 2006-05-15 23:48:45 UTC (rev 1464) +++ sqlalchemy/branches/schema/test/mapper.py 2006-05-16 00:13:50 UTC (rev 1465) </span><span class="lines">@@ -84,13 +84,14 @@ </span><span class="cx"> u2 = s.get(User, 7) </span><span class="cx"> self.assert_(u is not u2) </span><span class="cx"> </span><del>- </del><span class="cx"> def testrefresh(self): </span><span class="cx"> mapper(User, users, properties={'addresses':relation(mapper(Address, addresses))}) </span><span class="cx"> s = create_session() </span><span class="cx"> u = s.get(User, 7) </span><span class="cx"> u.user_name = 'foo' </span><span class="cx"> a = Address() </span><ins>+ import sqlalchemy.orm.session + assert sqlalchemy.orm.session.object_session(a) is None </ins><span class="cx"> u.addresses.append(a) </span><span class="cx"> </span><span class="cx"> self.assert_(a in u.addresses) </span></span></pre> </div> </div> </body> </html> |
