From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 2 Mar 2018 16:58:52 +0000 (-0500)
Subject: - add some seealsos for the transient object that loads use case
X-Git-Tag: rel_1_1_18~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1127fe7407c36dca72929cc3eb614cd7269857db;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- add some seealsos for the transient object that loads use case

Change-Id: Ibfa79a3721f31806223906cccf4547673b3d42f1
(cherry picked from commit 5de2e17b6e6686adf0a87038e90b001978187c0a)
---

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index d7f4c5105a..d198de77ea 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1847,6 +1847,11 @@ class Session(_SessionClassMethods):
          method.
 
 
+        .. seealso::
+
+            :func:`.make_transient_to_detached` - provides for an alternative
+            means of "merging" a single object into the :class:`.Session`
+
         """
 
         if self._warn_on_events:
@@ -2107,6 +2112,10 @@ class Session(_SessionClassMethods):
             allows per-relationship loading of many-to-ones on items that
             are pending.
 
+            :func:`.make_transient_to_detached` - allows for an object to
+            be added to a :class:`.Session` without SQL emitted, which then
+            will unexpire attributes on access.
+
         """
         state = attributes.instance_state(obj)
         to_attach = self._before_attach(state, obj)
@@ -3000,6 +3009,8 @@ def make_transient_to_detached(instance):
 
         :func:`.make_transient`
 
+        :meth:`.Session.enable_relationship_loading`
+
     """
     state = attributes.instance_state(instance)
     if state.session_id or state.key: