lib/mysql-joins.php new: it contains mysql_join_* functions similar to the ones in lib/mysql-functions of the build scripts

1 files changed, 4 insertions, 8 deletions

diff --git a/buildmaster/build-slaves.php b/buildmaster/build-slaves.php
index 56853e3..36a1522 100644
--- a/buildmaster/build-slaves.php
+++ b/buildmaster/build-slaves.php
@@ -107,20 +107,16 @@ $result = mysql_run_query(
     "SELECT " .
     implode(",",array_map("combine_fields",$columns)) .
     " FROM `build_slaves`" .
-    " JOIN `ssh_keys`" .
-    " ON `build_slaves`.`ssh_key`=`ssh_keys`.`id`" .
-    " JOIN `persons`" .
-    " ON `ssh_keys`.`owner`=`persons`.`id`" .
+    mysql_join_build_slaves_ssh_keys() .
+    mysql_join_ssh_keys_persons().
 
     " LEFT JOIN (" .
       "SELECT " .
       "`build_assignments`.`id` AS `id`," .
       implode(",",array_filter(array_map("combine_ba_q_fields",$columns),"non_empty")) .
       " FROM `build_assignments`" .
-      " JOIN `package_sources`" .
-      " ON `build_assignments`.`package_source`=`package_sources`.`id`" .
-      " JOIN `architectures`" .
-      " ON `build_assignments`.`architecture`=`architectures`.`id`" .
+      mysql_join_build_assignments_package_sources() .
+      mysql_join_build_assignments_architectures() .
     ") AS `ba_q`" .
     " ON `ba_q`.`id`=`build_slaves`.`currently_building`" .