[Sqlalchemy-commits] [1129] sqlalchemy/trunk/test: small tweak to select in order to fix [ticket:112
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1129] sqlalchemy/trunk/test: small tweak to select in order to fix [ticket:112]...the exported columns when doing select on a select() will be the column names, not the keys.
<!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>[1129] sqlalchemy/trunk/test: small tweak to select in order to fix [ticket:112]...the exported columns when doing select on a select() will be the column names, not the keys.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1129</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-12 19:13:47 -0600 (Sun, 12 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>small tweak to select in order to fix [ticket:112]...the exported columns when doing select on a select() will be the column names, not the keys. this is with selects that have use_labels=False. which makes sense since using the "key" and not the name implies a label has to be used.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> <li><a href="#sqlalchemytrunktestquerypy">sqlalchemy/trunk/test/query.py</a></li> <li><a href="#sqlalchemytrunktestselectpy">sqlalchemy/trunk/test/select.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1128 => 1129)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-13 01:06:33 UTC (rev 1128) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-13 01:13:47 UTC (rev 1129) </span><span class="lines">@@ -1272,7 +1272,7 @@ </span><span class="cx"> if self.use_labels: </span><span class="cx"> return column._make_proxy(self, name=column._label) </span><span class="cx"> else: </span><del>- return column._make_proxy(self, name=column.key) </del><ins>+ return column._make_proxy(self, name=column.name) </ins><span class="cx"> </span><span class="cx"> def append_whereclause(self, whereclause): </span><span class="cx"> self._append_condition('whereclause', whereclause) </span></span></pre></div> <a id="sqlalchemytrunktestquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/query.py (1128 => 1129)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/query.py 2006-03-13 01:06:33 UTC (rev 1128) +++ sqlalchemy/trunk/test/query.py 2006-03-13 01:13:47 UTC (rev 1129) </span><span class="lines">@@ -124,7 +124,8 @@ </span><span class="cx"> self.assert_(r==[(3, 'ed'), (4, 'wendy'), (5, 'laura')]) </span><span class="cx"> r = self.users.select(offset=5, order_by=[self.users.c.user_id]).execute().fetchall() </span><span class="cx"> self.assert_(r==[(6, 'ralph'), (7, 'fido')]) </span><del>- </del><ins>+ + </ins><span class="cx"> def test_column_accessor(self): </span><span class="cx"> self.users.insert().execute(user_id=1, user_name='john') </span><span class="cx"> self.users.insert().execute(user_id=2, user_name='jack') </span></span></pre></div> <a id="sqlalchemytrunktestselectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/select.py (1128 => 1129)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/select.py 2006-03-13 01:06:33 UTC (rev 1128) +++ sqlalchemy/trunk/test/select.py 2006-03-13 01:13:47 UTC (rev 1129) </span><span class="lines">@@ -174,6 +174,12 @@ </span><span class="cx"> select([table2.c.othername, func.count(table2.c.otherid)], group_by = [table2.c.othername]), </span><span class="cx"> "SELECT myothertable.othername, count(myothertable.otherid) FROM myothertable GROUP BY myothertable.othername" </span><span class="cx"> ) </span><ins>+ + def testoraclelimit(self): + e = create_engine('oracle') + users = Table('users', e, Column('name', String(10), key='username')) + self.runtest(select([users.c.username], limit=5), "SELECT name FROM (SELECT users.name AS name, ROW_NUMBER() OVER (ORDER BY users.rowid ASC) AS ora_rn FROM users) WHERE ora_rn<=5", engine=e) + </ins><span class="cx"> def testgroupby_and_orderby(self): </span><span class="cx"> self.runtest( </span><span class="cx"> select([table2.c.othername, func.count(table2.c.otherid)], group_by = [table2.c.othername], order_by = [table2.c.othername]), </span></span></pre> </div> </div> </body> </html> |
