From: Federico Caselli <cfederico87@gmail.com>
Date: Fri, 22 May 2020 21:56:50 +0000 (+0200)
Subject: Correctly apply self_group in type_coerce element.
X-Git-Tag: rel_1_3_18~24^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ade467be4b26a4bc6df5be532d42df9ed8765c9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Correctly apply self_group in type_coerce element.

The type coerce element did not correctly apply grouping rules when using
in an expression

Fixes: #5344
Change-Id: Id67b0e60ac54f8992f931aaed62731672f60c96c
(cherry picked from commit d163088de1d68919b6811a25745d3becbbf5b069)
---

diff --git a/doc/build/changelog/unreleased_13/5344.rst b/doc/build/changelog/unreleased_13/5344.rst
new file mode 100644
index 0000000000..d2e598c7bd
--- /dev/null
+++ b/doc/build/changelog/unreleased_13/5344.rst
@@ -0,0 +1,8 @@
+.. change::
+    :tags: bug, sql
+    :tickets: 5344
+
+    Correctly apply self_group in type_coerce element.
+
+    The type coerce element did not correctly apply grouping rules when using
+    in an expression
\ No newline at end of file
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index cd41a3f05e..f050ce9a21 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -2645,7 +2645,7 @@ class TypeCoerce(ColumnElement):
 
             SELECT date_string AS anon_1 FROM log
 
-        When result rows are fetched, the ``StringDateTime`` type
+        When result rows are fetched, the ``StringDateTime`` type processor
         will be applied to result rows on behalf of the ``date_string`` column.
         The rationale for the "anon_1" label is so that the type-coerced
         column remains separate in the list of result columns vs. other
@@ -2714,6 +2714,13 @@ class TypeCoerce(ColumnElement):
         else:
             return self.clause
 
+    def self_group(self, against=None):
+        grouped = self.clause.self_group(against=against)
+        if grouped is not self.clause:
+            return TypeCoerce(grouped, self.type)
+        else:
+            return self
+
 
 class Extract(ColumnElement):
     """Represent a SQL EXTRACT clause, ``extract(field FROM expr)``."""
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py
index 71532601d1..fd8b997c42 100644
--- a/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@ -351,6 +351,13 @@ class SelectableTest(
         assert isinstance(stmt.c.foo.type, MyType)
         assert isinstance(stmt2.c.foo.type, MyType)
 
+    def test_type_coerce_selfgroup(self):
+        no_group = column("a") / type_coerce(column("x"), Integer)
+        group = column("b") / type_coerce(column("y") * column("w"), Integer)
+
+        self.assert_compile(no_group, "a / x")
+        self.assert_compile(group, "b / (y * w)")
+
     def test_select_on_table(self):
         sel = select([table1, table2], use_labels=True)