From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 2 Oct 2010 00:39:35 +0000 (-0400)
Subject: - Make it clear that the second mapping of User is against User.__table__, [ticket... 
X-Git-Tag: rel_0_6_5~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fff5da2eb4d1720617e871b639adbd58b1f3cdc;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Make it clear that the second mapping of User is against User.__table__, [ticket:1934]
---

diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst
index 1ac212961d..7de7ac3449 100644
--- a/doc/build/orm/tutorial.rst
+++ b/doc/build/orm/tutorial.rst
@@ -254,7 +254,7 @@ For example, below we create a new :class:`~sqlalchemy.orm.query.Query` object w
 .. sourcecode:: python+sql
 
     {sql}>>> our_user = session.query(User).filter_by(name='ed').first() # doctest:+ELLIPSIS,+NORMALIZE_WHITESPACE
-    BEGIN
+    BEGIN (implicit)
     INSERT INTO users (name, fullname, password) VALUES (?, ?, ?)
     ('ed', 'Ed Jones', 'edspassword')
     SELECT users.id AS users_id, users.name AS users_name, users.fullname AS users_fullname, users.password AS users_password
@@ -325,7 +325,7 @@ If we look at Ed's ``id`` attribute, which earlier was ``None``, it now has a va
 .. sourcecode:: python+sql
 
     {sql}>>> ed_user.id # doctest: +NORMALIZE_WHITESPACE
-    BEGIN
+    BEGIN (implicit)
     SELECT users.id AS users_id, users.name AS users_name, users.fullname AS users_fullname, users.password AS users_password
     FROM users
     WHERE users.id = ?
@@ -373,7 +373,7 @@ Rolling back, we can see that ``ed_user``'s name is back to ``ed``, and ``fake_u
     {stop}
 
     {sql}>>> ed_user.name #doctest: +NORMALIZE_WHITESPACE
-    BEGIN
+    BEGIN (implicit)
     SELECT users.id AS users_id, users.name AS users_name, users.fullname AS users_fullname, users.password AS users_password
     FROM users
     WHERE users.id = ?
@@ -824,7 +824,7 @@ Querying for Jack, we get just Jack back.  No SQL is yet issued for Jack's addre
 .. sourcecode:: python+sql
 
     {sql}>>> jack = session.query(User).filter_by(name='jack').one() #doctest: +NORMALIZE_WHITESPACE
-    BEGIN
+    BEGIN (implicit)
     SELECT users.id AS users_id, users.name AS users_name, users.fullname AS users_fullname, users.password AS users_password
     FROM users
     WHERE users.name = ?
@@ -1196,6 +1196,7 @@ Below, we use ``mapper()`` to reconfigure an ORM mapping for ``User`` and ``Addr
 
 .. sourcecode:: python+sql
 
+    >>> users_table = User.__table__
     >>> mapper(User, users_table, properties={    # doctest: +ELLIPSIS
     ...     'addresses':relationship(Address, backref='user', cascade="all, delete, delete-orphan")
     ... })
@@ -1211,7 +1212,7 @@ Now when we load Jack (below using ``get()``, which loads by primary key), remov
 
     # load Jack by primary key
     {sql}>>> jack = session.query(User).get(5)    #doctest: +NORMALIZE_WHITESPACE
-    BEGIN
+    BEGIN (implicit)
     SELECT users.id AS users_id, users.name AS users_name, users.fullname AS users_fullname, users.password AS users_password
     FROM users
     WHERE users.id = ?