summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/util.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-06-02 18:05:47 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-06-02 18:05:47 -0400
commitaf3fa1f69c077789b8a1c5078d1bb94a8d5e2240 (patch)
tree2cf4009db2cb4c3793d400147e8308dfa9e08b4a /lib/sqlalchemy/sql/util.py
parent32716eae773e6f6b7f37baf705342c1ed89df461 (diff)
downloadsqlalchemy-af3fa1f69c077789b8a1c5078d1bb94a8d5e2240.tar.gz
implement join rewriting inside of visit_select(). Currently this is global or not based on fixing nested_join_translation as True or not.
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
-rw-r--r--lib/sqlalchemy/sql/util.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index 91740dc16..ffa07d3df 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -797,8 +797,11 @@ class ClauseAdapter(visitors.ReplacingCloningVisitor):
def __init__(self, selectable, equivalents=None,
include=None, exclude=None,
include_fn=None, exclude_fn=None,
- adapt_on_names=False):
+ adapt_on_names=False,
+ traverse_options=None):
self.__traverse_options__ = {'stop_on': [selectable]}
+ if traverse_options:
+ self.__traverse_options__.update(traverse_options)
self.selectable = selectable
if include:
assert not include_fn
@@ -832,7 +835,7 @@ class ClauseAdapter(visitors.ReplacingCloningVisitor):
def replace(self, col):
if isinstance(col, expression.FromClause) and \
self.selectable.is_derived_from(col):
- return self.selectable
+ return self.selectable
elif not isinstance(col, expression.ColumnElement):
return None
elif self.include_fn and not self.include_fn(col):