[Sqlalchemy-commits] [5195] sqlalchemy/trunk/lib/sqlalchemy/sql/expression.py: a couple of refineme
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5195] sqlalchemy/trunk/lib/sqlalchemy/sql/expression.py: a couple of refinements
|
From: <co...@sq...> - 2008-10-25 17:19:23
|
<!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><meta http-equiv="content-type" content="text/html; charset=utf-8" /><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, #header, #footer { 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; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #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>[5195] sqlalchemy/trunk/lib/sqlalchemy/sql/expression.py: a couple of refinements</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5195</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2008-10-25 13:19:15 -0400 (Sat, 25 Oct 2008)</dd> </dl> <h3>Log Message</h3> <pre>a couple of refinements</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemysqlexpressionpy">sqlalchemy/trunk/lib/sqlalchemy/sql/expression.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemysqlexpressionpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/sql/expression.py (5194 => 5195)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/sql/expression.py 2008-10-24 19:43:29 UTC (rev 5194) +++ sqlalchemy/trunk/lib/sqlalchemy/sql/expression.py 2008-10-25 17:19:15 UTC (rev 5195) </span><span class="lines">@@ -876,11 +876,7 @@ </span><span class="cx"> return CompoundSelect(keyword, *selects, **kwargs) </span><span class="cx"> </span><span class="cx"> def _is_literal(element): </span><del>- global _is_literal - from sqlalchemy import schema - def _is_literal(element): - return not isinstance(element, (ClauseElement, Operators, schema.SchemaItem)) - return _is_literal(element) </del><ins>+ return not isinstance(element, ClauseElement) </ins><span class="cx"> </span><span class="cx"> def _from_objects(*elements, **kwargs): </span><span class="cx"> return itertools.chain(*[element._get_from_objects(**kwargs) for element in elements]) </span><span class="lines">@@ -894,7 +890,7 @@ </span><span class="cx"> def _literal_as_text(element): </span><span class="cx"> if hasattr(element, '__clause_element__'): </span><span class="cx"> return element.__clause_element__() </span><del>- elif _is_literal(element): </del><ins>+ elif not isinstance(element, ClauseElement): </ins><span class="cx"> return _TextClause(unicode(element)) </span><span class="cx"> else: </span><span class="cx"> return element </span><span class="lines">@@ -902,7 +898,7 @@ </span><span class="cx"> def _literal_as_column(element): </span><span class="cx"> if hasattr(element, '__clause_element__'): </span><span class="cx"> return element.__clause_element__() </span><del>- elif _is_literal(element): </del><ins>+ elif not isinstance(element, ClauseElement): </ins><span class="cx"> return literal_column(str(element)) </span><span class="cx"> else: </span><span class="cx"> return element </span><span class="lines">@@ -910,7 +906,7 @@ </span><span class="cx"> def _literal_as_binds(element, name=None, type_=None): </span><span class="cx"> if hasattr(element, '__clause_element__'): </span><span class="cx"> return element.__clause_element__() </span><del>- elif _is_literal(element): </del><ins>+ elif not isinstance(element, ClauseElement): </ins><span class="cx"> if element is None: </span><span class="cx"> return null() </span><span class="cx"> else: </span><span class="lines">@@ -921,7 +917,7 @@ </span><span class="cx"> def _no_literals(element): </span><span class="cx"> if hasattr(element, '__clause_element__'): </span><span class="cx"> return element.__clause_element__() </span><del>- elif _is_literal(element): </del><ins>+ elif not isinstance(element, ClauseElement): </ins><span class="cx"> raise exc.ArgumentError("Ambiguous literal: %r. Use the 'text()' function to indicate a SQL expression literal, or 'literal()' to indicate a bound value." % element) </span><span class="cx"> else: </span><span class="cx"> return element </span><span class="lines">@@ -1486,7 +1482,7 @@ </span><span class="cx"> return other </span><span class="cx"> elif hasattr(other, '__clause_element__'): </span><span class="cx"> return other.__clause_element__() </span><del>- elif _is_literal(other): </del><ins>+ elif not isinstance(other, ClauseElement): </ins><span class="cx"> return self._bind_param(other) </span><span class="cx"> else: </span><span class="cx"> return other </span><span class="lines">@@ -1525,6 +1521,10 @@ </span><span class="cx"> quote = None </span><span class="cx"> </span><span class="cx"> @property </span><ins>+ def _select_iterable(self): + return (self, ) + + @property </ins><span class="cx"> def base_columns(self): </span><span class="cx"> if not hasattr(self, '_base_columns'): </span><span class="cx"> self._base_columns = set(c for c in self.proxy_set </span><span class="lines">@@ -1563,7 +1563,7 @@ </span><span class="cx"> selectable.columns[name] = co </span><span class="cx"> return co </span><span class="cx"> </span><del>- @property </del><ins>+ @util.memoized_property </ins><span class="cx"> def anon_label(self): </span><span class="cx"> """provides a constant 'anonymous label' for this ColumnElement. </span><span class="cx"> </span><span class="lines">@@ -1577,9 +1577,7 @@ </span><span class="cx"> expressions and function calls. </span><span class="cx"> """ </span><span class="cx"> </span><del>- if not hasattr(self, '_ColumnElement__anon_label'): - self.__anon_label = "{ANON %d %s}" % (id(self), getattr(self, 'name', 'anon')) - return self.__anon_label </del><ins>+ return "{ANON %d %s}" % (id(self), getattr(self, 'name', 'anon')) </ins><span class="cx"> </span><span class="cx"> class ColumnCollection(util.OrderedProperties): </span><span class="cx"> """An ordered dictionary that stores a list of ColumnElement </span><span class="lines">@@ -1688,7 +1686,7 @@ </span><span class="cx"> </span><span class="cx"> class Selectable(ClauseElement): </span><span class="cx"> """mark a class as being selectable""" </span><del>- </del><ins>+ </ins><span class="cx"> class FromClause(Selectable): </span><span class="cx"> """Represent an element that can be used within the ``FROM`` clause of a ``SELECT`` statement.""" </span><span class="cx"> </span><span class="lines">@@ -1814,7 +1812,7 @@ </span><span class="cx"> return get(self) </span><span class="cx"> return property(attr) </span><span class="cx"> </span><del>- columns = c = _expr_attr_func('_columns') </del><ins>+ columns = c = _select_iterable = _expr_attr_func('_columns') </ins><span class="cx"> primary_key = _expr_attr_func('_primary_key') </span><span class="cx"> foreign_keys = _expr_attr_func('_foreign_keys') </span><span class="cx"> </span><span class="lines">@@ -2014,17 +2012,17 @@ </span><span class="cx"> __visit_name__ = 'clauselist' </span><span class="cx"> </span><span class="cx"> def __init__(self, *clauses, **kwargs): </span><del>- self.clauses = [] </del><span class="cx"> self.operator = kwargs.pop('operator', operators.comma_op) </span><span class="cx"> self.group = kwargs.pop('group', True) </span><span class="cx"> self.group_contents = kwargs.pop('group_contents', True) </span><del>- for c in clauses: - if c is None: - continue - self.append(c) </del><ins>+ if self.group_contents: + self.clauses = [_literal_as_text(clause).self_group(against=self.operator) for clause in clauses if clause is not None] + else: + self.clauses = [_literal_as_text(clause) for clause in clauses if clause is not None] </ins><span class="cx"> </span><span class="cx"> def __iter__(self): </span><span class="cx"> return iter(self.clauses) </span><ins>+ </ins><span class="cx"> def __len__(self): </span><span class="cx"> return len(self.clauses) </span><span class="cx"> </span><span class="lines">@@ -2645,11 +2643,11 @@ </span><span class="cx"> self.__label = None </span><span class="cx"> self.is_literal = is_literal </span><span class="cx"> </span><del>- @property </del><ins>+ @util.memoized_property </ins><span class="cx"> def description(self): </span><span class="cx"> return self.name.encode('ascii', 'backslashreplace') </span><span class="cx"> </span><del>- @property </del><ins>+ @util.memoized_property </ins><span class="cx"> def _label(self): </span><span class="cx"> if self.is_literal: </span><span class="cx"> return None </span><span class="lines">@@ -2767,8 +2765,8 @@ </span><span class="cx"> self._offset = offset </span><span class="cx"> self._bind = bind </span><span class="cx"> </span><del>- self._order_by_clause = ClauseList(*util.to_list(order_by, [])) - self._group_by_clause = ClauseList(*util.to_list(group_by, [])) </del><ins>+ self._order_by_clause = ClauseList(*util.to_list(order_by) or []) + self._group_by_clause = ClauseList(*util.to_list(group_by) or []) </ins><span class="cx"> </span><span class="cx"> def as_scalar(self): </span><span class="cx"> """return a 'scalar' representation of this selectable, which can be used </span><span class="lines">@@ -3076,16 +3074,12 @@ </span><span class="cx"> </span><span class="cx"> @property </span><span class="cx"> def inner_columns(self): </span><del>- """an iteratorof all ColumnElement expressions which would </del><ins>+ """an iterator of all ColumnElement expressions which would </ins><span class="cx"> be rendered into the columns clause of the resulting SELECT statement. </span><span class="cx"> </span><span class="cx"> """ </span><del>- for c in self._raw_columns: - if isinstance(c, Selectable): - for co in c.columns: - yield co - else: - yield c </del><ins>+ + return itertools.chain(*[c._select_iterable for c in self._raw_columns]) </ins><span class="cx"> </span><span class="cx"> def is_derived_from(self, fromclause): </span><span class="cx"> if self in set(fromclause._cloned_set): </span></span></pre> </div> </div> </body> </html> |