summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorHajime Nakagami <nakagami@gmail.com>2013-03-02 23:34:11 +0900
committerHajime Nakagami <nakagami@gmail.com>2013-03-02 23:34:11 +0900
commita40c50c3dba014bc2bb71d35e81034b09b29a7ab (patch)
treeb52c45295a38bcd7135acefd19b2ec7abd01c22a /lib/sqlalchemy/sql
parent62e3560e4d3b505fb557a5b8c4f48f4cf52ca4f0 (diff)
parentd9a7f2dbd5f9b3a111b04ff59089cb84220fe427 (diff)
downloadsqlalchemy-a40c50c3dba014bc2bb71d35e81034b09b29a7ab.tar.gz
merge from default
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/expression.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 90837f4ab..490004e39 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -2604,7 +2604,14 @@ class FromClause(Selectable):
**params)
def select(self, whereclause=None, **params):
- """return a SELECT of this :class:`.FromClause`."""
+ """return a SELECT of this :class:`.FromClause`.
+
+ .. seealso::
+
+ :func:`~.sql.expression.select` - general purpose
+ method which allows for arbitrary column lists.
+
+ """
return select([self], whereclause, **params)