From bd45f7976acc21c50382ab65ad588ac47c187a65 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Oct 03 2023 13:23:02 +0000
Subject: unify clauses handling


---

diff --git a/util/koji-sweep-db b/util/koji-sweep-db
index 8c57515..11a759d 100755
--- a/util/koji-sweep-db
+++ b/util/koji-sweep-db
@@ -11,17 +11,17 @@ from kojihub.db import DeleteProcessor, QueryProcessor, BulkInsertProcessor
 
 
 def clean_sessions(cursor, vacuum, test, age, absolute):
-    clauses = f"(update_time < NOW() - '{age:d} days'::interval)"
+    clause = f"(update_time < NOW() - '{age:d} days'::interval)"
     if absolute is not None:
-        clauses += f"OR (start_time < NOW() - '{absolute:d} days'::interval)"
+        clause += f"OR (start_time < NOW() - '{absolute:d} days'::interval)"
 
     if options.verbose:
-        query = QueryProcessor(tables=['sessions'], clauses=[clauses], opts={'countOnly': True})
+        query = QueryProcessor(tables=['sessions'], clauses=[clause], opts={'countOnly': True})
         rows = query.execute()
         print(f"Deleting {rows} sessions")
 
     if not test:
-        delete = DeleteProcessor(table='sessions', clauses=[clauses])
+        delete = DeleteProcessor(table='sessions', clauses=[clause])
         delete.execute()
         if vacuum:
             cursor.execute("VACUUM ANALYZE sessions")
@@ -148,7 +148,7 @@ def clean_buildroots(cursor, vacuum, test):
 
 
 def clean_scheduler_logs(cursor, vacuum, test, age):
-    clauses = f"(msg_time < NOW() - '{age:d} days'::interval)"
+    clauses = [f"(msg_time < NOW() - '{age:d} days'::interval)"]
     if options.verbose:
         query = QueryProcessor(tables=["scheduler_log_messages"],
                                clauses=clauses,
@@ -156,7 +156,7 @@ def clean_scheduler_logs(cursor, vacuum, test, age):
         rows = query.execute()
         print(f"Deleting {rows} scheduler log messages")
     if not test:
-        delete = DeleteProcessor(table="scheduler_log_messages", clauses=[clauses])
+        delete = DeleteProcessor(table="scheduler_log_messages", clauses=clauses)
         delete.execute()
         if vacuum:
             cursor.execute("VACUUM ANALYZE scheduler_log_messages")