From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 11 Nov 2009 03:46:45 +0000 (+0000)
Subject: merge r6497 of 0.5 branch
X-Git-Tag: rel_0_6beta1~170
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f74e231ba7db4ad2cd6587bf2d1923d9eb7687b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge r6497 of 0.5 branch
---

diff --git a/doc/build/ormtutorial.rst b/doc/build/ormtutorial.rst
index 855f951406..b1f647e51b 100644
--- a/doc/build/ormtutorial.rst
+++ b/doc/build/ormtutorial.rst
@@ -449,10 +449,22 @@ Here's a rundown of some of the most common operators used in ``filter()``:
 
     query.filter(User.name.in_(['ed', 'wendy', 'jack']))
 
+    # works with query objects too:
+    
+    query.filter(User.name.in_(session.query(User.name).filter(User.name.like('%ed%'))))
+    
+* NOT IN::
+
+    query.filter(~User.name.in_(['ed', 'wendy', 'jack']))
+
 * IS NULL::
 
     filter(User.name == None)
 
+* IS NOT NULL::
+
+    filter(User.name != None)
+
 * AND::
 
     from sqlalchemy import and_