From 051e43245daabb6d96978d32f220f494ab0f026f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 18 Nov 2007 22:47:55 +0000 Subject: [PATCH] doctest fixups --- doc/build/content/ormtutorial.txt | 6 +++--- doc/build/content/sqlexpression.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/build/content/ormtutorial.txt b/doc/build/content/ormtutorial.txt index c65338f05b..225536d5c5 100644 --- a/doc/build/content/ormtutorial.txt +++ b/doc/build/content/ormtutorial.txt @@ -901,7 +901,7 @@ Now when we load Jack, removing an address from his `addresses` collection will BEGIN 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 = ? ORDER BY users.oid + WHERE users.id = ? [5] {stop} @@ -1073,12 +1073,12 @@ We can now look up all blog posts with the keyword 'firstpost'. We'll use a sp {python} {sql}>>> session.query(BlogPost).filter(BlogPost.keywords.any(keyword='firstpost')).all() + INSERT INTO posts (user_id, headline, body) VALUES (?, ?, ?) + [2, "Wendy's Blog Post", 'This is a test'] INSERT INTO keywords (keyword) VALUES (?) ['wendy'] INSERT INTO keywords (keyword) VALUES (?) ['firstpost'] - INSERT INTO posts (user_id, headline, body) VALUES (?, ?, ?) - [2, "Wendy's Blog Post", 'This is a test'] INSERT INTO post_keywords (post_id, keyword_id) VALUES (?, ?) [[1, 1], [1, 2]] SELECT posts.id AS posts_id, posts.user_id AS posts_user_id, posts.headline AS posts_headline, posts.body AS posts_body diff --git a/doc/build/content/sqlexpression.txt b/doc/build/content/sqlexpression.txt index 67fe213082..317296a56b 100644 --- a/doc/build/content/sqlexpression.txt +++ b/doc/build/content/sqlexpression.txt @@ -787,7 +787,7 @@ To embed a SELECT in a column expression, use `as_scalar()`: ... ])).fetchall() SELECT users.name, (SELECT count(addresses.id) FROM addresses - WHERE users.id = addresses.user_id) + WHERE users.id = addresses.user_id) AS anon_1 FROM users [] {stop}[(u'jack', 2), (u'wendy', 2), (u'fred', 0), (u'mary', 0)] -- 2.47.2