From 80343838d579b868c952a4cefb393262883506dc Mon Sep 17 00:00:00 2001
From: Ansgar <ansgar@debian.org>
Date: Sat, 18 Mar 2023 16:47:00 +0100
Subject: [PATCH] newer_version: explicitly specify which relationship's parent
 to use

SQLAlchemy 1.3 and 1.4 disagree whether to use
`DBBinary.suites` (SQLA 1.3) or `DBSource.suites` (SQLA 1.4).
Explicitly specify which one to use.
---
 daklib/cruft.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/daklib/cruft.py b/daklib/cruft.py
index ed5d2250..e533b6eb 100644
--- a/daklib/cruft.py
+++ b/daklib/cruft.py
@@ -53,9 +53,9 @@ def newer_version(lowersuite_name, highersuite_name, session, include_equal=Fals
                            func.max(DBSource.version).label('version'),
                            Architecture.arch_string,
                            func.max(DBBinary.version).label('binversion')). \
-            join(DBSource). \
-            with_parent(suite). \
-            join(Architecture). \
+            filter(DBBinary.suites.contains(suite)). \
+            join(DBBinary.source). \
+            join(DBBinary.architecture). \
             group_by(
                 DBBinary.package,
                 DBSource.source,
@@ -89,9 +89,9 @@ def newer_version(lowersuite_name, highersuite_name, session, include_equal=Fals
                            DBSource.version,
                            Architecture.arch_string
             ). \
-            join(DBSource). \
-            with_parent(highersuite). \
-            join(Architecture). \
+            filter(DBBinary.suites.contains(highersuite)). \
+            join(DBBinary.source). \
+            join(DBBinary.architecture). \
             filter(DBSource.source == source). \
             subquery()
         q2 = session.query(q1.c.arch_string).group_by(q1.c.arch_string)
-- 
GitLab