From 1269b08b1baecc50ed78f5e5facce0a736b125f8 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 31 Jul 2016 00:10:04 -0400 Subject: [PATCH] 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 --- lib/sqlalchemy/sql/schema.py | 4 +++- test/sql/test_metadata.py | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index 2c5daa17cd..457259d617 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: diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py index cf7f7628a1..af291b8427 100644 --- a/test/sql/test_metadata.py +++ b/test/sql/test_metadata.py @@ -2168,6 +2168,20 @@ class ConstraintTest(fixtures.TestBase): eq_(set(t.indexes), set([idx])) + def test_clauseelement_extraction_three(self): + t = Table('t', MetaData(), Column('x', Integer), Column('y', Integer)) + + expr1 = t.c.x + 5 + + class MyThing(object): + def __clause_element__(self): + return expr1 + + idx = Index('bar', MyThing(), t.c.y) + + is_(idx.expressions[0], expr1) + is_(idx.expressions[1], t.c.y) + def test_table_references(self): t1, t2, t3 = self._single_fixture() assert list(t2.c.a.foreign_keys)[0].references(t1) -- 2.47.2