tuned;
authorwenzelm
Wed, 08 Mar 2023 14:22:11 +0100
changeset 77582 93f4b9164b9f
parent 77581 661d29a291ea
child 77583 9af2afc3f7b3
tuned;
src/Pure/Admin/build_status.scala
--- a/src/Pure/Admin/build_status.scala	Wed Mar 08 14:21:14 2023 +0100
+++ b/src/Pure/Admin/build_status.scala	Wed Mar 08 14:22:11 2023 +0100
@@ -24,7 +24,7 @@
     history: Int = 0,
     afp: Boolean = false,
     bulky: Boolean = false,
-    sql: String
+    sql: String = ""
   ) {
     def days(options: Options): Int = options.int("build_log_history") max history
 
@@ -37,15 +37,15 @@
       only_sessions: Set[String]
     ): PostgreSQL.Source = {
       Build_Log.Data.universal_table.select(columns, distinct = true, sql =
-        "WHERE " +
-          Build_Log.Data.pull_date(afp) + " > " + Build_Log.Data.recent_time(days(options)) +
-          " AND " +
-          Build_Log.Data.status.member(
-            List(
-              Build_Log.Session_Status.finished.toString,
-              Build_Log.Session_Status.failed.toString)) +
-          if_proper(only_sessions, " AND " + Build_Log.Data.session_name.member(only_sessions)) +
-          " AND " + SQL.enclose(sql))
+        SQL.where(
+          SQL.and(
+            Build_Log.Data.pull_date(afp).ident + " > " + Build_Log.Data.recent_time(days(options)),
+            Build_Log.Data.status.member(
+              List(
+                Build_Log.Session_Status.finished.toString,
+                Build_Log.Session_Status.failed.toString)),
+            if_proper(only_sessions, Build_Log.Data.session_name.member(only_sessions)),
+            if_proper(sql, SQL.enclose(sql)))))
     }
   }