From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 3 Jan 2015 17:10:17 +0000 (-0500)
Subject: - tighten the inspection in _ColumnEntity to reduce unnecessary
X-Git-Tag: rel_1_0_0b1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb40221a28735cad9e5d7ece1127d9d312051c4f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- tighten the inspection in _ColumnEntity to reduce unnecessary
isinstance() calls, express intent more clearly
---

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index d2bdf5a00c..7302574e62 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3542,26 +3542,26 @@ class _ColumnEntity(_QueryEntity):
         )):
             self._label_name = column.key
             column = column._query_clause_element()
-        else:
-            self._label_name = getattr(column, 'key', None)
-
-        if not isinstance(column, expression.ColumnElement) and \
-                hasattr(column, '_select_iterable'):
-            for c in column._select_iterable:
-                if c is column:
-                    break
-                _ColumnEntity(query, c, namespace=column)
-            else:
+            if isinstance(column, Bundle):
+                _BundleEntity(query, column)
                 return
-        elif isinstance(column, Bundle):
-            _BundleEntity(query, column)
-            return
+        elif not isinstance(column, sql.ColumnElement):
+            if hasattr(column, '_select_iterable'):
+                # break out an object like Table into
+                # individual columns
+                for c in column._select_iterable:
+                    if c is column:
+                        break
+                    _ColumnEntity(query, c, namespace=column)
+                else:
+                    return
 
-        if not isinstance(column, sql.ColumnElement):
             raise sa_exc.InvalidRequestError(
                 "SQL expression, column, or mapped entity "
                 "expected - got '%r'" % (column, )
             )
+        else:
+            self._label_name = getattr(column, 'key', None)
 
         self.type = type_ = column.type
         if type_.hashable: