diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-02-02 11:06:08 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-02-02 11:06:08 -0500 |
| commit | 29de1077b35fb264f4b1727bd1f4987644ff52b7 (patch) | |
| tree | be0c3283a6447f316fcf44b6c1945bead922ec89 /lib/sqlalchemy/orm/query.py | |
| parent | 5b0919f3f5c7678c587858a47e38acd4a5b82f25 (diff) | |
| download | sqlalchemy-29de1077b35fb264f4b1727bd1f4987644ff52b7.tar.gz | |
- Fixed bug in new :class:`.TextAsFrom` construct where :class:`.Column`-
oriented row lookups were not matching up to the ad-hoc :class:`.ColumnClause`
objects that :class:`.TextAsFrom` generates, thereby making it not
usable as a target in :meth:`.Query.from_statement`. Also fixed
:meth:`.Query.from_statement` mechanics to not mistake a :class:`.TextAsFrom`
for a :class:`.Select` construct. This bug is also an 0.9 regression
as the :meth:`.Text.columns` method is called to accommodate the
:paramref:`.text.typemap` argument. [ticket:2932]
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 10d635b8d..949c7eff9 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -3471,6 +3471,7 @@ class QueryContext(object): if query._statement is not None: if isinstance(query._statement, expression.SelectBase) and \ + not query._statement._textual and \ not query._statement.use_labels: self.statement = query._statement.apply_labels() else: |