From 7e6a5e7946249eb885bf46ba8cb19228d934b395 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 24 Mar 2014 11:48:18 -0400 Subject: [PATCH] - fix some doctest failures (though some remain, as it's not easy to get doctest to accept things flexibly), fix #2999 --- doc/build/orm/tutorial.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst index 7fe43e200f..9a10506803 100644 --- a/doc/build/orm/tutorial.rst +++ b/doc/build/orm/tutorial.rst @@ -893,7 +893,7 @@ database results. Here's a brief tour: .. sourcecode:: python+sql - >>> query = session.query(User.id).filter(User.name.like('%ed')).\ + >>> query = session.query(User.id).filter(User.name == 'ed').\ ... order_by(User.id) {sql}>>> query.scalar() #doctest: +NORMALIZE_WHITESPACE SELECT users.id AS users_id @@ -993,7 +993,7 @@ completely "raw", using string names to identify desired columns: .. sourcecode:: python+sql >>> q = session.query(User.id, User.name) - {sql}>>> q.order_by("name").all() + {sql}>>> q.order_by("name").all() #doctest: +NORMALIZE_WHITESPACE SELECT users.id AS users_id, users.name AS users_name FROM users ORDER BY name () @@ -1118,7 +1118,7 @@ To achieve our simple ``SELECT count(*) FROM table``, we can apply it as: .. sourcecode:: python+sql - {sql}>>> session.query(func.count('*')).select_from(User).scalar() + {sql}>>> session.query(func.count('*')).select_from(User).scalar() #doctest: +NORMALIZE_WHITESPACE SELECT count(?) AS count_1 FROM users ('*',) @@ -1384,7 +1384,7 @@ using the :meth:`.Query.join` method: FROM users JOIN addresses ON users.id = addresses.user_id WHERE addresses.email_address = ? ('jack@google.com',) - {stop}[] + {stop}[] :meth:`.Query.join` knows how to join between ``User`` and ``Address`` because there's only one foreign key between them. If there -- 2.47.3