summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/relationships.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-12-15 20:06:27 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-12-15 20:06:27 -0500
commit638c1c46b23273e3c50638537ecfec91e839253e (patch)
tree886c3defaf21f6017caeb8a06d9db3e6b40b13f8 /lib/sqlalchemy/orm/relationships.py
parent752359936645a6308beb52e77dbdbfad9929a301 (diff)
downloadsqlalchemy-638c1c46b23273e3c50638537ecfec91e839253e.tar.gz
load_on_pending is different from enable_relationship_loading and should
not be superseded. both have a potential use.
Diffstat (limited to 'lib/sqlalchemy/orm/relationships.py')
-rw-r--r--lib/sqlalchemy/orm/relationships.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index c1cf07fbe..c0004e742 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -448,10 +448,6 @@ class RelationshipProperty(StrategizedProperty):
:param load_on_pending=False:
Indicates loading behavior for transient or pending parent objects.
- .. versionchanged:: 0.8
- load_on_pending is superseded by
- :meth:`.Session.enable_relationship_loading`.
-
When set to ``True``, causes the lazy-loader to
issue a query for a parent object that is not persistent, meaning it has
never been flushed. This may take effect for a pending object when
@@ -467,6 +463,12 @@ class RelationshipProperty(StrategizedProperty):
.. versionadded:: 0.6.5
+ .. seealso::
+
+ :meth:`.Session.load_on_pending` - this method establishes
+ "load on pending" behavior for the whole object, and also allows
+ loading on objects that remain transient or detached.
+
:param order_by:
indicates the ordering that should be applied when loading these
items. ``order_by`` is expected to refer to one of the :class:`.Column`