[Sqlalchemy-commits] [5204] sqlalchemy/trunk: Mysql no longer expects include_columns to be specifi
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5204] sqlalchemy/trunk: Mysql no longer expects include_columns to be specified in lowercase.
|
From: <co...@sq...> - 2008-10-28 16:48:25
|
<!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><meta http-equiv="content-type" content="text/html; charset=utf-8" /><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, #header, #footer { 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; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #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>[5204] sqlalchemy/trunk: Mysql no longer expects include_columns to be specified in lowercase.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5204</dd> <dt>Author</dt> <dd>empty</dd> <dt>Date</dt> <dd>2008-10-28 12:48:13 -0400 (Tue, 28 Oct 2008)</dd> </dl> <h3>Log Message</h3> <pre>Mysql no longer expects include_columns to be specified in lowercase. Fixes #1206.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkCHANGES">sqlalchemy/trunk/CHANGES</a></li> <li><a href="#sqlalchemytrunklibsqlalchemydatabasesmysqlpy">sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py</a></li> <li><a href="#sqlalchemytrunktestdialectmysqlpy">sqlalchemy/trunk/test/dialect/mysql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkCHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/CHANGES (5203 => 5204)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/CHANGES 2008-10-27 22:56:53 UTC (rev 5203) +++ sqlalchemy/trunk/CHANGES 2008-10-28 16:48:13 UTC (rev 5204) </span><span class="lines">@@ -77,6 +77,9 @@ </span><span class="cx"> explicit schema= is the same as the schema (database) the </span><span class="cx"> connection is attached to. </span><span class="cx"> </span><ins>+ - No longer expects include_columns in table reflection to be + lower case. + </ins><span class="cx"> 0.5.0rc2 </span><span class="cx"> ======== </span><span class="cx"> - orm </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemydatabasesmysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py (5203 => 5204)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py 2008-10-27 22:56:53 UTC (rev 5203) +++ sqlalchemy/trunk/lib/sqlalchemy/databases/mysql.py 2008-10-28 16:48:13 UTC (rev 5204) </span><span class="lines">@@ -2216,7 +2216,7 @@ </span><span class="cx"> name, type_, args, notnull = \ </span><span class="cx"> spec['name'], spec['coltype'], spec['arg'], spec['notnull'] </span><span class="cx"> </span><del>- if only and name.lower() not in only: </del><ins>+ if only and name not in only: </ins><span class="cx"> self.logger.info("Omitting reflected column %s.%s" % </span><span class="cx"> (table.name, name)) </span><span class="cx"> return </span></span></pre></div> <a id="sqlalchemytrunktestdialectmysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/dialect/mysql.py (5203 => 5204)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/dialect/mysql.py 2008-10-27 22:56:53 UTC (rev 5203) +++ sqlalchemy/trunk/test/dialect/mysql.py 2008-10-28 16:48:13 UTC (rev 5204) </span><span class="lines">@@ -656,6 +656,29 @@ </span><span class="cx"> finally: </span><span class="cx"> def_table.drop() </span><span class="cx"> </span><ins>+ def test_reflection_on_include_columns(self): + """Test reflection of include_columns to be sure they respect case.""" + + case_table = Table('mysql_case', MetaData(testing.db), + Column('c1', String(10)), + Column('C2', String(10)), + Column('C3', String(10))) + + try: + case_table.create() + reflected = Table('mysql_case', MetaData(testing.db), + autoload=True, include_columns=['c1', 'C2']) + for t in case_table, reflected: + assert 'c1' in t.c.keys() + assert 'C2' in t.c.keys() + reflected2 = Table('mysql_case', MetaData(testing.db), + autoload=True, include_columns=['c1', 'c2']) + assert 'c1' in reflected2.c.keys() + for c in ['c2', 'C2', 'C3']: + assert c not in reflected2.c.keys() + finally: + case_table.drop() + </ins><span class="cx"> @testing.exclude('mysql', '<', (5, 0, 0), 'early types are squirrely') </span><span class="cx"> @testing.uses_deprecated('Using String type with no length') </span><span class="cx"> def test_type_reflection(self): </span></span></pre> </div> </div> </body> </html> |