summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/mapper.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
-rw-r--r--lib/sqlalchemy/orm/mapper.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index c0a53694a..975ffb6ab 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -270,8 +270,14 @@ class Mapper(InspectionAttr):
:param extension: A :class:`.MapperExtension` instance or
list of :class:`.MapperExtension` instances which will be applied
- to all operations by this :class:`.Mapper`. **Deprecated.**
- Please see :class:`.MapperEvents`.
+ to all operations by this :class:`.Mapper`.
+
+ .. deprecated:: 0.7
+
+ :class:`.MapperExtension` is deprecated in favor of the
+ :class:`.MapperEvents` listener interface. The
+ :paramref:`.mapper.extension` parameter will be
+ removed in a future release.
:param include_properties: An inclusive list or set of string column
names to map.
@@ -344,8 +350,9 @@ class Mapper(InspectionAttr):
ordering.
.. deprecated:: 1.1 The :paramref:`.Mapper.order_by` parameter
- is deprecated. Use :meth:`.Query.order_by` to determine the
- ordering of a result set.
+ is deprecated, and will be removed in a future release.
+ Use :meth:`.Query.order_by` to determine the ordering of a
+ result set.
:param passive_deletes: Indicates DELETE behavior of foreign key
columns when a joined-table inheritance entity is being deleted.