summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2019-10-11 17:33:48 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2019-10-11 17:33:48 +0000
commit0e9da6ee8d54bd0cde9ef3fb1ce3bceca841624f (patch)
treea09707bd53859a643d00ca2dd53c71a44a8cc887 /lib/sqlalchemy
parentb453397e6ab9857a32eee35bd0e45f81ac11872f (diff)
parent105810c92123c74b0066ef01db5d1696932800c6 (diff)
downloadsqlalchemy-0e9da6ee8d54bd0cde9ef3fb1ce3bceca841624f.tar.gz
Merge "Omit onclause as source of FROMs from a Join"
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/sql/selectable.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index 6282cf2ee..6a7413fc0 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -1157,12 +1157,7 @@ class Join(FromClause):
@property
def _from_objects(self):
- return (
- [self]
- + self.onclause._from_objects
- + self.left._from_objects
- + self.right._from_objects
- )
+ return [self] + self.left._from_objects + self.right._from_objects
# FromClause ->