import python-sqlalchemy-1.3.2-2.module+el8.3.0+6647+8d010749

SOURCES/fix-regression-in-ambiguous-join-logic.patch

@@ -0,0 +1,115 @@
+diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
+index 3077840..8719b26 100644
+--- a/lib/sqlalchemy/sql/util.py
++++ b/lib/sqlalchemy/sql/util.py
+@@ -20,6 +20,7 @@ from .annotation import _shallow_annotate  # noqa
+ from .base import _from_objects
+ from .base import ColumnSet
+ from .ddl import sort_tables  # noqa
++from .elements import _expand_cloned
+ from .elements import _find_columns  # noqa
+ from .elements import _label_reference
+ from .elements import _textual_label_reference
+@@ -149,6 +150,16 @@ def find_left_clause_to_join_from(clauses, join_to, onclause):
+                 idx.append(i)
+                 break
+ 
++    if len(idx) > 1:
++        # this is the same "hide froms" logic from
++        # Selectable._get_display_froms
++        toremove = set(
++            chain(*[_expand_cloned(f._hide_froms) for f in clauses])
++        )
++        idx = [
++            i for i in idx if clauses[i] not in toremove
++        ]
++
+     # onclause was given and none of them resolved, so assume
+     # all indexes can match
+     if not idx and onclause is not None:
+diff --git a/test/orm/test_joins.py b/test/orm/test_joins.py
+index bb9747c..4fe04f7 100644
+--- a/test/orm/test_joins.py
++++ b/test/orm/test_joins.py
+@@ -1559,6 +1559,81 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
+             "ON dingalings.address_id = addresses_1.id",
+         )
+ 
++    def test_clause_present_in_froms_twice_w_onclause(self):
++        # test [ticket:4584]
++        Order, Address, Dingaling, User = (
++            self.classes.Order,
++            self.classes.Address,
++            self.classes.Dingaling,
++            self.classes.User,
++        )
++
++        sess = create_session()
++
++        a1 = aliased(Address)
++
++        q = sess.query(Order).select_from(Order, a1, User)
++        assert_raises_message(
++            sa.exc.InvalidRequestError,
++            "Can't determine which FROM clause to join from, there are "
++            "multiple FROMS which can join to this entity. "
++            "Try adding an explicit ON clause to help resolve the ambiguity.",
++            q.outerjoin,
++            a1,
++        )
++
++        # the condition which occurs here is: Query._from_obj contains both
++        # "a1" by itself as well as a join that "a1" is part of.
++        # find_left_clause_to_join_from() needs to include removal of froms
++        # that are in the _hide_froms of joins the same way
++        # Selectable._get_display_froms does.
++        q = sess.query(Order).select_from(Order, a1, User)
++        q = q.outerjoin(a1, a1.id == Order.address_id)
++        q = q.outerjoin(User, a1.user_id == User.id)
++
++        self.assert_compile(
++            q,
++            "SELECT orders.id AS orders_id, orders.user_id AS orders_user_id, "
++            "orders.address_id AS orders_address_id, "
++            "orders.description AS orders_description, "
++            "orders.isopen AS orders_isopen "
++            "FROM orders "
++            "LEFT OUTER JOIN addresses AS addresses_1 "
++            "ON addresses_1.id = orders.address_id "
++            "LEFT OUTER JOIN users ON addresses_1.user_id = users.id",
++        )
++
++    def test_clause_present_in_froms_twice_wo_onclause(self):
++        # test [ticket:4584]
++        Order, Address, Dingaling, User = (
++            self.classes.Order,
++            self.classes.Address,
++            self.classes.Dingaling,
++            self.classes.User,
++        )
++
++        sess = create_session()
++
++        a1 = aliased(Address)
++
++        # the condition which occurs here is: Query._from_obj contains both
++        # "a1" by itself as well as a join that "a1" is part of.
++        # find_left_clause_to_join_from() needs to include removal of froms
++        # that are in the _hide_froms of joins the same way
++        # Selectable._get_display_froms does.
++        q = sess.query(User).select_from(Dingaling, a1, User)
++        q = q.outerjoin(a1, User.id == a1.user_id)
++        q = q.outerjoin(Dingaling)
++
++        self.assert_compile(
++            q,
++            "SELECT users.id AS users_id, users.name AS users_name "
++            "FROM users LEFT OUTER JOIN addresses AS addresses_1 "
++            "ON users.id = addresses_1.user_id "
++            "LEFT OUTER JOIN dingalings "
++            "ON addresses_1.id = dingalings.address_id",
++        )
++
+     def test_multiple_adaption(self):
+         Item, Order, User = (
+             self.classes.Item,

SPECS/python-sqlalchemy.spec

@@ -15,7 +15,7 @@
 
 Name:           python-sqlalchemy
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -23,6 +23,12 @@ License:        MIT
 URL:            http://www.sqlalchemy.org/
 Source0:        https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
 
+# Fold entities into existing joins when resolving FROM ambiguity.
+# This regression was introduced with the 1.3 sqlalchemy series.
+# Fixed upstream: https://github.com/sqlalchemy/sqlalchemy/commit/25a42e93f4ef5ce1a9f9c23fbcdea3e21a7b3f1a
+# Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1829932
+Patch0:         fix-regression-in-ambiguous-join-logic.patch
+
 BuildRequires:  gcc
 
 %if %{with python2}
@@ -99,6 +105,7 @@ This package includes the python 3 version of the module.
 
 %prep
 %setup -n %{srcname}-%{version}
+%patch0 -p1
 
 %build
 %{?with_python2:%py2_build}
@@ -143,6 +150,10 @@ PYTHONPATH=. %{__python3} -m pytest test
 %endif # with python3
 
 %changelog
+* Fri May 15 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.3.2-2
+- Fix regression in ambiguous join logic
+Resolves: rhbz#1829932
+
 * Fri Apr 05 2019 Charalampos Stratakis <cstratak@redhat.com> - 1.3.2-1
 - Rebase to 1.3.2 to fix CVE-2019-7164 and CVE-2019-7548
 Resolves: rhbz#1695754