[Sqlalchemy-commits] [1106] sqlalchemy/trunk/lib/sqlalchemy/sql.py: checking in patch for column lab
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1106] sqlalchemy/trunk/lib/sqlalchemy/sql.py: checking in patch for column labels limit at 30 chars...what the heck
|
From: <co...@sq...> - 2006-03-06 23:15:58
|
<!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>[1106] sqlalchemy/trunk/lib/sqlalchemy/sql.py: checking in patch for column labels limit at 30 chars...what the heck</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1106</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-06 17:15:47 -0600 (Mon, 06 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>checking in patch for column labels limit at 30 chars...what the heck</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemysqlpy">sqlalchemy/trunk/lib/sqlalchemy/sql.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 (1105 => 1106)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-06 19:09:30 UTC (rev 1105) +++ sqlalchemy/trunk/lib/sqlalchemy/sql.py 2006-03-06 23:15:47 UTC (rev 1106) </span><span class="lines">@@ -953,6 +953,7 @@ </span><span class="cx"> self.obj = obj </span><span class="cx"> obj.parens=True </span><span class="cx"> key = property(lambda s: s.name) </span><ins>+ </ins><span class="cx"> _label = property(lambda s: s.name) </span><span class="cx"> original = property(lambda s:s.obj.original) </span><span class="cx"> parent = property(lambda s:s.obj.parent) </span><span class="lines">@@ -971,11 +972,16 @@ </span><span class="cx"> self.key = self.name = self.text = text </span><span class="cx"> self.table = selectable </span><span class="cx"> self.type = type or sqltypes.NullTypeEngine() </span><ins>+ self.__label = None </ins><span class="cx"> def _get_label(self): </span><del>- if self.table is not None: - return self.table.name + "_" + self.text - else: - return self.text </del><ins>+ if self.__label is None: + if self.table is not None: + self.__label = self.table.name + "_" + self.text + else: + self.__label = self.text + if len(self.__label) >= 30: + self.__label = self.__label[0:24] + "_" + hex(random.randint(0, 65535))[2:] + return self.__label </ins><span class="cx"> _label = property(_get_label) </span><span class="cx"> def accept_visitor(self, visitor): </span><span class="cx"> visitor.visit_column(self) </span></span></pre> </div> </div> </body> </html> |
