[Sqlalchemy-commits] [1319] sqlalchemy/branches/schema/lib/sqlalchemy/mapping: dev

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

<!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>[1319] sqlalchemy/branches/schema/lib/sqlalchemy/mapping: dev</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1319</dd>
<dt>Author</dt> <dd>zzzeek</dd>
<dt>Date</dt> <dd>2006-04-22 16:14:43 -0500 (Sat, 22 Apr 2006)</dd>
</dl>

<h3>Log Message</h3>
<pre>dev</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sqlalchemybranchesschemalibsqlalchemymappingmapperpy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py</a></li>
<li><a href="#sqlalchemybranchesschemalibsqlalchemymappingpropertiespy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sqlalchemybranchesschemalibsqlalchemymappingmapperpy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py (1318 => 1319)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py	2006-04-22 20:21:50 UTC (rev 1318)
+++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/mapper.py	2006-04-22 21:14:43 UTC (rev 1319)
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx">             if kwargs.has_key('_sa_session'):
</span><span class="cx">                 session = kwargs.pop('_sa_session')
</span><span class="cx">             else:
</span><del>-                session = objectstore.get_session(raiseerror=False)
</del><ins>+                session = objectstore.get_session(self, raiseerror=False)
</ins><span class="cx">             if session is not None:
</span><span class="cx">                 if not nohist:
</span><span class="cx">                     # register new with the correct session, before the object's 
</span><span class="lines">@@ -713,9 +713,6 @@
</span><span class="cx">         # including modifying any of its related items lists, as its already
</span><span class="cx">         # been exposed to being modified by the application.
</span><span class="cx">         
</span><del>-        if session is None:
-            session = objectstore.get_session()
-            
</del><span class="cx">         populate_existing = populate_existing or self.always_refresh
</span><span class="cx">         identitykey = self._identity_key(row)
</span><span class="cx">         if session.has_key(identitykey):
</span></span></pre></div>
<a id="sqlalchemybranchesschemalibsqlalchemymappingpropertiespy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py (1318 => 1319)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py	2006-04-22 20:21:50 UTC (rev 1318)
+++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/properties.py	2006-04-22 21:14:43 UTC (rev 1319)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">             return object_mapper(instance).props[self.key].setup_loader(instance)
</span><span class="cx">         def lazyload():
</span><span class="cx">             session = objectstore.get_session(instance)
</span><del>-            connection = session.connect(self.parent)
</del><ins>+            connection = session.connection(self.parent)
</ins><span class="cx">             clause = sql.and_()
</span><span class="cx">             try:
</span><span class="cx">                 pk = self.parent.pks_by_table[self.columns[0].table]
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">                         if prop is self:
</span><span class="cx">                             continue
</span><span class="cx">                         instance.__dict__[prop.key] = row[prop.columns[0]]
</span><del>-                        objectstore.global_attributes.create_history(instance, prop.key, uselist=False, cascade=self.cascade, trackparent=True)
</del><ins>+                        objectstore.global_attributes.create_history(instance, prop.key, uselist=False)
</ins><span class="cx">                     return row[self.columns[0]]    
</span><span class="cx">                 else:
</span><span class="cx">                     return connection.scalar(sql.select([self.columns[0]], clause, use_labels=True),None)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">     def execute(self, session, instance, row, identitykey, imap, isnew):
</span><span class="cx">         if isnew:
</span><span class="cx">             if not self.is_primary():
</span><del>-                objectstore.global_attributes.create_history(instance, self.key, False, callable_=self.setup_loader(instance), cascade=self.cascade, trackparent=True)
</del><ins>+                objectstore.global_attributes.create_history(instance, self.key, False, callable_=self.setup_loader(instance))
</ins><span class="cx">             else:
</span><span class="cx">                 objectstore.global_attributes.reset_history(instance, self.key)
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>