From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 10 Jun 2015 03:39:14 +0000 (-0400)
Subject: - Fixed a bug where clause adaption as applied to a :class:`.Label`
X-Git-Tag: rel_1_0_6~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9030d0241964c919b099e4bdb75d38fd420b546;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Fixed a bug where clause adaption as applied to a :class:`.Label`
object would fail to accommodate the labeled SQL expression
in all cases, such that any SQL operation that made use of
:meth:`.Label.self_group` would use the original unadapted
expression.  One effect of this would be that an ORM :func:`.aliased`
construct would not fully accommodate attributes mapped by
:obj:`.column_property`, such that the un-aliased table could
leak out when the property were used in some kinds of SQL
comparisons.
fixes #3445
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 8521a6cd23..3436a0ca6a 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,6 +18,20 @@
 .. changelog::
     :version: 1.0.6
 
+    .. change::
+        :tags: bug, sql
+        :tickets: 3445
+
+        Fixed a bug where clause adaption as applied to a :class:`.Label`
+        object would fail to accommodate the labeled SQL expression
+        in all cases, such that any SQL operation that made use of
+        :meth:`.Label.self_group` would use the original unadapted
+        expression.  One effect of this would be that an ORM :func:`.aliased`
+        construct would not fully accommodate attributes mapped by
+        :obj:`.column_property`, such that the un-aliased table could
+        leak out when the property were used in some kinds of SQL
+        comparisons.
+
     .. change::
         :tags: bug, documentation
         :tickets: 2077
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index a178ed99a1..27ecce2b0b 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -3103,7 +3103,8 @@ class Label(ColumnElement):
         return self.element,
 
     def _copy_internals(self, clone=_clone, anonymize_labels=False, **kw):
-        self.element = clone(self.element, **kw)
+        self._element = clone(self._element, **kw)
+        self.__dict__.pop('element', None)
         self.__dict__.pop('_allow_label_resolve', None)
         if anonymize_labels:
             self.name = self._resolve_label = _anonymous_label(
diff --git a/test/sql/test_generative.py b/test/sql/test_generative.py
index 12bfdfa9d3..9cf1ef6124 100644
--- a/test/sql/test_generative.py
+++ b/test/sql/test_generative.py
@@ -454,6 +454,27 @@ class ClauseTest(fixtures.TestBase, AssertsCompiledSQL):
             str(f1), str(f2)
         )
 
+    def test_labeled_expression_adapt(self):
+        lbl_x = (t3.c.col1 == 1).label('x')
+        t3_alias = t3.alias()
+
+        adapter = sql_util.ColumnAdapter(t3_alias)
+
+        lblx_adapted = adapter.traverse(lbl_x)
+        is_not_(lblx_adapted._element, lbl_x._element)
+
+        lblx_adapted = adapter.traverse(lbl_x)
+        self.assert_compile(
+            select([lblx_adapted.self_group()]),
+            "SELECT (table3_1.col1 = :col1_1) AS x FROM table3 AS table3_1"
+        )
+
+        self.assert_compile(
+            select([lblx_adapted.is_(True)]),
+            "SELECT (table3_1.col1 = :col1_1) IS 1 AS anon_1 "
+            "FROM table3 AS table3_1"
+        )
+
     def test_text(self):
         clause = text(
             "select * from table where foo=:bar",