- merged -r4458:4466 of query_columns branch

- this branch changes query.values() to immediately return an iterator, adds a new "aliased" construct which will be the primary method to get at aliased columns when using values()
- tentative ORM versions of _join and _outerjoin are not yet public, would like to integrate with Query better (work continues in the branch)
- lots of fixes to expressions regarding cloning and correlation.  Some apparent ORM bug-workarounds removed.
- to fix a recursion issue with anonymous identifiers, bind parameters generated against columns now just use the name of the column instead of the tablename_columnname label (plus the unique integer counter).  this way expensive recursive schemes aren't needed for the anon identifier logic.   This, as usual, impacted a ton of compiler unit tests which needed a search-n-replace for the new bind names.

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 722acd6f0..21e0101d2 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -1485,7 +1485,7 @@ class ResultProxy(object):
                 # you say something like query.options(contains_alias('fooalias')) - the matching
                 # is done on strings
                 if isinstance(key, expression.ColumnElement):
-                    if key._label.lower() in props:
+                    if key._label and key._label.lower() in props:
                         return props[key._label.lower()]
                     elif key.name.lower() in props:
                         return props[key.name.lower()]