[Sqlalchemy-commits] [1448] sqlalchemy/branches/schema/test: query uses session instead of assumed t
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1448] sqlalchemy/branches/schema/test: query uses session instead of assumed table bound engine to get scalar value of count() now, fixes [ticket:177]
<!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>[1448] sqlalchemy/branches/schema/test: query uses session instead of assumed table bound engine to get scalar value of count() now, fixes [ticket:177]</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1448</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-12 19:46:51 -0500 (Fri, 12 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>query uses session instead of assumed table bound engine to get scalar value of count() now, fixes [ticket:177]</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormquerypy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/query.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormsessionpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyschemapy">sqlalchemy/branches/schema/lib/sqlalchemy/schema.py</a></li> <li><a href="#sqlalchemybranchesschematestmapperpy">sqlalchemy/branches/schema/test/mapper.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyormquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/query.py (1447 => 1448)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/query.py 2006-05-13 00:40:57 UTC (rev 1447) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/query.py 2006-05-13 00:46:51 UTC (rev 1448) </span><span class="lines">@@ -146,13 +146,9 @@ </span><span class="cx"> statement = self._compile(whereclause, **kwargs) </span><span class="cx"> return self._select_statement(statement, params=params) </span><span class="cx"> </span><del>- </del><span class="cx"> def count(self, whereclause=None, params=None, **kwargs): </span><span class="cx"> s = self.table.count(whereclause) </span><del>- if params is not None: - return s.scalar(**params) - else: - return s.scalar() </del><ins>+ return self.session.scalar(self.mapper, s, params=params) </ins><span class="cx"> </span><span class="cx"> def select_statement(self, statement, **params): </span><span class="cx"> return self._select_statement(statement, params=params) </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormsessionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py (1447 => 1448)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py 2006-05-13 00:40:57 UTC (rev 1447) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/session.py 2006-05-13 00:46:51 UTC (rev 1448) </span><span class="lines">@@ -112,6 +112,9 @@ </span><span class="cx"> method will release the resources of the underlying Connection, otherwise its a no-op. </span><span class="cx"> """ </span><span class="cx"> return self.connection(mapper, close_with_result=True).execute(clause, params, **kwargs) </span><ins>+ def scalar(self, mapper, clause, params, **kwargs): + """works like execute() but returns a scalar result.""" + return self.connection(mapper, close_with_result=True).scalar(clause, params, **kwargs) </ins><span class="cx"> </span><span class="cx"> def close(self): </span><span class="cx"> """closes this Session. </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyschemapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/schema.py (1447 => 1448)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-05-13 00:40:57 UTC (rev 1447) +++ sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-05-13 00:46:51 UTC (rev 1448) </span><span class="lines">@@ -648,7 +648,7 @@ </span><span class="cx"> return self </span><span class="cx"> def _get_engine(self): </span><span class="cx"> if not self.is_bound(): </span><del>- raise exceptions.InvalidRequestError("Schema %s is not bound to any engine" % self.name) </del><ins>+ raise exceptions.InvalidRequestError("MetaData '%s' is not bound to any engine" % self.name) </ins><span class="cx"> return self._engine </span><span class="cx"> </span><span class="cx"> class BoundMetaData(MetaData): </span></span></pre></div> <a id="sqlalchemybranchesschematestmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/mapper.py (1447 => 1448)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/mapper.py 2006-05-13 00:40:57 UTC (rev 1447) +++ sqlalchemy/branches/schema/test/mapper.py 2006-05-13 00:46:51 UTC (rev 1448) </span><span class="lines">@@ -84,6 +84,7 @@ </span><span class="cx"> u2 = s.get(User, 7) </span><span class="cx"> self.assert_(u is not u2) </span><span class="cx"> </span><ins>+ </ins><span class="cx"> def testrefresh(self): </span><span class="cx"> mapper(User, users, properties={'addresses':relation(mapper(Address, addresses))}) </span><span class="cx"> s = create_session() </span></span></pre> </div> </div> </body> </html> |
