[Sqlalchemy-commits] [1166] sqlalchemy/trunk/test: PropertyLoader will not re-determine direction wh
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1166] sqlalchemy/trunk/test: PropertyLoader will not re-determine direction when initialized a second time, as it is re-initialized as a copy made for an inheriting mapper, and no longer can get to the correct inheriting table.
<!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>[1166] sqlalchemy/trunk/test: PropertyLoader will not re-determine direction when initialized a second time, as it is re-initialized as a copy made for an inheriting mapper, and no longer can get to the correct inheriting table.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1166</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-17 18:12:59 -0600 (Fri, 17 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>PropertyLoader will not re-determine direction when initialized a second time, as it is re-initialized as a copy made for an inheriting mapper, and no longer can get to the correct inheriting table.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemytrunktestinheritancepy">sqlalchemy/trunk/test/inheritance.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py (1165 => 1166)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-17 23:56:54 UTC (rev 1165) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-18 00:12:59 UTC (rev 1166) </span><span class="lines">@@ -118,6 +118,7 @@ </span><span class="cx"> self.primaryjoin = primaryjoin </span><span class="cx"> self.secondaryjoin = secondaryjoin </span><span class="cx"> self.post_update = post_update </span><ins>+ self.direction = None </ins><span class="cx"> </span><span class="cx"> # would like to have foreignkey be a list. </span><span class="cx"> # however, have to figure out how to do </span><span class="lines">@@ -186,7 +187,10 @@ </span><span class="cx"> # but its possible that its reversed </span><span class="cx"> self._find_dependent() </span><span class="cx"> </span><del>- self.direction = self._get_direction() </del><ins>+ # if we are re-initializing, as in a copy made for an inheriting + # mapper, dont re-evaluate the direction. + if self.direction is None: + self.direction = self._get_direction() </ins><span class="cx"> </span><span class="cx"> if self.uselist is None and self.direction == PropertyLoader.MANYTOONE: </span><span class="cx"> self.uselist = False </span></span></pre></div> <a id="sqlalchemytrunktestinheritancepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/inheritance.py (1165 => 1166)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/inheritance.py 2006-03-17 23:56:54 UTC (rev 1165) +++ sqlalchemy/trunk/test/inheritance.py 2006-03-18 00:12:59 UTC (rev 1166) </span><span class="lines">@@ -351,5 +351,39 @@ </span><span class="cx"> self.assert_(compare == result) </span><span class="cx"> self.assert_(l[0].parent_foo.data == 'foo #1' and l[1].parent_foo.data == 'foo #1') </span><span class="cx"> </span><ins>+class InheritTest5(testbase.AssertMixin): + def setUpAll(self): + engine = testbase.db + global content_type, content, product + content_type = Table('content_type', engine, + Column('id', Integer, primary_key=True) + ) + content = Table('content', engine, + Column('id', Integer, primary_key=True), + Column('content_type_id', Integer, ForeignKey('content_type.id')) + ) + product = Table('product', engine, + Column('id', Integer, ForeignKey('content.id'), primary_key=True) + ) + def tearDownAll(self): + testbase.db.tables.clear() + + def tearDown(self): + pass + + def testbasic(self): + class ContentType(object): pass + class Content(object): pass + class Product(object): pass + + content_types = mapper(ContentType, content_type) + contents = mapper(Content, content, properties={ + 'content_type':relation(content_types) + }) + #contents.add_property('content_type', relation(content_types)) #adding this makes the inheritance stop working + # shouldnt throw exception + products = mapper(Product, product, inherits=contents) + + </ins><span class="cx"> if __name__ == "__main__": </span><span class="cx"> testbase.main() </span></span></pre> </div> </div> </body> </html> |
