summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-08-18 18:16:40 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-08-21 17:08:08 -0400
commit822b85d114b4252a0b52a9efdd41ce89d0fb8d06 (patch)
tree06f3ede9b20c19a7e0acc8837e67934b5482e933 /lib/sqlalchemy/sql
parent944f99a3b1d887feb1f36b1ffe2fc3f2101bd460 (diff)
downloadsqlalchemy-822b85d114b4252a0b52a9efdd41ce89d0fb8d06.tar.gz
additoinal
cherry pick of 9302be39a5f40b537ff43e1990c7a210c464cf1c from 0.9 Conflicts: lib/sqlalchemy/sql/selectable.py
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/expression.py20
1 files changed, 18 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index ce7322b9d..b2f957bd0 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -4702,7 +4702,7 @@ class TableClause(Immutable, FromClause):
class SelectBase(Executable, FromClause):
- """Base class for :class:`.Select` and ``CompoundSelects``."""
+ """Base class for :class:`.Select` and :class:`.CompoundSelect`."""
_order_by_clause = ClauseList()
_group_by_clause = ClauseList()
@@ -5021,7 +5021,23 @@ class ScalarSelect(Generative, Grouping):
class CompoundSelect(SelectBase):
"""Forms the basis of ``UNION``, ``UNION ALL``, and other
- SELECT-based set operations."""
+ SELECT-based set operations.
+
+ .. seealso::
+
+ :func:`.union`
+
+ :func:`.union_all`
+
+ :func:`.intersect`
+
+ :func:`.intersect_all`
+
+ :func:`.except`
+
+ :func:`.except_all`
+
+ """
__visit_name__ = 'compound_select'