[Sqlalchemy-commits] [1243] sqlalchemy/trunk/doc/build: added a type to label....

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

<!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>[1243] sqlalchemy/trunk/doc/build: added a type to label....</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1243</dd>
<dt>Author</dt> <dd>zzzeek</dd>
<dt>Date</dt> <dd>2006-04-02 22:24:06 -0500 (Sun, 02 Apr 2006)</dd>
</dl>

<h3>Log Message</h3>
<pre>added a type to label....</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sqlalchemytrunkdocbuildtxt2mytpy">sqlalchemy/trunk/doc/build/txt2myt.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="sqlalchemytrunkdocbuildtxt2mytpy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/trunk/doc/build/txt2myt.py (1242 => 1243)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/trunk/doc/build/txt2myt.py	2006-04-03 02:00:18 UTC (rev 1242)
+++ sqlalchemy/trunk/doc/build/txt2myt.py	2006-04-03 03:24:06 UTC (rev 1243)
</span><span class="lines">@@ -264,5 +264,5 @@
</span><span class="cx">         input = file(inname).read()
</span><span class="cx">         html = markdown.markdown(input)
</span><span class="cx">         myt = html2myghtydoc(html)
</span><del>-        file(inname[:-3] + &quot;html&quot;, 'w').write(html)
</del><ins>+        #file(inname[:-3] + &quot;html&quot;, 'w').write(html)
</ins><span class="cx">         file(outname, 'w').write(myt)
</span></span></pre></div>
<a id="sqlalchemytrunklibsqlalchemysqlpy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql.py (1242 => 1243)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql.py	2006-04-03 02:00:18 UTC (rev 1242)
+++ sqlalchemy/trunk/lib/sqlalchemy/sql.py	2006-04-03 03:24:06 UTC (rev 1243)
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx">     def endswith(self, other):
</span><span class="cx">         return self._compare('LIKE', &quot;%&quot; + str(other))
</span><span class="cx">     def label(self, name):
</span><del>-        return Label(name, self)
</del><ins>+        return Label(name, self, self.type)
</ins><span class="cx">     def distinct(self):
</span><span class="cx">         return CompoundClause(None,&quot;DISTINCT&quot;, self)
</span><span class="cx">     def op(self, operator):
</span><span class="lines">@@ -995,11 +995,12 @@
</span><span class="cx"> 
</span><span class="cx">     
</span><span class="cx"> class Label(ColumnElement):
</span><del>-    def __init__(self, name, obj):
</del><ins>+    def __init__(self, name, obj, type=None):
</ins><span class="cx">         self.name = name
</span><span class="cx">         while isinstance(obj, Label):
</span><span class="cx">             obj = obj.obj
</span><span class="cx">         self.obj = obj
</span><ins>+        self.type = type or sqltypes.NullTypeEngine()
</ins><span class="cx">         obj.parens=True
</span><span class="cx">     key = property(lambda s: s.name)
</span><span class="cx">     
</span></span></pre>
</div>
</div>

</body>
</html>