From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 25 Jan 2008 20:52:13 +0000 (+0000)
Subject: encourage usage of union() and other composites as module-level
X-Git-Tag: rel_0_4_3~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63d2ce51911058af655c5eee28aa949f829073ef;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

encourage usage of union() and other composites as module-level
---

diff --git a/doc/build/content/sqlexpression.txt b/doc/build/content/sqlexpression.txt
index eaee021759..d97a43e63b 100644
--- a/doc/build/content/sqlexpression.txt
+++ b/doc/build/content/sqlexpression.txt
@@ -744,10 +744,12 @@ If we wanted to use our `calculate` statement twice with different bind paramete
     
 ### Unions and Other Set Operations {@name=unions}
 
-Unions come in two flavors, UNION and UNION ALL, which are available via module level functions or methods off a Selectable:
+Unions come in two flavors, UNION and UNION ALL, which are available via module level functions:
 
     {python}
-    >>> u = addresses.select(addresses.c.email_address=='foo@bar.com').union(
+    >>> from sqlalchemy.sql import union
+    >>> u = union(
+    ...     addresses.select(addresses.c.email_address=='foo@bar.com'),
     ...    addresses.select(addresses.c.email_address.like('%@yahoo.com')),
     ... ).order_by(addresses.c.email_address)
 
@@ -763,7 +765,9 @@ Unions come in two flavors, UNION and UNION ALL, which are available via module
 Also available, though not supported on all databases, are `intersect()`, `intersect_all()`, `except_()`, and `except_all()`:
 
     {python}
-    >>> u = addresses.select(addresses.c.email_address.like('%@%.com')).except_(
+    >>> from sqlalchemy.sql import except_
+    >>> u = except_(
+    ...    addresses.select(addresses.c.email_address.like('%@%.com')),
     ...    addresses.select(addresses.c.email_address.like('%@msn.com'))
     ... )