[Sqlalchemy-commits] [5334] sqlalchemy/trunk/lib/sqlalchemy/orm/query.py: Refactored the entity set
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5334] sqlalchemy/trunk/lib/sqlalchemy/orm/query.py: Refactored the entity setup code in Query so that it is not duplicated in several places .
|
From: <co...@sq...> - 2008-11-26 19:44:09
|
<!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>[5334] sqlalchemy/trunk/lib/sqlalchemy/orm/query.py: Refactored the entity setup code in Query so that it is not duplicated in several places .</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5334</dd> <dt>Author</dt> <dd>empty</dd> <dt>Date</dt> <dd>2008-11-26 14:44:04 -0500 (Wed, 26 Nov 2008)</dd> </dl> <h3>Log Message</h3> <pre>Refactored the entity setup code in Query so that it is not duplicated in several places.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyormquerypy">sqlalchemy/trunk/lib/sqlalchemy/orm/query.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyormquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/orm/query.py (5333 => 5334)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/orm/query.py 2008-11-26 19:43:59 UTC (rev 5333) +++ sqlalchemy/trunk/lib/sqlalchemy/orm/query.py 2008-11-26 19:44:04 UTC (rev 5334) </span><span class="lines">@@ -83,14 +83,18 @@ </span><span class="cx"> self._only_load_props = None </span><span class="cx"> self._refresh_state = None </span><span class="cx"> self._from_obj = None </span><del>- self._entities = [] </del><span class="cx"> self._polymorphic_adapters = {} </span><span class="cx"> self._filter_aliases = None </span><span class="cx"> self._from_obj_alias = None </span><span class="cx"> self.__currenttables = set() </span><ins>+ self._set_entities(entities) </ins><span class="cx"> </span><ins>+ def _set_entities(self, entities, entity_wrapper=None): + if entity_wrapper is None: + entity_wrapper = _QueryEntity + self._entities = [] </ins><span class="cx"> for ent in util.to_list(entities): </span><del>- _QueryEntity(self, ent) </del><ins>+ entity_wrapper(self, ent) </ins><span class="cx"> </span><span class="cx"> self.__setup_aliasizers(self._entities) </span><span class="cx"> </span><span class="lines">@@ -528,10 +532,7 @@ </span><span class="cx"> self._limit = self._offset = None </span><span class="cx"> self.__set_select_from(fromclause) </span><span class="cx"> if entities: </span><del>- self._entities = [] - for ent in entities: - _QueryEntity(self, ent) - self.__setup_aliasizers(self._entities) </del><ins>+ self._set_entities(entities) </ins><span class="cx"> </span><span class="cx"> _from_self = from_self </span><span class="cx"> </span><span class="lines">@@ -541,10 +542,7 @@ </span><span class="cx"> if not columns: </span><span class="cx"> return iter(()) </span><span class="cx"> q = self._clone() </span><del>- q._entities = [] - for column in columns: - _ColumnEntity(q, column) - q.__setup_aliasizers(q._entities) </del><ins>+ q._set_entities(columns, entity_wrapper=_ColumnEntity) </ins><span class="cx"> if not q._yield_per: </span><span class="cx"> q._yield_per = 10 </span><span class="cx"> return iter(q) </span></span></pre> </div> </div> </body> </html> |