polymorphic_fetch is deprecated. Mark it so in the documentation.

diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 2f1a423f3ddb0116f9c31fbf31f78ecd09b44218..99443d00d24906bd48456caeba80f8a83e0af03a 100644 (file)
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -402,7 +402,7 @@ def relation(argument, secondary=None, **kwargs):
     """
     return RelationProperty(argument, secondary=secondary, **kwargs)
 
-def dynamic_loader(argument, secondary=None, primaryjoin=None, secondaryjoin=None, 
+def dynamic_loader(argument, secondary=None, primaryjoin=None, secondaryjoin=None,
     foreign_keys=None, backref=None, post_update=False, cascade=False, remote_side=None, enable_typechecks=True,
     passive_deletes=False, order_by=None, comparator_factory=None):
     """Construct a dynamically-loading mapper property.
@@ -469,10 +469,10 @@ def column_property(*args, **kwargs):
           :func:`~sqlalchemy.orm.deferred`.
 
       extension
-        an :class:`~sqlalchemy.orm.interfaces.AttributeExtension` instance, 
-        or list of extensions, which will be prepended to the list of 
+        an :class:`~sqlalchemy.orm.interfaces.AttributeExtension` instance,
+        or list of extensions, which will be prepended to the list of
         attribute listeners for the resulting descriptor placed on the class.
-        These listeners will receive append and set events before the 
+        These listeners will receive append and set events before the
         operation proceeds, and may be used to halt (via exception throw)
         or change the value used in the operation.
 
@@ -542,10 +542,10 @@ def composite(class_, *cols, **kwargs):
       which provides custom SQL clause generation for comparison operations.
 
     extension
-      an :class:`~sqlalchemy.orm.interfaces.AttributeExtension` instance, 
-      or list of extensions, which will be prepended to the list of 
+      an :class:`~sqlalchemy.orm.interfaces.AttributeExtension` instance,
+      or list of extensions, which will be prepended to the list of
       attribute listeners for the resulting descriptor placed on the class.
-      These listeners will receive append and set events before the 
+      These listeners will receive append and set events before the
       operation proceeds, and may be used to halt (via exception throw)
       or change the value used in the operation.
 
@@ -668,10 +668,8 @@ def mapper(class_, local_table=None, *args, **params):
         corresponding to the *class identity* of this mapper.
 
       polymorphic_fetch
-        specifies how subclasses mapped through joined-table inheritance will
-        be fetched.  options are 'union', 'select', and 'deferred'.  if the
-        'with_polymorphic' argument is present, defaults to 'union', otherwise
-        defaults to 'select'.
+        Deprecated. Unloaded columns load as deferred in all cases; loading
+        can be controlled using the "with_polymorphic" option.
 
       properties
         A dictionary mapping the string names of object attributes to