summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2016-06-15 15:16:57 -0400
committerGerrit Code Review <gerrit2@ln3.zzzcomputing.com>2016-06-15 15:16:57 -0400
commitecca1f814e6af9c84e24ee05929f5a8455846f40 (patch)
tree793b31205252dda2ed08a9e6caeb91e88253c911
parent0620a76b582cc93d55e3ddfb74ac22682e148a36 (diff)
parent51e4512abd25340b016279b92ae9ecadb41e237d (diff)
downloadsqlalchemy-ecca1f814e6af9c84e24ee05929f5a8455846f40.tar.gz
Merge "Interpret lateral, alias as from clauses"
-rw-r--r--doc/build/core/selectable.rst2
-rw-r--r--lib/sqlalchemy/sql/selectable.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/build/core/selectable.rst b/doc/build/core/selectable.rst
index 3f4d9565e..263594d24 100644
--- a/doc/build/core/selectable.rst
+++ b/doc/build/core/selectable.rst
@@ -73,6 +73,8 @@ elements are themselves :class:`.ColumnElement` subclasses).
:inherited-members:
.. autoclass:: Lateral
+ :members:
+ :inherited-members:
.. autoclass:: ScalarSelect
:members:
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index ac955a60f..741aa9bea 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -158,7 +158,7 @@ def alias(selectable, name=None, flat=False):
.. versionadded:: 0.9.0
"""
- return selectable.alias(name=name, flat=flat)
+ return _interpret_as_from(selectable).alias(name=name, flat=flat)
def lateral(selectable, name=None):
@@ -180,7 +180,7 @@ def lateral(selectable, name=None):
:ref:`lateral_selects` - overview of usage.
"""
- return selectable.lateral(name=name)
+ return _interpret_as_from(selectable).lateral(name=name)
class Selectable(ClauseElement):