From: mike bayer <mike_mp@zzzcomputing.com>
Date: Tue, 4 Oct 2016 20:48:08 +0000 (-0400)
Subject: Merge "Enhance "raise" strategy to include "raise_on_sql" option"
X-Git-Tag: rel_1_1_0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5a5a72e175d7c6a70d5b2a0399377c7a133cced;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge "Enhance "raise" strategy to include "raise_on_sql" option"
---

e5a5a72e175d7c6a70d5b2a0399377c7a133cced
diff --cc doc/build/changelog/changelog_11.rst
index c8731601c8,6e2fc014ce..c5be9c7c25
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@@ -21,18 -21,16 +21,28 @@@
  .. changelog::
      :version: 1.1.0
  
+     .. change::
+         :tags: feature, orm
+         :tickets: 3812
+ 
+         Enhanced the new "raise" lazy loader strategy to also include a
+         "raise_on_sql" variant, available both via :paramref:`.orm.relationship.lazy`
+         as well as :func:`.orm.raiseload`.   This variant only raises if the
+         lazy load would actually emit SQL, vs. raising if the lazy loader
+         mechanism is invoked at all.
+ 
 +    .. change::
 +        :tags: bug, orm
 +        :tickets: 3811
 +
 +        Made an adjustment to the bug fix first introduced in [ticket:3431]
 +        that involves an object appearing in multiple contexts in a single
 +        result set, such that an eager loader that would set the related
 +        object value to be None will still fire off, thus satisfying the
 +        load of that attribute.  Previously, the adjustment only honored
 +        a non-None value arriving for an eagerly loaded attribute in a
 +        secondary row.
 +
      .. change::
          :tags: bug, orm
          :tickets: 3808