diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2016-07-30 12:54:10 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ln3.zzzcomputing.com> | 2016-07-30 12:54:10 -0400 |
| commit | cda9defe58f80759f2b40e658fd7b25eb4d92610 (patch) | |
| tree | 9182994c7b48648cf8267d3cd616e00410d91867 /lib/sqlalchemy/sql/schema.py | |
| parent | 99248e843d4acde786e373a3056083ea34d72589 (diff) | |
| parent | 6327c59d4f34947128bd9b2860a1732a6932b4d7 (diff) | |
| download | sqlalchemy-cda9defe58f80759f2b40e658fd7b25eb4d92610.tar.gz | |
Merge "Index should extract __clause_element__() early"
Diffstat (limited to 'lib/sqlalchemy/sql/schema.py')
| -rw-r--r-- | lib/sqlalchemy/sql/schema.py | 5 |
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: |