[Sqlalchemy-commits] [1213] sqlalchemy/trunk/lib/sqlalchemy: column label generation checks for a co
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1213] sqlalchemy/trunk/lib/sqlalchemy: column label generation checks for a conflict against a column named the same as the label
|
From: <co...@sq...> - 2006-03-26 15:36:55
|
<!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>[1213] sqlalchemy/trunk/lib/sqlalchemy: column label generation checks for a conflict against a column named the same as the label</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1213</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-26 09:36:43 -0600 (Sun, 26 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>column label generation checks for a conflict against a column named the same as the label comment in mapper</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1212 => 1213)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-26 07:21:28 UTC (rev 1212) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-26 15:36:43 UTC (rev 1213) </span><span class="lines">@@ -998,8 +998,8 @@ </span><span class="cx"> </span><span class="cx"> Essentially, this method is used to have a different mapper populate the object: </span><span class="cx"> </span><del>- def populate_instance(self, mapper, *args): - othermapper.populate_instance(*args) </del><ins>+ def populate_instance(self, mapper, instance, row, identitykey, imap, isnew): + othermapper.populate_instance(instance, row, identitykey, imap, isnew, frommapper=mapper) </ins><span class="cx"> return False </span><span class="cx"> """ </span><span class="cx"> if self.next is None: </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1212 => 1213)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-26 07:21:28 UTC (rev 1212) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-26 15:36:43 UTC (rev 1213) </span><span class="lines">@@ -1024,7 +1024,7 @@ </span><span class="cx"> self.__label = self.table.name + "_" + self.text </span><span class="cx"> else: </span><span class="cx"> self.__label = self.text </span><del>- if len(self.__label) >= 30: </del><ins>+ if (self.table is not None and self.table.c.has_key(self.__label)) or len(self.__label) >= 30: </ins><span class="cx"> self.__label = self.__label[0:24] + "_" + hex(random.randint(0, 65535))[2:] </span><span class="cx"> return self.__label </span><span class="cx"> _label = property(_get_label) </span></span></pre> </div> </div> </body> </html> |
