[Sqlalchemy-commits] [1361] sqlalchemy/branches/schema/lib/sqlalchemy/orm: various stuff
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1361] sqlalchemy/branches/schema/lib/sqlalchemy/orm: various stuff
|
From: <co...@sq...> - 2006-04-29 19:42:29
|
<!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>[1361] sqlalchemy/branches/schema/lib/sqlalchemy/orm: various stuff</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1361</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-29 14:42:15 -0500 (Sat, 29 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>various stuff</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemymodsthreadlocalpy">sqlalchemy/branches/schema/lib/sqlalchemy/mods/threadlocal.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormsessionpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemymodsthreadlocalpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mods/threadlocal.py (1360 => 1361)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mods/threadlocal.py 2006-04-29 19:28:47 UTC (rev 1360) +++ sqlalchemy/branches/schema/lib/sqlalchemy/mods/threadlocal.py 2006-04-29 19:42:15 UTC (rev 1361) </span><span class="lines">@@ -90,6 +90,7 @@ </span><span class="cx"> class_.__init__ = __init__ </span><span class="cx"> m = mapper(class_, *args, **params) </span><span class="cx"> class_.mapper = m </span><ins>+ # TODO: get these outta here, have to go off explicit session </ins><span class="cx"> class_.get = m.get </span><span class="cx"> class_.select = m.select </span><span class="cx"> class_.select_by = m.select_by </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py (1360 => 1361)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-04-29 19:28:47 UTC (rev 1360) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/mapper.py 2006-04-29 19:42:15 UTC (rev 1361) </span><span class="lines">@@ -247,7 +247,6 @@ </span><span class="cx"> if getattr(prop, 'key', None) is None: </span><span class="cx"> prop.init(key, self) </span><span class="cx"> </span><del>- </del><span class="cx"> # this prints a summary of the object attributes and how they </span><span class="cx"> # will be mapped to table columns </span><span class="cx"> #print "mapper %s, columntoproperty:" % (self.class_.__name__) </span><span class="lines">@@ -603,7 +602,6 @@ </span><span class="cx"> if value is not None: </span><span class="cx"> params[col.key] = value </span><span class="cx"> elif self.effective_polymorphic_on is not None and col.original is self.effective_polymorphic_on.original: </span><del>- print "YA YA ITS", self.polymorphic_ident </del><span class="cx"> if isinsert: </span><span class="cx"> value = self.polymorphic_ident </span><span class="cx"> if col.default is None or value is not None: </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormsessionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py (1360 => 1361)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py 2006-04-29 19:28:47 UTC (rev 1360) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py 2006-04-29 19:42:15 UTC (rev 1361) </span><span class="lines">@@ -270,7 +270,7 @@ </span><span class="cx"> self.save_or_update(c, entity_name=entity_name) </span><span class="cx"> </span><span class="cx"> def update(self, object, entity_name=None): </span><del>- """Brings the given detached (saved) instance. into this Session. </del><ins>+ """Brings the given detached (saved) instance into this Session. </ins><span class="cx"> If there is a persistent instance with the same identifier (i.e. a saved instance already associated with this </span><span class="cx"> Session), an exception is thrown. </span><span class="cx"> This operation cascades the "save_or_update" method to associated instances if the relation is mapped </span></span></pre> </div> </div> </body> </html> |
