diff options
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 29 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 11 |
2 files changed, 28 insertions, 12 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 148da19aa..5165ee78f 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -1280,13 +1280,7 @@ class SQLCompiler(Compiled): cloned = {} column_translate = [{}] - # TODO: should we be using isinstance() for this, - # as this whole system won't work for custom Join/Select - # subclasses where compilation routines - # call down to compiler.visit_join(), compiler.visit_select() - join_name = selectable.Join.__visit_name__ - select_name = selectable.Select.__visit_name__ - alias_name = selectable.Alias.__visit_name__ + def visit(element, **kw): if element in column_translate[-1]: return column_translate[-1][element] @@ -1296,7 +1290,7 @@ class SQLCompiler(Compiled): newelem = cloned[element] = element._clone() - if newelem.__visit_name__ is join_name and \ + if newelem.is_selectable and newelem._is_join and \ isinstance(newelem.right, selectable.FromGrouping): newelem._reset_exported() @@ -1340,11 +1334,22 @@ class SQLCompiler(Compiled): newelem.right = selectable_ newelem.onclause = visit(newelem.onclause, **kw) - elif newelem.__visit_name__ is alias_name \ - and newelem.element.__visit_name__ is select_name: - column_translate.append({}) + + elif newelem.is_selectable and newelem._is_from_container: + # if we hit an Alias or CompoundSelect, put a marker in the + # stack. + kw['transform_clue'] = 'select_container' + newelem._copy_internals(clone=visit, **kw) + elif newelem.is_selectable and newelem._is_select: + barrier_select = kw.get('transform_clue', None) == 'select_container' + # if we're still descended from an Alias/CompoundSelect, we're + # in a FROM clause, so start with a new translate collection + if barrier_select: + column_translate.append({}) + kw['transform_clue'] = 'inside_select' newelem._copy_internals(clone=visit, **kw) - del column_translate[-1] + if barrier_select: + del column_translate[-1] else: newelem._copy_internals(clone=visit, **kw) diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index bda3d655e..59d6687b5 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -137,6 +137,10 @@ class FromClause(Selectable): named_with_column = False _hide_froms = [] + _is_join = False + _is_select = False + _is_from_container = False + _textual = False """a marker that allows us to easily distinguish a :class:`.TextAsFrom` or similar object from other kinds of :class:`.FromClause` objects.""" @@ -504,6 +508,8 @@ class Join(FromClause): """ __visit_name__ = 'join' + _is_join = True + def __init__(self, left, right, onclause=None, isouter=False): """Construct a new :class:`.Join`. @@ -910,6 +916,8 @@ class Alias(FromClause): __visit_name__ = 'alias' named_with_column = True + _is_from_container = True + def __init__(self, selectable, name=None): baseselectable = selectable while isinstance(baseselectable, Alias): @@ -1716,6 +1724,8 @@ class CompoundSelect(GenerativeSelect): INTERSECT = util.symbol('INTERSECT') INTERSECT_ALL = util.symbol('INTERSECT ALL') + _is_from_container = True + def __init__(self, keyword, *selects, **kwargs): self._auto_correlate = kwargs.pop('correlate', False) self.keyword = keyword @@ -1982,6 +1992,7 @@ class Select(HasPrefixes, GenerativeSelect): _correlate = () _correlate_except = None _memoized_property = SelectBase._memoized_property + _is_select = True def __init__(self, columns=None, |