diff options
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 11 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 1 |
3 files changed, 13 insertions, 7 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 030d6dce9..27e883c86 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -1095,14 +1095,19 @@ class SQLCompiler(engine.Compiled): c._label = c._key_label = c.name elem.right = selectable - adapters.append( - sql_util.ClauseAdapter(selectable, + import pdb + pdb.set_trace() + adapter = sql_util.ClauseAdapter(selectable, traverse_options=traverse_options) - ) + adapter.__traverse_options__.pop('stop_on') + adapters.append(adapter) select = visitors.cloned_traverse(select, traverse_options, {"join": visit_join}) + if adapters: + import pdb + pdb.set_trace() for adap in reversed(adapters): select = adap.traverse(select) return select diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 5820cb106..edab9e290 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -4212,10 +4212,10 @@ class FromGrouping(FromClause): @property def foreign_keys(self): - # this could be - # self.element.foreign_keys - # see SelectableTest.test_join_condition - return set() + return self.element.foreign_keys + + def is_derived_from(self, element): + return self.element.is_derived_from(element) @property def _hide_froms(self): diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index ffa07d3df..6a267752e 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -833,6 +833,7 @@ class ClauseAdapter(visitors.ReplacingCloningVisitor): return newcol def replace(self, col): + print "COL!", col if isinstance(col, expression.FromClause) and \ self.selectable.is_derived_from(col): return self.selectable |