[Sqlalchemy-commits] [1915] sqlalchemy/trunk/test/orm: [ticket:309]
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1915] sqlalchemy/trunk/test/orm: [ticket:309]
|
From: <co...@sq...> - 2006-09-29 19:42:51
|
<!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>[1915] sqlalchemy/trunk/test/orm: [ticket:309]</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1915</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-09-29 15:41:37 -0500 (Fri, 29 Sep 2006)</dd> </dl> <h3>Log Message</h3> <pre>[ticket:309]</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyormmapperpy">sqlalchemy/trunk/lib/sqlalchemy/orm/mapper.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyormpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/orm/properties.py</a></li> <li><a href="#sqlalchemytrunktestormmapperpy">sqlalchemy/trunk/test/orm/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/orm/mapper.py (1914 => 1915)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/orm/mapper.py 2006-09-29 20:28:43 UTC (rev 1914) +++ sqlalchemy/trunk/lib/sqlalchemy/orm/mapper.py 2006-09-29 20:41:37 UTC (rev 1915) </span><span class="lines">@@ -517,8 +517,10 @@ </span><span class="cx"> self.add_property(key, value) </span><span class="cx"> </span><span class="cx"> def add_property(self, key, prop): </span><del>- """adds an indiviual MapperProperty to this mapper. If the mapper has not been compiled yet, - just adds the property to the initial properties dictionary sent to the constructor. if this Mapper </del><ins>+ """add an indiviual MapperProperty to this mapper. + + If the mapper has not been compiled yet, just adds the property to the initial + properties dictionary sent to the constructor. if this Mapper </ins><span class="cx"> has already been compiled, then the given MapperProperty is compiled immediately.""" </span><span class="cx"> self.properties[key] = prop </span><span class="cx"> if self.__is_compiled: </span><span class="lines">@@ -547,13 +549,14 @@ </span><span class="cx"> else: </span><span class="cx"> return None </span><span class="cx"> </span><del>- def _compile_property(self, key, prop, init=True, skipmissing=False): - """adds an additional property to this mapper. this is the same as if it were - specified within the 'properties' argument to the constructor. if the named - property already exists, this will replace it. Useful for - circular relationships, or overriding the parameters of auto-generated properties - such as backreferences.""" - </del><ins>+ def _compile_property(self, key, prop, init=True, skipmissing=False, localparent=None): + """add a MapperProperty to this or another Mapper, including configuration of the property. + + The properties' parent attribute will be set, and the property will also be + copied amongst the mappers which inherit from this one. + + if the given prop is a Column or list of Columns, a ColumnProperty will be created. + """ </ins><span class="cx"> self.__log("_compile_property(%s, %s)" % (key, prop.__class__.__name__)) </span><span class="cx"> </span><span class="cx"> if not isinstance(prop, MapperProperty): </span><span class="lines">@@ -561,9 +564,10 @@ </span><span class="cx"> if prop is None: </span><span class="cx"> raise exceptions.ArgumentError("'%s' is not an instance of MapperProperty or Column" % repr(prop)) </span><span class="cx"> </span><del>- self.__props[key] = prop </del><ins>+ effectiveparent = localparent or self + effectiveparent.__props[key] = prop </ins><span class="cx"> prop.set_parent(self) </span><del>- </del><ins>+ </ins><span class="cx"> if isinstance(prop, ColumnProperty): </span><span class="cx"> col = self.select_table.corresponding_column(prop.columns[0], keys_ok=True, raiseerr=False) </span><span class="cx"> if col is None: </span><span class="lines">@@ -574,11 +578,11 @@ </span><span class="cx"> proplist.append(prop) </span><span class="cx"> </span><span class="cx"> if init: </span><del>- prop.init(key, self) </del><ins>+ prop.init(key, effectiveparent) </ins><span class="cx"> </span><del>- for mapper in self._inheriting_mappers: </del><ins>+ for mapper in effectiveparent._inheriting_mappers: </ins><span class="cx"> prop.adapt_to_inherited(key, mapper) </span><del>- </del><ins>+ </ins><span class="cx"> def __str__(self): </span><span class="cx"> return "Mapper|" + self.class_.__name__ + "|" + (self.entity_name is not None and "/%s" % self.entity_name or "") + (self.local_table and self.local_table.name or str(self.local_table)) + (not self._is_primary_mapper() and "|non-primary" or "") </span><span class="cx"> </span><span class="lines">@@ -1034,6 +1038,7 @@ </span><span class="cx"> identitykey = self._row_identity_key(row) </span><span class="cx"> if session.has_key(identitykey): </span><span class="cx"> instance = session._get(identitykey) </span><ins>+ self.__log_debug("_instance(): using existing instance %s identity %s" % (mapperutil.instance_str(instance), str(identitykey))) </ins><span class="cx"> isnew = False </span><span class="cx"> if version_check and self.version_id_col is not None and self._getattrbycolumn(instance, self.version_id_col) != row[self.version_id_col]: </span><span class="cx"> raise exceptions.ConcurrentModificationError("Instance '%s' version of %s does not match %s" % (instance, self._getattrbycolumn(instance, self.version_id_col), row[self.version_id_col])) </span><span class="lines">@@ -1070,7 +1075,7 @@ </span><span class="cx"> instance = self.extension.create_instance(self, session, row, imap, self.class_) </span><span class="cx"> if instance is EXT_PASS: </span><span class="cx"> instance = self._create_instance(session) </span><del>- self.__log_debug("new instance %s identity %s" % (mapperutil.instance_str(instance), str(identitykey))) </del><ins>+ self.__log_debug("_instance(): created new instance %s identity %s" % (mapperutil.instance_str(instance), str(identitykey))) </ins><span class="cx"> imap[identitykey] = instance </span><span class="cx"> isnew = True </span><span class="cx"> else: </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyormpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/orm/properties.py (1914 => 1915)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/orm/properties.py 2006-09-29 20:28:43 UTC (rev 1914) +++ sqlalchemy/trunk/lib/sqlalchemy/orm/properties.py 2006-09-29 20:41:37 UTC (rev 1915) </span><span class="lines">@@ -377,6 +377,7 @@ </span><span class="cx"> </span><span class="cx"> class LazyLoader(PropertyLoader): </span><span class="cx"> def do_init_subclass(self): </span><ins>+ print "LAZYLOADER %d DOINITSUBCLASS" % id(self) </ins><span class="cx"> (self.lazywhere, self.lazybinds, self.lazyreverse) = create_lazy_clause(self.parent.unjoined_table, self.primaryjoin, self.secondaryjoin, self.foreignkey) </span><span class="cx"> # determine if our "lazywhere" clause is the same as the mapper's </span><span class="cx"> # get() clause. then we can just use mapper.get() </span><span class="lines">@@ -496,6 +497,7 @@ </span><span class="cx"> lazywhere.accept_visitor(li) </span><span class="cx"> if secondaryjoin is not None: </span><span class="cx"> lazywhere = sql.and_(lazywhere, secondaryjoin) </span><ins>+ LazyLoader.logger.debug("create_lazy_clause " + str(lazywhere)) </ins><span class="cx"> return (lazywhere, binds, reverse) </span><span class="cx"> </span><span class="cx"> </span><span class="lines">@@ -808,8 +810,12 @@ </span><span class="cx"> oldprop = mapper.props[key] </span><span class="cx"> newprop = class_.__new__(class_) </span><span class="cx"> newprop.__dict__.update(oldprop.__dict__) </span><del>- newprop.do_init_subclass() - mapper._compile_property(key, newprop) </del><ins>+ #newprop.do_init_subclass() + p = newprop + while p.inherits is not None: + p = p.inherits + real_parent_mapper = p.parent + real_parent_mapper._compile_property(key, newprop, localparent=mapper) </ins><span class="cx"> </span><span class="cx"> class DeferredOption(GenericOption): </span><span class="cx"> def __init__(self, key, defer=False, **kwargs): </span></span></pre></div> <a id="sqlalchemytrunktestormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/orm/mapper.py (1914 => 1915)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/orm/mapper.py 2006-09-29 20:28:43 UTC (rev 1914) +++ sqlalchemy/trunk/test/orm/mapper.py 2006-09-29 20:41:37 UTC (rev 1915) </span><span class="lines">@@ -502,7 +502,33 @@ </span><span class="cx"> sess.clear() </span><span class="cx"> au = sess.query(usermapper).get_by(user_name='jack') </span><span class="cx"> self.assert_(au.email_address == 'ja...@gm...') </span><ins>+ + def testlazyoption(self): + """test that a lazy options gets created against its correct mapper when + using options with inheriting mappers""" + class _Order(object): + pass + class _User(object): + pass + class AddressUser(_User): + pass + ordermapper = mapper(_Order, orders) + usermapper = mapper(_User, users, + properties = { + 'orders' : relation(ordermapper, lazy=True) + }) + amapper = mapper(AddressUser, addresses, inherits = usermapper) </ins><span class="cx"> </span><ins>+ sess = create_session() + + def go(): + l = sess.query(AddressUser).options(lazyload('orders')).select() + # this would fail because the "orders" lazyloader gets created against AddressUsers selectable + # and not _User's. + assert len(l[0].orders) == 3 + self.assert_sql_count(db, go, 2) + + </ins><span class="cx"> </span><span class="cx"> class DeferredTest(MapperSuperTest): </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |