diff options
Diffstat (limited to 'buildmaster/build-list-links.php')
| -rw-r--r-- | buildmaster/build-list-links.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/buildmaster/build-list-links.php b/buildmaster/build-list-links.php index 3d4badf..e3d2779 100644 --- a/buildmaster/build-list-links.php +++ b/buildmaster/build-list-links.php @@ -26,9 +26,9 @@ $query = " `build_assignments`.`id`," . "IF(`build_assignments`.`is_broken`,\"#ff0000\",IF(`build_assignments`.`is_blocked` IS NULL,\"#000000\",\"#800000\"))" . " FROM `binary_packages_in_repositories`" . - " JOIN `binary_packages` ON `binary_packages_in_repositories`.`package`=`binary_packages`.`id`" . - " JOIN `repositories` ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`" . - " JOIN `build_assignments` ON `binary_packages`.`build_assignment`=`build_assignments`.`id`" . + mysql_join_binary_packages_in_repositories_binary_packages() . + mysql_join_binary_packages_in_repositories_repositories() . + mysql_join_binary_packages_build_assignments() . " WHERE `repositories`.`name`=\"build-list\"" . $limit; if (isset($_GET["raw"])) @@ -71,10 +71,10 @@ $query = "`d_bp`.`build_assignment`," . "`dependencies`.`dependency_type`" . " FROM `ba`" . - " JOIN `binary_packages` AS `d_bp` ON `d_bp`.`build_assignment`=`ba`.`id`" . - " JOIN `dependencies` ON `d_bp`.`id`=`dependencies`.`dependent`" . - " JOIN `install_target_providers` ON `install_target_providers`.`install_target`=`dependencies`.`depending_on`" . - " JOIN `binary_packages` AS `i_bp` ON `i_bp`.`id`=`install_target_providers`.`package`" . + mysql_join_build_assignments_binary_packages('ba','d_bp') . + mysql_join_binary_packages_dependencies('d_bp') . + mysql_join_dependencies_install_target_providers() . + mysql_join_install_target_providers_binary_packages('','i_bp') . " JOIN `ba_copy` ON `i_bp`.`build_assignment`=`ba_copy`.`id`" . " WHERE `d_bp`.`build_assignment`!=`i_bp`.`build_assignment`"; if (isset($_GET["raw"])) @@ -140,8 +140,8 @@ $query = " `ba`.`color`" . " FROM `ba`" . " JOIN `build_assignments` ON `ba`.`id`=`build_assignments`.`id`" . - " 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() . " GROUP BY `ba`.`group`"; if (isset($_GET["raw"])) print $query . ";\n"; |