[Sqlalchemy-commits] [1132] sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py: tweak to get_dire
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1132] sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py: tweak to get_direction, rolls back a comparison of "foreigntable" to "parent"/"mapper" table to be more constrained.
<!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>[1132] sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py: tweak to get_direction, rolls back a comparison of "foreigntable" to "parent"/"mapper" table to be more constrained.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1132</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-12 20:39:52 -0600 (Sun, 12 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>tweak to get_direction, rolls back a comparison of "foreigntable" to "parent"/"mapper" table to be more constrained. this change was originally in [changeset:1101] to help out the polymorph example but it now works without it. the change breaks the Post/Comment relationship in the ZBlog demo since the Post mapper has the comments table inside of it (also with no workaround).</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.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 (1131 => 1132)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-13 02:04:13 UTC (rev 1131) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-13 02:39:52 UTC (rev 1132) </span><span class="lines">@@ -228,9 +228,11 @@ </span><span class="cx"> return PropertyLoader.ONETOMANY </span><span class="cx"> elif self.secondaryjoin is not None: </span><span class="cx"> return PropertyLoader.MANYTOMANY </span><del>- elif self.foreigntable is self.target or self.foreigntable in self.mapper.tables: </del><ins>+ elif self.foreigntable == self.target: + #elif self.foreigntable is self.target or self.foreigntable in self.mapper.tables: </ins><span class="cx"> return PropertyLoader.ONETOMANY </span><del>- elif self.foreigntable is self.parent.table or self.foreigntable in self.parent.tables: </del><ins>+ elif self.foreigntable == self.parent.table: + #elif self.foreigntable is self.parent.table or self.foreigntable in self.parent.tables: </ins><span class="cx"> return PropertyLoader.MANYTOONE </span><span class="cx"> else: </span><span class="cx"> raise ArgumentError("Cant determine relation direction") </span></span></pre> </div> </div> </body> </html> |
