[Sqlalchemy-commits] [5110] sqlalchemy/branches/rel_0_4: - Added label() method to InstrumentedAttr
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5110] sqlalchemy/branches/rel_0_4: - Added label() method to InstrumentedAttribute
|
From: <co...@sq...> - 2008-09-17 12:31:32
|
<!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><meta http-equiv="content-type" content="text/html; charset=utf-8" /><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, #header, #footer { 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; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #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>[5110] sqlalchemy/branches/rel_0_4: - Added label() method to InstrumentedAttribute</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5110</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2008-09-17 15:31:24 -0400 (Wed, 17 Sep 2008)</dd> </dl> <h3>Log Message</h3> <pre>- Added label() method to InstrumentedAttribute to establish forwards compatibility with 0.5.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesrel_0_4CHANGES">sqlalchemy/branches/rel_0_4/CHANGES</a></li> <li><a href="#sqlalchemybranchesrel_0_4libsqlalchemyormattributespy">sqlalchemy/branches/rel_0_4/lib/sqlalchemy/orm/attributes.py</a></li> <li><a href="#sqlalchemybranchesrel_0_4testormquerypy">sqlalchemy/branches/rel_0_4/test/orm/query.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesrel_0_4CHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_4/CHANGES (5109 => 5110)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_4/CHANGES 2008-09-16 18:18:15 UTC (rev 5109) +++ sqlalchemy/branches/rel_0_4/CHANGES 2008-09-17 19:31:24 UTC (rev 5110) </span><span class="lines">@@ -13,6 +13,9 @@ </span><span class="cx"> SessionExtension.before_flush() will take </span><span class="cx"> effect for that flush. </span><span class="cx"> </span><ins>+ - Added label() method to InstrumentedAttribute + to establish forwards compatibility with 0.5. + </ins><span class="cx"> - sql </span><span class="cx"> - column.in_(someselect) can now be used as </span><span class="cx"> a columns-clause expression without the subquery </span></span></pre></div> <a id="sqlalchemybranchesrel_0_4libsqlalchemyormattributespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_4/lib/sqlalchemy/orm/attributes.py (5109 => 5110)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_4/lib/sqlalchemy/orm/attributes.py 2008-09-16 18:18:15 UTC (rev 5109) +++ sqlalchemy/branches/rel_0_4/lib/sqlalchemy/orm/attributes.py 2008-09-17 19:31:24 UTC (rev 5110) </span><span class="lines">@@ -52,6 +52,9 @@ </span><span class="cx"> def expression_element(self): </span><span class="cx"> return self.comparator.expression_element() </span><span class="cx"> </span><ins>+ def label(self, name): + return self.clause_element().label(name) + </ins><span class="cx"> def operate(self, op, *other, **kwargs): </span><span class="cx"> return op(self.comparator, *other, **kwargs) </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesrel_0_4testormquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_4/test/orm/query.py (5109 => 5110)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_4/test/orm/query.py 2008-09-16 18:18:15 UTC (rev 5109) +++ sqlalchemy/branches/rel_0_4/test/orm/query.py 2008-09-17 19:31:24 UTC (rev 5110) </span><span class="lines">@@ -249,6 +249,9 @@ </span><span class="cx"> def test_op(self): </span><span class="cx"> assert str(User.name.op('ilike')('17').compile(dialect=default.DefaultDialect())) == "users.name ilike :name_1" </span><span class="cx"> </span><ins>+ def test_label(self): + assert str(User.name.label('foobar').compile() == "users.name AS foobar") + </ins><span class="cx"> def test_in(self): </span><span class="cx"> self._test(User.id.in_(['a', 'b']), </span><span class="cx"> "users.id IN (:id_1, :id_2)") </span><span class="lines">@@ -1132,7 +1135,7 @@ </span><span class="cx"> sess.clear() </span><span class="cx"> </span><span class="cx"> self.assertRaises(exceptions.InvalidRequestError, sess.query(User).add_column, object()) </span><del>- </del><ins>+ </ins><span class="cx"> def test_ambiguous_column(self): </span><span class="cx"> sess = create_session() </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |