summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/schema.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-07-31 00:10:04 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2016-07-31 00:10:04 -0400
commit1269b08b1baecc50ed78f5e5facce0a736b125f8 (patch)
tree3db5d9ad2b5e8a0eb93530f9e9229661c46ac915 /lib/sqlalchemy/sql/schema.py
parentcda9defe58f80759f2b40e658fd7b25eb4d92610 (diff)
downloadsqlalchemy-1269b08b1baecc50ed78f5e5facce0a736b125f8.tar.gz
Ensure post-__clause_element__() expression are used in Index
The change in Index for 1.1 combined with the fix for ref #3763 still fails to deliver the correct object resolved by __clause_element__() to the list of expressions for compilation. Make sure we use the expression that's been unwrapped from __clause_element__(). Change-Id: Ie1df8db5090de665048331786f0024d52851923f Fixes: #3763
Diffstat (limited to 'lib/sqlalchemy/sql/schema.py')
-rw-r--r--lib/sqlalchemy/sql/schema.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index 2c5daa17c..457259d61 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -3287,12 +3287,14 @@ class Index(DialectKWArgs, ColumnCollectionMixin, SchemaItem):
self.table = None
columns = []
+ processed_expressions = []
for expr, column, strname, add_element in self.\
_extract_col_expression_collection(expressions):
if add_element is not None:
columns.append(add_element)
+ processed_expressions.append(expr)
- self.expressions = expressions
+ self.expressions = processed_expressions
self.name = quoted_name(name, kw.pop("quote", None))
self.unique = kw.pop('unique', False)
if 'info' in kw: