| index : website | |
| Archlinux32 website - obsolete | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | buildmaster/build-list.php | 38 |
diff --git a/buildmaster/build-list.php b/buildmaster/build-list.php index 11ccb59..dbade40 100644 --- a/buildmaster/build-list.php +++ b/buildmaster/build-list.php @@ -272,13 +272,13 @@ $result = mysql_run_query( "`git_repositories`.`name` AS `git_repository`," . "`architectures`.`name` AS `arch`" . " FROM `build_assignments`" . - " JOIN `architectures` ON `build_assignments`.`architecture` = `architectures`.`id`" . - " JOIN `package_sources` ON `build_assignments`.`package_source` = `package_sources`.`id`" . - " JOIN `upstream_repositories` ON `package_sources`.`upstream_package_repository` = `upstream_repositories`.`id`" . - " JOIN `git_repositories` ON `upstream_repositories`.`git_repository`=`git_repositories`.`id`" . - " JOIN `binary_packages` ON `binary_packages`.`build_assignment` = `build_assignments`.`id`" . - " JOIN `binary_packages_in_repositories` ON `binary_packages`.`id` = `binary_packages_in_repositories`.`package`" . - " JOIN `repositories` ON `binary_packages_in_repositories`.`repository` = `repositories`.`id`" . + mysql_join_build_assignments_architectures() . + mysql_join_build_assignments_package_sources() . + mysql_join_package_sources_upstream_repositories() . + mysql_join_upstream_repositories_git_repositories() . + mysql_join_build_assignments_binary_packages() . + mysql_join_binary_packages_binary_packages_in_repositories() . + mysql_join_binary_packages_in_repositories_repositories() . " WHERE `repositories`.`name`=\"build-list\"" . ") AS `ba_q`". " LEFT JOIN" . @@ -287,12 +287,12 @@ $result = mysql_run_query( "`dependent_bp`.`build_assignment`," . "COUNT(DISTINCT `dependency_bp`.`build_assignment`) AS `run_dependencies_pending`" . " FROM `binary_packages` AS `dependent_bp`" . - " JOIN `dependencies` ON `dependencies`.`dependent` = `dependent_bp`.`id`" . - " JOIN `dependency_types` ON `dependencies`.`dependency_type` = `dependency_types`.`id`" . - " JOIN `install_target_providers` ON `install_target_providers`.`install_target` = `dependencies`.`depending_on`" . - " JOIN `binary_packages` AS `dependency_bp` ON `dependency_bp`.`id` = `install_target_providers`.`package`" . - " JOIN `binary_packages_in_repositories` ON `dependency_bp`.`id` = `binary_packages_in_repositories`.`package`" . - " JOIN `repositories` ON `binary_packages_in_repositories`.`repository` = `repositories`.`id`" . + mysql_join_binary_packages_dependencies('dependent_bp') . + mysql_join_dependencies_dependency_types() . + mysql_join_dependencies_install_target_providers() . + mysql_join_install_target_providers_binary_packages('','dependency_bp') . + mysql_join_binary_packages_binary_packages_in_repositories('dependency_bp') . + mysql_join_binary_packages_in_repositories_repositories() . " WHERE `dependency_bp`.`build_assignment` != `dependent_bp`.`build_assignment`" . " AND `dependency_types`.`relevant_for_building`" . " AND `dependency_types`.`relevant_for_binary_packages`" . @@ -305,13 +305,13 @@ $result = mysql_run_query( "`dependent_bp`.`build_assignment`," . "COUNT(DISTINCT `dependencies`.`id`) AS `make_dependencies_pending`" . " FROM `binary_packages` AS `dependent_bp`" . - " JOIN `dependencies` ON `dependencies`.`dependent` = `dependent_bp`.`id`" . - " JOIN `dependency_types` ON `dependencies`.`dependency_type` = `dependency_types`.`id`" . + mysql_join_binary_packages_dependencies('dependent_bp') . + mysql_join_dependencies_dependency_types() . " WHERE NOT EXISTS(" . "SELECT 1 FROM `install_target_providers`" . - " JOIN `binary_packages` AS `dependency_bp` ON `dependency_bp`.`id` = `install_target_providers`.`package`" . - " JOIN `binary_packages_in_repositories` ON `dependency_bp`.`id` = `binary_packages_in_repositories`.`package`" . - " JOIN `repositories` ON `binary_packages_in_repositories`.`repository` = `repositories`.`id`" . + mysql_join_install_target_providers_binary_packages('','dependency_bp') . + mysql_join_binary_packages_binary_packages_in_repositories('dependency_bp','dependency_bpir') . + mysql_join_binary_packages_in_repositories_repositories('dependency_bpir') . " WHERE `install_target_providers`.`install_target` = `dependencies`.`depending_on`" . " AND `repositories`.`is_on_master_mirror`" . ")" . @@ -366,7 +366,7 @@ $result = mysql_run_query( " ON `cfb`.`build_assignment`=`rfb`.`build_assignment`" . " AND `cfb`.`reason`=`rfb`.`reason`" . " AND `cfb`.`max_date`=`rfb`.`date`" . - " JOIN `fail_reasons` ON `rfb`.`reason`=`fail_reasons`.`id`" . + mysql_join_failed_builds_fail_reasons('rfb') . " GROUP BY `rfb`.`build_assignment`" . ") AS `fr_q` ON `fr_q`.`build_assignment`=`ba_q`.`id`" . " LEFT JOIN" . |