[Sqlalchemy-commits] [1451] sqlalchemy/branches/schema/lib/sqlalchemy: various tweaks to sql generat
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1451] sqlalchemy/branches/schema/lib/sqlalchemy: various tweaks to sql generation
|
From: <co...@sq...> - 2006-05-13 01:18:15
|
<!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>[1451] sqlalchemy/branches/schema/lib/sqlalchemy: various tweaks to sql generation</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1451</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-12 20:18:04 -0500 (Fri, 12 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>various tweaks to sql generation</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyansisqlpy">sqlalchemy/branches/schema/lib/sqlalchemy/ansisql.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemysqlpy">sqlalchemy/branches/schema/lib/sqlalchemy/sql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyansisqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/ansisql.py (1450 => 1451)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/ansisql.py 2006-05-13 01:05:14 UTC (rev 1450) +++ sqlalchemy/branches/schema/lib/sqlalchemy/ansisql.py 2006-05-13 01:18:04 UTC (rev 1451) </span><span class="lines">@@ -169,7 +169,7 @@ </span><span class="cx"> # if we are within a visit to a Select, set up the "typemap" </span><span class="cx"> # for this column which is used to translate result set values </span><span class="cx"> self.typemap.setdefault(column.key.lower(), column.type) </span><del>- if column.table is None or column.table.name is None: </del><ins>+ if column.table is None or not column.table.named_with_column(): </ins><span class="cx"> self.strings[column] = column.name </span><span class="cx"> else: </span><span class="cx"> if column.table.oid_column is column: </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/sql.py (1450 => 1451)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-13 01:05:14 UTC (rev 1450) +++ sqlalchemy/branches/schema/lib/sqlalchemy/sql.py 2006-05-13 01:18:04 UTC (rev 1451) </span><span class="lines">@@ -660,6 +660,9 @@ </span><span class="cx"> return Join(self, right, isouter = True, *args, **kwargs) </span><span class="cx"> def alias(self, name=None): </span><span class="cx"> return Alias(self, name) </span><ins>+ def named_with_column(self): + """True if the name of this FromClause may be prepended to a column in a generated SQL statement""" + return False </ins><span class="cx"> def _locate_oid_column(self): </span><span class="cx"> """subclasses override this to return an appropriate OID column""" </span><span class="cx"> return None </span><span class="lines">@@ -1059,7 +1062,9 @@ </span><span class="cx"> return self.selectable.oid_column._make_proxy(self) </span><span class="cx"> else: </span><span class="cx"> return None </span><del>- </del><ins>+ + def named_with_column(self): + return True </ins><span class="cx"> def _exportable_columns(self): </span><span class="cx"> #return self.selectable._exportable_columns() </span><span class="cx"> return self.selectable.columns </span><span class="lines">@@ -1107,7 +1112,7 @@ </span><span class="cx"> self.__label = None </span><span class="cx"> def _get_label(self): </span><span class="cx"> if self.__label is None: </span><del>- if self.table is not None and self.table.name is not None: </del><ins>+ if self.table is not None and self.table.named_with_column(): </ins><span class="cx"> self.__label = self.table.name + "_" + self.name </span><span class="cx"> else: </span><span class="cx"> self.__label = self.name </span><span class="lines">@@ -1129,10 +1134,7 @@ </span><span class="cx"> else: </span><span class="cx"> return [] </span><span class="cx"> def _bind_param(self, obj): </span><del>- if self.table.name is None: - return BindParamClause(self.name, obj, shortname=self.name, type=self.type) - else: - return BindParamClause(self._label, obj, shortname = self.name, type=self.type) </del><ins>+ return BindParamClause(self._label, obj, shortname = self.name, type=self.type) </ins><span class="cx"> def _make_proxy(self, selectable, name = None): </span><span class="cx"> c = ColumnClause(name or self.name, selectable, hidden=self.hidden) </span><span class="cx"> c.orig_set = self.orig_set </span><span class="lines">@@ -1157,7 +1159,9 @@ </span><span class="cx"> self._oid_column = ColumnClause('oid', self, hidden=True) </span><span class="cx"> </span><span class="cx"> indexes = property(lambda s:s._indexes) </span><del>- </del><ins>+ + def named_with_column(self): + return True </ins><span class="cx"> def append_column(self, c): </span><span class="cx"> self._columns[c.name] = c </span><span class="cx"> c.table = self </span><span class="lines">@@ -1347,9 +1351,11 @@ </span><span class="cx"> </span><span class="cx"> for f in from_obj: </span><span class="cx"> self.append_from(f) </span><del>- - name = property(lambda s:"SELECT statement") </del><span class="cx"> </span><ins>+ def _foo(self): + raise "wtf?" + name = property(lambda s:s._foo()) #"SELECT statement") + </ins><span class="cx"> class CorrelatedVisitor(ClauseVisitor): </span><span class="cx"> """visits a clause, locates any Select clauses, and tells them that they should </span><span class="cx"> correlate their FROM list to that of their parent.""" </span><span class="lines">@@ -1420,7 +1426,7 @@ </span><span class="cx"> for f in self._froms.values(): </span><span class="cx"> if f is self: </span><span class="cx"> # TODO: why would we be in our own _froms list ? </span><del>- continue </del><ins>+ raise exceptions.AssertionError("Select statement should not be in its own _froms list") </ins><span class="cx"> oid = f.oid_column </span><span class="cx"> if oid is not None: </span><span class="cx"> return oid </span></span></pre> </div> </div> </body> </html> |
