Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/buildmaster/build-slaves.php
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-11-09 10:50:09 +0100
committerErich Eckner <git@eckner.net>2018-11-09 10:50:09 +0100
commitf89a3fd4c3577eba5a9e3f1c1d27c26fb8432f7b (patch)
treea7720fef45dd700374cda0843ed2d2354ac5bc28 /buildmaster/build-slaves.php
parent1a9e9dc143b73b29113c5d22c0812f25c43cd34a (diff)
lib/mysql-joins.php new: it contains mysql_join_* functions similar to the ones in lib/mysql-functions of the build scripts
Diffstat (limited to 'buildmaster/build-slaves.php')
-rw-r--r--buildmaster/build-slaves.php12
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`" .