auto-decruft: Fix and reduce two SQL statements

Thanks to Ansgar Burchardt for spotting these issues.

Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/dak/auto_decruft.py b/dak/auto_decruft.py
index 6157a4f3c9a7f9f74de35849627ff592013977ab..a7c67fa3668ed21895f68a93a7634346e5724954 100644 (file)
--- a/dak/auto_decruft.py
+++ b/dak/auto_decruft.py
@@ -358,20 +358,17 @@ def sources2removals(source_list, suite_id, session):
     params = {"suite_id": suite_id, "sources": tuple(source_list)}
     q = session.execute("""
                     SELECT s.source, s.version, 'source', s.id
     params = {"suite_id": suite_id, "sources": tuple(source_list)}
     q = session.execute("""
                     SELECT s.source, s.version, 'source', s.id

-                    FROM source s,
+                    FROM source s

                          JOIN src_associations sa ON sa.source = s.id
                          JOIN src_associations sa ON sa.source = s.id

-                         JOIN suite su ON sa.suite = su.id
-                    WHERE su.id = :suite_id AND s.source IN :sources""", params)
+                    WHERE sa.suite = :suite_id AND s.source IN :sources""", params)

     to_remove.extend(q)
     q = session.execute("""
                     SELECT b.package, b.version, a.arch_string, b.id
                     FROM binaries b
                          JOIN bin_associations ba ON b.id = ba.bin
                          JOIN architecture a ON b.architecture = a.id
     to_remove.extend(q)
     q = session.execute("""
                     SELECT b.package, b.version, a.arch_string, b.id
                     FROM binaries b
                          JOIN bin_associations ba ON b.id = ba.bin
                          JOIN architecture a ON b.architecture = a.id

-                         JOIN suite su ON ba.suite = su.id

                          JOIN source s ON b.source = s.id
                          JOIN source s ON b.source = s.id

-                         JOIN src_associations sa ON s.id = sa.source AND sa.suite = su.id
-                    WHERE su.id = :suite_id AND s.source IN :sources""", params)
+                    WHERE ba.suite = :suite_id AND s.source IN :sources""", params)

     to_remove.extend(q)
     return to_remove
 
     to_remove.extend(q)
     return to_remove