summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-07-23 20:59:46 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-07-23 20:59:46 -0400
commit37ced0946c4717422f8a4cc6ce4de1bd78ee942e (patch)
tree3e19ca29d1a84c85ea49078c22b03ab86ca1151b /lib/sqlalchemy/sql
parentec1762e6204a84207332cf1b2a0f0df4b5bc8937 (diff)
downloadsqlalchemy-37ced0946c4717422f8a4cc6ce4de1bd78ee942e.tar.gz
- some more interpret_as_froms
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/expression.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index a518852d8..a26a71f16 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -3665,8 +3665,8 @@ class Join(FromClause):
:class:`.FromClause` object.
"""
- self.left = _literal_as_text(left)
- self.right = _literal_as_text(right).self_group()
+ self.left = _interpret_as_from(left)
+ self.right = _interpret_as_from(right).self_group()
if onclause is None:
self.onclause = self._match_primaries(self.left, self.right)
@@ -4886,7 +4886,7 @@ class Select(SelectBase):
if from_obj is not None:
self._from_obj = util.OrderedSet(
- _literal_as_text(f)
+ _interpret_as_from(f)
for f in util.to_list(from_obj))
else:
self._from_obj = util.OrderedSet()