[Sqlalchemy-commits] [1313] sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py: tweak

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>[1313] sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py: tweak</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1313</dd>
<dt>Author</dt> <dd>zzzeek</dd>
<dt>Date</dt> <dd>2006-04-21 16:31:07 -0500 (Fri, 21 Apr 2006)</dd>
</dl>

<h3>Log Message</h3>
<pre>tweak</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sqlalchemybranchesschemalibsqlalchemymappingobjectstorepy">sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sqlalchemybranchesschemalibsqlalchemymappingobjectstorepy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py (1312 => 1313)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py	2006-04-21 21:26:54 UTC (rev 1312)
+++ sqlalchemy/branches/schema/lib/sqlalchemy/mapping/objectstore.py	2006-04-21 21:31:07 UTC (rev 1313)
</span><span class="lines">@@ -22,14 +22,17 @@
</span><span class="cx">         if self.parent is not None:
</span><span class="cx">             return self.parent.connection(mapper)
</span><span class="cx">         engine = self.session.get_bind(mapper)
</span><del>-        try:
-            return self.connections[engine][0]
-        except KeyError:
-            c = engine.connect()
-            self.connections[engine] = (c, c.begin())
-            return c
</del><ins>+        return self.add(engine)
</ins><span class="cx">     def _begin(self):
</span><span class="cx">         return SessionTransaction(self.session, self)
</span><ins>+    def add(self, connection_or_engine):
+        if self.connections.has_key(connection_or_engine):
+            return self.connections[connection_or_engine][0]
+        c = connection_or_engine.connect()
+        e = c.engine
+        if not self.connections.has_key(e):
+            self.connections[e] = (c, c.begin())
+        return self.connections[e][0]
</ins><span class="cx">     def commit(self):
</span><span class="cx">         if self.parent is not None:
</span><span class="cx">             return
</span></span></pre>
</div>
</div>

</body>
</html>