From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 25 Aug 2013 19:00:54 +0000 (-0400)
Subject: - fix server-side non-returning example
X-Git-Tag: rel_0_9_0b1~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df1113ac19842ca0b30c13fb1d6031fa7f24371b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fix server-side non-returning example
- mention eager_defaults
---

diff --git a/doc/build/orm/mapper_config.rst b/doc/build/orm/mapper_config.rst
index 88b256ae22..c35e3429c1 100644
--- a/doc/build/orm/mapper_config.rst
+++ b/doc/build/orm/mapper_config.rst
@@ -1274,7 +1274,8 @@ automatically providing the new value of the version id counter.
 
 The ORM typically does not actively fetch the values of database-generated
 values when it emits an INSERT or UPDATE, instead leaving these columns as
-"expired" and to be fetched when they are next accessed.  However, when a
+"expired" and to be fetched when they are next accessed, unless the ``eager_defaults``
+:func:`.mapper` flag is set.  However, when a
 server side version column is used, the ORM needs to actively fetch the newly
 generated value.  This is so that the version counter is set up *before*
 any concurrent transaction may update it again.   This fetching is also
@@ -1291,10 +1292,10 @@ like this::
 Where above, the ORM can acquire any newly generated primary key values along
 with server-generated version identifiers in one statement.   When the backend
 does not support RETURNING, an additional SELECT must be emitted for **every**
-INSERT, which is much less efficient, and also introduces the possibility of
+INSERT and UPDATE, which is much less efficient, and also introduces the possibility of
 missed version counters::
 
-    INSERT INTO "user" (name) VALUES (%(name)s) RETURNING "user".id, "user".version_id
+    INSERT INTO "user" (name) VALUES (%(name)s)
     {'name': 'ed'}
 
     SELECT "user".version_id AS user_version_id FROM "user" where