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, 8 insertions, 8 deletions

diff --git a/buildmaster/deletion-links.php b/buildmaster/deletion-links.php
index efa75db..066bf8d 100644
--- a/buildmaster/deletion-links.php
+++ b/buildmaster/deletion-links.php
@@ -74,8 +74,8 @@ mysql_run_query(
     ")" .
   ") AS `color`" .
   " FROM `binary_packages_in_repositories`" .
-  " JOIN `binary_packages` ON `binary_packages_in_repositories`.`package`=`binary_packages`.`id`" .
-  " JOIN `build_assignments` ON `binary_packages`.`build_assignment`=`build_assignments`.`id`" .
+  mysql_join_binary_packages_in_repositories_binary_packages() .
+  mysql_join_binary_packages_build_assignments() .
   $available_filter .
   " JOIN `available` ON `available`.`pkgname`=`binary_packages`.`pkgname`" .
   " WHERE `binary_packages_in_repositories`.`is_to_be_deleted`" .
@@ -114,9 +114,9 @@ mysql_run_query(
   " `dependencies`.`dependency_type`" .
   " FROM `d_bpir`" .
   " JOIN `binary_packages_in_repositories` ON `d_bpir`.`id`=`binary_packages_in_repositories`.`id`" .
-  " JOIN `dependencies` ON `binary_packages_in_repositories`.`package`=`dependencies`.`dependent`" .
-  " JOIN `install_target_providers` ON `install_target_providers`.`install_target`=`dependencies`.`depending_on`" .
-  " JOIN `binary_packages_in_repositories` AS `itp_bpir` ON `itp_bpir`.`package`=`install_target_providers`.`package`" .
+  mysql_join_binary_packages_in_repositories_dependencies() .
+  mysql_join_dependencies_install_target_providers() .
+  mysql_join_install_target_providers_binary_packages_in_repositories('','itp_bpir') .
   " JOIN `d_bpir_copy` ON `itp_bpir`.`id`=`d_bpir_copy`.`id`" .
   " WHERE `dependencies`.`dependent`!=`install_target_providers`.`package`"
 );
@@ -174,9 +174,9 @@ $result = mysql_run_query(
   "`d_bpir`.`color`" .
   " FROM `d_bpir`" .
   " JOIN `binary_packages_in_repositories` ON `d_bpir`.`id`=`binary_packages_in_repositories`.`id`" .
-  " JOIN `binary_packages` ON `binary_packages`.`id`=`binary_packages_in_repositories`.`package`" .
-  " JOIN `repositories` ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`" .
-  " JOIN `architectures` ON `repositories`.`architecture`=`architectures`.`id`" .
+  mysql_join_binary_packages_in_repositories_binary_packages() .
+  mysql_join_binary_packages_in_repositories_repositories() .
+  mysql_join_repositories_architectures() .
   " GROUP BY `d_bpir`.`group`"
 );