summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/schema.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/sql/schema.py')
-rw-r--r--lib/sqlalchemy/sql/schema.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index 55d0b74e6..2c5daa17c 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -2505,7 +2505,10 @@ class ColumnCollectionMixin(object):
for expr in expressions:
strname = None
column = None
- if not isinstance(expr, ClauseElement):
+ if hasattr(expr, '__clause_element__'):
+ expr = expr.__clause_element__()
+
+ if not isinstance(expr, (ColumnElement, TextClause)):
# this assumes a string
strname = expr
else: