[Sqlalchemy-commits] [1490] sqlalchemy/trunk: anonymous indexes use column._label to avoid name coll
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1490] sqlalchemy/trunk: anonymous indexes use column._label to avoid name collisions
|
From: <co...@sq...> - 2006-05-23 14:59:43
|
<!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>[1490] sqlalchemy/trunk: anonymous indexes use column._label to avoid name collisions</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1490</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-23 09:59:32 -0500 (Tue, 23 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>anonymous indexes use column._label to avoid name collisions</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkCHANGES">sqlalchemy/trunk/CHANGES</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyschemapy">sqlalchemy/trunk/lib/sqlalchemy/schema.py</a></li> <li><a href="#sqlalchemytrunktestindexespy">sqlalchemy/trunk/test/indexes.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkCHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/CHANGES (1489 => 1490)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/CHANGES 2006-05-23 14:59:11 UTC (rev 1489) +++ sqlalchemy/trunk/CHANGES 2006-05-23 14:59:32 UTC (rev 1490) </span><span class="lines">@@ -1,3 +1,6 @@ </span><ins>+next +- anonymous indexes (via Column(unique=True) etc) use column._label for naming +to avoid collisions </ins><span class="cx"> 0.1.7 </span><span class="cx"> - some fixes to topological sort algorithm </span><span class="cx"> - added DISTINCT ON support to Postgres (just supply distinct=[col1,col2..]) </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyschemapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/schema.py (1489 => 1490)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/schema.py 2006-05-23 14:59:11 UTC (rev 1489) +++ sqlalchemy/trunk/lib/sqlalchemy/schema.py 2006-05-23 14:59:32 UTC (rev 1490) </span><span class="lines">@@ -208,12 +208,12 @@ </span><span class="cx"> raise ValueError("index and unique may not both be specified") </span><span class="cx"> if index: </span><span class="cx"> if index is True: </span><del>- name = 'ix_%s' % column.name </del><ins>+ name = 'ix_%s' % column._label </ins><span class="cx"> else: </span><span class="cx"> name = index </span><span class="cx"> elif unique: </span><span class="cx"> if unique is True: </span><del>- name = 'ux_%s' % column.name </del><ins>+ name = 'ux_%s' % column._label </ins><span class="cx"> else: </span><span class="cx"> name = unique </span><span class="cx"> # find this index in self.indexes </span></span></pre></div> <a id="sqlalchemytrunktestindexespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/indexes.py (1489 => 1490)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/indexes.py 2006-05-23 14:59:11 UTC (rev 1489) +++ sqlalchemy/trunk/test/indexes.py 2006-05-23 14:59:32 UTC (rev 1490) </span><span class="lines">@@ -87,8 +87,8 @@ </span><span class="cx"> Column('winner', String(30), index='idx_winners')) </span><span class="cx"> </span><span class="cx"> index_names = [ ix.name for ix in events.indexes ] </span><del>- assert 'ux_name' in index_names - assert 'ix_location' in index_names </del><ins>+ assert 'ux_events_name' in index_names + assert 'ix_events_location' in index_names </ins><span class="cx"> assert 'sport_announcer' in index_names </span><span class="cx"> assert 'idx_winners' in index_names </span><span class="cx"> assert len(index_names) == 4 </span><span class="lines">@@ -104,9 +104,9 @@ </span><span class="cx"> </span><span class="cx"> assert capt[0].strip().startswith('CREATE TABLE events') </span><span class="cx"> assert capt[2].strip() == \ </span><del>- 'CREATE UNIQUE INDEX ux_name ON events (name)' </del><ins>+ 'CREATE UNIQUE INDEX ux_events_name ON events (name)' </ins><span class="cx"> assert capt[4].strip() == \ </span><del>- 'CREATE INDEX ix_location ON events (location)' </del><ins>+ 'CREATE INDEX ix_events_location ON events (location)' </ins><span class="cx"> assert capt[6].strip() == \ </span><span class="cx"> 'CREATE UNIQUE INDEX sport_announcer ON events (sport, announcer)' </span><span class="cx"> assert capt[8].strip() == \ </span></span></pre> </div> </div> </body> </html> |
