[Sqlalchemy-commits] [1009] sqlalchemy/branches/new_eagerload/lib/sqlalchemy: deprecated use_alias
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1009] sqlalchemy/branches/new_eagerload/lib/sqlalchemy: deprecated use_alias
|
From: <co...@sq...> - 2006-02-22 07:46:25
|
<!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>[1009] sqlalchemy/branches/new_eagerload/lib/sqlalchemy: deprecated use_alias</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1009</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-20 13:31:49 -0600 (Mon, 20 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>deprecated use_alias orderby/groupby should be cleaned up</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesnew_eagerloadlibsqlalchemymappingpropertiespy">sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py</a></li> <li><a href="#sqlalchemybranchesnew_eagerloadlibsqlalchemysqlpy">sqlalchemy/branches/new_eagerload/lib/sqlalchemy/sql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesnew_eagerloadlibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py (1008 => 1009)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py 2006-02-20 19:25:17 UTC (rev 1008) +++ sqlalchemy/branches/new_eagerload/lib/sqlalchemy/mapping/properties.py 2006-02-20 19:31:49 UTC (rev 1009) </span><span class="lines">@@ -107,7 +107,7 @@ </span><span class="cx"> </span><span class="cx"> """describes an object property that holds a single item or list of items that correspond </span><span class="cx"> to a related database table.""" </span><del>- def __init__(self, argument, secondary, primaryjoin, secondaryjoin, foreignkey=None, uselist=None, private=False, association=None, use_alias=False, selectalias=None, order_by=False, attributeext=None, backref=None, is_backref=False, post_update=False): </del><ins>+ def __init__(self, argument, secondary, primaryjoin, secondaryjoin, foreignkey=None, uselist=None, private=False, association=None, use_alias=None, selectalias=None, order_by=False, attributeext=None, backref=None, is_backref=False, post_update=False): </ins><span class="cx"> self.uselist = uselist </span><span class="cx"> self.argument = argument </span><span class="cx"> self.secondary = secondary </span><span class="lines">@@ -127,11 +127,10 @@ </span><span class="cx"> </span><span class="cx"> self.private = private </span><span class="cx"> self.association = association </span><del>- if isinstance(selectalias, str): - print "'selectalias' argument to property is deprecated. please use 'use_alias=True'" - self.use_alias = True - else: - self.use_alias = use_alias </del><ins>+ if selectalias is not None: + print "'selectalias' argument to relation() is deprecated. eager loads automatically alias-ize tables now." + if use_alias is not None: + print "'use_alias' argument to relation() is deprecated. eager loads automatically alias-ize tables now." </ins><span class="cx"> self.order_by = order_by </span><span class="cx"> self.attributeext=attributeext </span><span class="cx"> self.backref = backref </span><span class="lines">@@ -289,7 +288,6 @@ </span><span class="cx"> elif self.association is not None: </span><span class="cx"> c = self.mapper._get_criterion(key, value) & self.primaryjoin </span><span class="cx"> return c.copy_container() </span><del>- </del><span class="cx"> return None </span><span class="cx"> </span><span class="cx"> def register_deleted(self, obj, uow): </span><span class="lines">@@ -783,7 +781,6 @@ </span><span class="cx"> p = EagerLazyOption(None, False).create_prop(self.mapper, prop.key) </span><span class="cx"> continue </span><span class="cx"> p = prop.copy() </span><del>- p.use_alias=True </del><span class="cx"> self.mapper.props[prop.key] = p </span><span class="cx"> #print "we are:", id(self), self.target.name, (self.secondary and self.secondary.name or "None"), self.parent.table.name </span><span class="cx"> #print "prop is",id(prop), prop.target.name, (prop.secondary and prop.secondary.name or "None"), prop.parent.table.name </span><span class="lines">@@ -907,10 +904,6 @@ </span><span class="cx"> newprop = class_.__new__(class_) </span><span class="cx"> newprop.__dict__.update(oldprop.__dict__) </span><span class="cx"> newprop.do_init_subclass(key, mapper) </span><del>- if self.kwargs.get('selectalias', None): - newprop.use_alias = True - elif self.kwargs.get('use_alias', None) is not None: - newprop.use_alias = self.kwargs['use_alias'] </del><span class="cx"> mapper.set_property(key, newprop) </span><span class="cx"> </span><span class="cx"> class DeferredOption(GenericOption): </span></span></pre></div> <a id="sqlalchemybranchesnew_eagerloadlibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/new_eagerload/lib/sqlalchemy/sql.py (1008 => 1009)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/new_eagerload/lib/sqlalchemy/sql.py 2006-02-20 19:25:17 UTC (rev 1008) +++ sqlalchemy/branches/new_eagerload/lib/sqlalchemy/sql.py 2006-02-20 19:31:49 UTC (rev 1009) </span><span class="lines">@@ -1153,10 +1153,11 @@ </span><span class="cx"> if not hasattr(self, attribute): </span><span class="cx"> l = ClauseList(*clauses) </span><span class="cx"> setattr(self, attribute, l) </span><del>- #self.append_clause(prefix, l) </del><span class="cx"> else: </span><span class="cx"> getattr(self, attribute).clauses += clauses </span><span class="cx"> def _get_clauses(self): </span><ins>+ # TODO: this is a little stupid. make ORDER BY/GROUP BY keywords handled by + # the compiler, make group_by_clause/order_by_clause regular attributes </ins><span class="cx"> x =[] </span><span class="cx"> if getattr(self, 'group_by_clause', None): </span><span class="cx"> x.append(("GROUP BY", self.group_by_clause)) </span></span></pre> </div> </div> </body> </html> |
