[Sqlalchemy-commits] [1413] sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py: connection() t
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1413] sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py: connection() takes class_or_mapper
|
From: <co...@sq...> - 2006-05-06 02:14:50
|
<!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>[1413] sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py: connection() takes class_or_mapper</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1413</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-05 21:14:41 -0500 (Fri, 05 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>connection() takes class_or_mapper</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormsessionpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyormsessionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py (1412 => 1413)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py 2006-05-06 02:14:06 UTC (rev 1412) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py 2006-05-06 02:14:41 UTC (rev 1413) </span><span class="lines">@@ -15,10 +15,12 @@ </span><span class="cx"> self.connections = {} </span><span class="cx"> self.parent = parent </span><span class="cx"> self.autoflush = autoflush </span><del>- def connection(self, mapper): </del><ins>+ def connection(self, mapper_or_class, entity_name=None): + if isinstance(mapper_or_class, type): + mapper_or_class = class_mapper(mapper_or_class, entity_name=entity_name) </ins><span class="cx"> if self.parent is not None: </span><del>- return self.parent.connection(mapper) - engine = self.session.get_bind(mapper) </del><ins>+ return self.parent.connection(mapper_or_class) + engine = self.session.get_bind(mapper_or_class) </ins><span class="cx"> return self.get_or_add(engine) </span><span class="cx"> def _begin(self): </span><span class="cx"> return SessionTransaction(self.session, self) </span></span></pre> </div> </div> </body> </html> |
