- random performance whacking vs. 0.9, in particular we have to watch

for the slots-based __getattr__ thing getting hit

2 files changed, 7 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py
index 875443e60..c3f95fa10 100644
--- a/lib/sqlalchemy/orm/base.py
+++ b/lib/sqlalchemy/orm/base.py
@@ -327,7 +327,7 @@ def _is_mapped_class(entity):
 
     insp = inspection.inspect(entity, False)
     return insp is not None and \
-        hasattr(insp, "mapper") and \
+        not insp.is_clause_element and \
         (
             insp.is_mapper
             or insp.is_aliased_class
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index eac2da083..fdee986d3 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3342,6 +3342,12 @@ class Bundle(object):
     """If True, queries for a single Bundle will be returned as a single
     entity, rather than an element within a keyed tuple."""
 
+    is_clause_element = False
+
+    is_mapper = False
+
+    is_aliased_class = False
+
     def __init__(self, name, *exprs, **kw):
         """Construct a new :class:`.Bundle`.