[Sqlalchemy-commits] [1113] sqlalchemy/trunk/test: added check to relation that will see if the same
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1113] sqlalchemy/trunk/test: added check to relation that will see if the same table is included between the primaryjoin and secondaryjoin, and raises a descriptive exception if so.
<!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>[1113] sqlalchemy/trunk/test: added check to relation that will see if the same table is included between the primaryjoin and secondaryjoin, and raises a descriptive exception if so.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1113</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-08 15:39:53 -0600 (Wed, 08 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>added check to relation that will see if the same table is included between the primaryjoin and secondaryjoin, and raises a descriptive exception if so.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> <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="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1112 => 1113)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-08 20:51:51 UTC (rev 1112) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-08 21:39:53 UTC (rev 1113) </span><span class="lines">@@ -936,8 +936,9 @@ </span><span class="cx"> </span><span class="cx"> class TableFinder(sql.ClauseVisitor): </span><span class="cx"> """given a Clause, locates all the Tables within it into a list.""" </span><del>- def __init__(self, table): </del><ins>+ def __init__(self, table, check_columns=False): </ins><span class="cx"> self.tables = [] </span><ins>+ self.check_columns = check_columns </ins><span class="cx"> table.accept_visitor(self) </span><span class="cx"> def visit_table(self, table): </span><span class="cx"> self.tables.append(table) </span><span class="lines">@@ -951,7 +952,10 @@ </span><span class="cx"> return obj in self.tables </span><span class="cx"> def __add__(self, obj): </span><span class="cx"> return self.tables + obj </span><del>- </del><ins>+ def visit_column(self, column): + if self.check_columns: + column.table.accept_visitor(self) + </ins><span class="cx"> def hash_key(obj): </span><span class="cx"> if obj is None: </span><span class="cx"> return 'None' </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py (1112 => 1113)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-08 20:51:51 UTC (rev 1112) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-08 21:39:53 UTC (rev 1113) </span><span class="lines">@@ -175,6 +175,11 @@ </span><span class="cx"> self.secondaryjoin = sql.join(self.target, self.secondary).onclause </span><span class="cx"> if self.primaryjoin is None: </span><span class="cx"> self.primaryjoin = sql.join(parent.table, self.secondary).onclause </span><ins>+ tf = mapper.TableFinder(self.secondaryjoin, check_columns=True) + tf2 = mapper.TableFinder(self.primaryjoin, check_columns=True) + for t in tf2: + if t is not self.secondary and t in tf: + raise ArgumentError("Ambiguous join conditions generated between '%s' and '%s' (primaryjoin='%s', secondaryjoin='%s'); please specify explicit primaryjoin and/or secondaryjoin arguments to property '%s'" % (parent.table.id, self.target.id, self.primaryjoin, self.secondaryjoin, self.key)) </ins><span class="cx"> else: </span><span class="cx"> if self.primaryjoin is None: </span><span class="cx"> self.primaryjoin = sql.join(parent.table, self.target).onclause </span></span></pre></div> <a id="sqlalchemytrunktestinheritancepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/inheritance.py (1112 => 1113)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/inheritance.py 2006-03-08 20:51:51 UTC (rev 1112) +++ sqlalchemy/trunk/test/inheritance.py 2006-03-08 21:39:53 UTC (rev 1113) </span><span class="lines">@@ -192,21 +192,34 @@ </span><span class="cx"> table.drop() </span><span class="cx"> testbase.db.tables.clear() </span><span class="cx"> </span><ins>+ def tearDown(self): + for table in reversed(tables): + table.delete().execute() + </ins><span class="cx"> def testbasic(self): </span><span class="cx"> class Foo(object): </span><ins>+ def __init__(self, data=None): + self.data = data </ins><span class="cx"> def __repr__(self): </span><span class="cx"> return "Foo id %d, data %s" % (self.id, self.data) </span><span class="cx"> Foo.mapper = mapper(Foo, foo) </span><span class="cx"> </span><del>- class Bar(object): </del><ins>+ class Bar(Foo): </ins><span class="cx"> def __repr__(self): </span><span class="cx"> return "Bar id %d, data %s" % (self.id, self.data) </span><span class="cx"> </span><span class="cx"> Bar.mapper = mapper(Bar, bar, inherits=Foo.mapper, properties={ </span><del>- 'foos' :relation(Foo.mapper, bar_foo, primaryjoin=bar.c.id==bar_foo.c.bar_id, secondaryjoin=bar_foo.c.foo_id==foo.c.id, lazy=False) </del><ins>+ 'foos' :relation(Foo.mapper, bar_foo, primaryjoin=bar.c.id==bar_foo.c.bar_id, lazy=False) +# 'foos' :relation(Foo.mapper, bar_foo, lazy=True) </ins><span class="cx"> }) </span><span class="cx"> </span><del>- Bar.mapper.select() </del><ins>+ b = Bar('bar #1') + b.foos.append(Foo("foo #1")) + b.foos.append(Foo("foo #2")) + objectstore.commit() + objectstore.clear() + l = Bar.mapper.select() + print l[0], l[0].foos </ins><span class="cx"> </span><span class="cx"> def testadvanced(self): </span><span class="cx"> class Foo(object): </span><span class="lines">@@ -226,8 +239,8 @@ </span><span class="cx"> return "Blub id %d, data %s, bars %s, foos %s" % (self.id, self.data, repr([b for b in self.bars]), repr([f for f in self.foos])) </span><span class="cx"> </span><span class="cx"> Blub.mapper = mapper(Blub, blub, inherits=Bar.mapper, properties={ </span><del>- 'bars':relation(Bar.mapper, blub_bar, primaryjoin=blub.c.id==blub_bar.c.blub_id, secondaryjoin=blub_bar.c.bar_id==bar.c.id, lazy=False), - 'foos':relation(Foo.mapper, blub_foo, primaryjoin=blub.c.id==blub_foo.c.blub_id, secondaryjoin=blub_foo.c.foo_id==foo.c.id, lazy=False), </del><ins>+ 'bars':relation(Bar.mapper, blub_bar, primaryjoin=blub.c.id==blub_bar.c.blub_id, lazy=False), + 'foos':relation(Foo.mapper, blub_foo, primaryjoin=blub.c.id==blub_foo.c.blub_id, lazy=False), </ins><span class="cx"> }) </span><span class="cx"> </span><span class="cx"> useobjects = True </span><span class="lines">@@ -252,13 +265,13 @@ </span><span class="cx"> blub_foo.insert().execute(blub_id=1, foo_id=2) </span><span class="cx"> </span><span class="cx"> l = Blub.mapper.select() </span><del>- for x in l: - print x - </del><ins>+ self.echo(l) </ins><span class="cx"> self.assert_(repr(l[0]) == compare) </span><span class="cx"> objectstore.clear() </span><span class="cx"> x = Blub.mapper.get_by(id=blubid) #traceback 2 </span><ins>+ self.echo(x) </ins><span class="cx"> self.assert_(repr(x) == compare) </span><ins>+ </ins><span class="cx"> </span><span class="cx"> </span><span class="cx"> if __name__ == "__main__": </span></span></pre> </div> </div> </body> </html> |
