lib/mysql-functions: make mysql_join_binary_packages_repositories and mysql_join_repositories_binary_packages obsolete

1 files changed, 22 insertions, 11 deletions

diff --git a/bin/build-master-status b/bin/build-master-status
index c019a37..f1f4ed9 100755
--- a/bin/build-master-status
+++ b/bin/build-master-status
@@ -142,37 +142,43 @@ if [ ! -s "${work_dir}/build-master-sanity" ]; then
     # stable_packages_count
     printf '(SELECT COUNT(DISTINCT `binary_packages`.`id`) FROM'
     printf ' `binary_packages`'
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     mysql_join_repositories_repository_stabilities
     printf ' WHERE `repository_stabilities`.`name`="stable"),'
     # pending_tasks_count
     printf '(SELECT COUNT(DISTINCT `build_assignments`.`id`) FROM'
     printf ' `build_assignments`'
     mysql_join_build_assignments_binary_packages
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     printf ' WHERE `repositories`.`name`="build-list"),'
     # pending_packages_count
     printf '(SELECT COUNT(DISTINCT `binary_packages`.`id`) FROM'
     printf ' `binary_packages`'
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     printf ' WHERE `repositories`.`name`="build-list"),'
     # staging_packages_count
     printf '(SELECT COUNT(DISTINCT `binary_packages`.`id`) FROM'
     printf ' `binary_packages`'
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     mysql_join_repositories_repository_stabilities
     printf ' WHERE `repository_stabilities`.`name`="staging"),'
     # testing_packages_count
     printf '(SELECT COUNT(DISTINCT `binary_packages`.`id`) FROM'
     printf ' `binary_packages`'
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     mysql_join_repositories_repository_stabilities
     printf ' WHERE `repository_stabilities`.`name`="testing"'
     printf ' AND NOT `binary_packages`.`is_tested`),'
     # tested_packages_count
     printf '(SELECT COUNT(DISTINCT `binary_packages`.`id`) FROM'
     printf ' `binary_packages`'
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     mysql_join_repositories_repository_stabilities
     printf ' WHERE `repository_stabilities`.`name`="testing"'
     printf ' AND `binary_packages`.`is_tested`),'
@@ -180,7 +186,8 @@ if [ ! -s "${work_dir}/build-master-sanity" ]; then
     printf '(SELECT COUNT(DISTINCT `build_assignments`.`id`) FROM'
     printf ' `build_assignments`'
     mysql_join_build_assignments_binary_packages
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     printf ' WHERE `repositories`.`name`="build-list"'
     printf ' AND `build_assignments`.`is_broken`),'
     # dependency_loops_count
@@ -194,20 +201,23 @@ if [ ! -s "${work_dir}/build-master-sanity" ]; then
     printf ' `build_slaves`'
     mysql_join_build_slaves_build_assignments
     mysql_join_build_assignments_binary_packages
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     printf ' WHERE `repositories`.`name`="build-list"),'
     # blocked_tasks_count
     printf '(SELECT COUNT(DISTINCT `build_assignments`.`id`) FROM'
     printf ' `build_assignments`'
     mysql_join_build_assignments_binary_packages
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     printf ' WHERE `repositories`.`name`="build-list"'
     printf ' AND `build_assignments`.`is_blocked` IS NOT NULL),'
     # next_tasks_count
     printf '(SELECT COUNT(DISTINCT `build_assignments`.`id`) FROM'
     printf ' `build_assignments`'
     mysql_join_build_assignments_binary_packages
-    mysql_join_binary_packages_repositories
+    mysql_join_binary_packages_binary_packages_in_repositories
+    mysql_join_binary_packages_in_repositories_repositories
     printf ' WHERE `repositories`.`name`="build-list"'
     printf ' AND ('
       printf 'NOT EXISTS ('
@@ -216,7 +226,8 @@ if [ ! -s "${work_dir}/build-master-sanity" ]; then
         printf ' AND `dependency_types`.`relevant_for_building`'
         mysql_join_dependencies_install_target_providers
         mysql_join_install_target_providers_binary_packages '' 'prov_bp'
-        mysql_join_binary_packages_repositories 'prov_bp' 'prov_r'
+        mysql_join_binary_packages_binary_packages_in_repositories 'prov_bp' 'prov_bpir'
+        mysql_join_binary_packages_in_repositories_repositories 'prov_bpir' 'prov_r'
         printf ' WHERE `prov_r`.`name`="build-list"'
         printf ' AND `dependencies`.`dependent`=`binary_packages`.`id`'
       printf ') OR EXISTS ('