From 378e86124b598f2773cf124beab853ad63b71ee9 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 28 Jan 2012 10:45:23 -0500
Subject: - [bug] Fixed regression from 0.7.4 whereby using an already
 instrumented column from a superclass as "polymorphic_on" failed to resolve
 the underlying Column.  [ticket:2345]

---
 lib/sqlalchemy/orm/mapper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 13b5b3e47..4c952c1fd 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -128,7 +128,7 @@ class Mapper(object):
         self.batch = batch
         self.eager_defaults = eager_defaults
         self.column_prefix = column_prefix
-        self.polymorphic_on = polymorphic_on
+        self.polymorphic_on = expression._clause_element_as_expr(polymorphic_on)
         self._dependency_processors = []
         self.validators = util.immutabledict()
         self.passive_updates = passive_updates
-- 
cgit v1.2.1