summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/util.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-06-03 21:28:53 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-06-03 21:28:53 -0400
commit55fa83fd39a0cd572e7d6426b059235d18a91e9d (patch)
tree15c529afa225bb89aeadb09635fb7bc123b1cc60 /lib/sqlalchemy/sql/util.py
parent87909841c50d00b40153b1a1181a4acfea070fa8 (diff)
downloadsqlalchemy-55fa83fd39a0cd572e7d6426b059235d18a91e9d.tar.gz
OK this is the broken version, need to think a lot more about this
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
-rw-r--r--lib/sqlalchemy/sql/util.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index ffa07d3df..c80693706 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -832,8 +832,9 @@ class ClauseAdapter(visitors.ReplacingCloningVisitor):
newcol = self.selectable.c.get(col.name)
return newcol
+ magic_flag = False
def replace(self, col):
- if isinstance(col, expression.FromClause) and \
+ if not self.magic_flag and isinstance(col, expression.FromClause) and \
self.selectable.is_derived_from(col):
return self.selectable
elif not isinstance(col, expression.ColumnElement):