From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 18 Jul 2012 16:46:09 +0000 (-0400)
Subject: this can be any expression
X-Git-Tag: rel_0_8_0b1~314
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=643a9afa86328ca6038d00543700dbe0f51af5e6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

this can be any expression
---

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index cd2fa62d59..8b4a140f2e 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -360,11 +360,13 @@ class Mapper(_InspectionAttr):
     """
 
     polymorphic_on = None
-    """The :class:`.Column` specified as the ``polymorphic_on`` column
+    """The :class:`.Column` or SQL expression specified as the
+    ``polymorphic_on`` argument
     for this :class:`.Mapper`, within an inheritance scenario.
 
-    This attribute may also be of other types besides :class:`.Column`
-    in a future SQLAlchemy release.
+    This attribute is normally a :class:`.Column` instance but
+    may also be an expression, such as one derived from
+    :func:`.cast`.
 
     This is a *read only* attribute determined during mapper construction.
     Behavior is undefined if directly modified.