[Sqlalchemy-commits] [1742] sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py: with_labels support
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1742] sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py: with_labels support
|
From: <co...@sq...> - 2006-07-23 23:44:46
|
<!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>[1742] sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py: with_labels support</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1742</dd> <dt>Author</dt> <dd>ellisj</dd> <dt>Date</dt> <dd>2006-07-23 19:44:44 -0500 (Sun, 23 Jul 2006)</dd> </dl> <h3>Log Message</h3> <pre>with_labels support</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyextsqlsouppy">sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyextsqlsouppy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py (1741 => 1742)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py 2006-07-23 04:04:22 UTC (rev 1741) +++ sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py 2006-07-24 00:44:44 UTC (rev 1742) </span><span class="lines">@@ -90,6 +90,7 @@ </span><span class="cx"> If you join tables that have an identical column name, pass use_lables to your </span><span class="cx"> select: </span><span class="cx"> >>> db.with_labels(join1).select() </span><ins>+ [MappedUsersLoansJoin(users_name='Joe Student',users_email='st...@ex...',users_password='student',users_classname=None,users_admin=0,loans_book_id=1,loans_user_name='Joe Student',loans_loan_date=datetime.datetime(2006, 7, 12, 0, 0))] </ins><span class="cx"> </span><span class="cx"> You can compose arbitrarily complex joins by combining Join objects with </span><span class="cx"> tables or other joins. </span><span class="lines">@@ -183,14 +184,21 @@ </span><span class="cx"> return True </span><span class="cx"> return _is_outer_join(selectable.left) or _is_outer_join(selectable.right) </span><span class="cx"> </span><ins>+def _selectable_name(selectable): + if isinstance(selectable, sql.Alias): + return _selectable_name(selectable.selectable) + elif isinstance(selectable, sql.Select): + return ''.join([_selectable_name(s) for s in selectable._froms]) + elif isinstance(selectable, schema.Table): + return selectable.name.capitalize() + else: + return selectable.__class__.__name__ + </ins><span class="cx"> def class_for_table(selectable): </span><span class="cx"> if not hasattr(selectable, '_selectable') \ </span><span class="cx"> or selectable._selectable() != selectable: </span><span class="cx"> raise 'class_for_table requires a selectable as its argument' </span><del>- if isinstance(selectable, schema.Table): - mapname = 'Mapped' + selectable.name.capitalize() - else: - mapname = 'Mapped' + selectable.__class__.__name__ </del><ins>+ mapname = 'Mapped' + _selectable_name(selectable) </ins><span class="cx"> klass = TableClassType(mapname, (object,), {}) </span><span class="cx"> def __cmp__(self, o): </span><span class="cx"> L = self.__class__.c.keys() </span><span class="lines">@@ -256,7 +264,8 @@ </span><span class="cx"> self._cache[selectable] = t </span><span class="cx"> return t </span><span class="cx"> def with_labels(self, item): </span><del>- return self._map(select(use_labels=True, from_obj=[item._selectable()]).alias('foo')) </del><ins>+ # TODO give meaningful aliases + return self._map(item._selectable().select(use_labels=True).alias('foo')) </ins><span class="cx"> def join(self, *args, **kwargs): </span><span class="cx"> j = join(*args, **kwargs) </span><span class="cx"> return self._map(j) </span></span></pre> </div> </div> </body> </html> |