summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-01-28 10:45:23 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-01-28 10:45:23 -0500
commit378e86124b598f2773cf124beab853ad63b71ee9 (patch)
tree786c0e08abb28aaf18c476be5ad46cb18e0027ca /lib
parent5221f492ca704d75561d7729fba0fa48fd3ad0fb (diff)
downloadsqlalchemy-378e86124b598f2773cf124beab853ad63b71ee9.tar.gz
- [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]
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/mapper.py2
1 files changed, 1 insertions, 1 deletions
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