From: Michael Trier <mtrier@gmail.com>
Date: Sat, 4 Apr 2009 00:48:26 +0000 (+0000)
Subject: Corrected doc notations that suppressed some non-SQL output. Fixes #1366.
X-Git-Tag: rel_0_5_4~36
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1954b87039059813cde97f044ccd62ba4bb11015;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Corrected doc notations that suppressed some non-SQL output. Fixes #1366.
---

diff --git a/doc/build/ormtutorial.rst b/doc/build/ormtutorial.rst
index 1190f3c336..b0d547bc9b 100644
--- a/doc/build/ormtutorial.rst
+++ b/doc/build/ormtutorial.rst
@@ -682,7 +682,7 @@ Querying for Jack, we get just Jack back.  No SQL is yet issued for Jack's addre
      LIMIT 2 OFFSET 0
     ['jack']
 
-    >>> jack
+    {stop}>>> jack
     <User('jack','Jack Bean', 'gjffdd')>
 
 Let's look at the ``addresses`` collection.  Watch the SQL:
@@ -709,14 +709,14 @@ If you want to reduce the number of queries (dramatically, in many cases), we ca
     anon_1.users_fullname AS anon_1_users_fullname, anon_1.users_password AS anon_1_users_password,
     addresses_1.id AS addresses_1_id, addresses_1.email_address AS addresses_1_email_address,
     addresses_1.user_id AS addresses_1_user_id
-        FROM (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 = ?
-         LIMIT 2 OFFSET 0) AS anon_1 LEFT OUTER JOIN addresses AS addresses_1
-         ON anon_1.users_id = addresses_1.user_id ORDER BY addresses_1.id
-        ['jack']
-
-    >>> jack
+    FROM (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 = ?
+    LIMIT 2 OFFSET 0) AS anon_1 LEFT OUTER JOIN addresses AS addresses_1
+    ON anon_1.users_id = addresses_1.user_id ORDER BY addresses_1.id
+    ['jack']
+
+    {stop}>>> jack
     <User('jack','Jack Bean', 'gjffdd')>
 
     >>> jack.addresses