Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/buildmaster/dependencies.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/dependencies.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/dependencies.php')
-rw-r--r--buildmaster/dependencies.php68
1 files changed, 34 insertions, 34 deletions
diff --git a/buildmaster/dependencies.php b/buildmaster/dependencies.php
index fb168a1..1f6edb4 100644
--- a/buildmaster/dependencies.php
+++ b/buildmaster/dependencies.php
@@ -37,18 +37,18 @@ mysql_run_query(
"INSERT IGNORE INTO `cons` (`dep`,`itp`)" .
" SELECT `dependencies`.`id`,`install_target_providers`.`id`".
" FROM `binary_packages`" .
- " JOIN `binary_packages_in_repositories` ON `binary_packages`.`id`=`binary_packages_in_repositories`.`package`" .
- " JOIN `repositories` ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`" .
- " JOIN `repository_stabilities` ON `repositories`.`stability`=`repository_stabilities`.`id`" .
- " JOIN `architectures` ON `binary_packages`.`architecture`=`architectures`.`id`" .
- " JOIN `build_assignments` ON `binary_packages`.`build_assignment`= `build_assignments`.`id`" .
- " JOIN `package_sources` ON `build_assignments`.`package_source`= `package_sources`.`id`" .
+ mysql_join_binary_packages_binary_packages_in_repositories() .
+ mysql_join_binary_packages_in_repositories_repositories() .
+ mysql_join_repositories_repository_stabilities() .
+ mysql_join_binary_packages_architectures() .
+ mysql_join_binary_packages_build_assignments() .
+ mysql_join_build_assignments_package_sources() .
$match .
- " JOIN `dependencies` ON `dependencies`.`dependent`=`binary_packages`.`id`" .
- " JOIN `dependency_types` ON `dependencies`.`dependency_type`=`dependency_types`.`id`" .
- " JOIN `install_targets` ON `dependencies`.`depending_on`=`install_targets`.`id`" .
+ mysql_join_binary_packages_dependencies() .
+ mysql_join_dependencies_dependency_types() .
+ mysql_join_dependencies_install_targets() .
$ignore_install_targets .
- " JOIN `install_target_providers` ON `install_target_providers`.`install_target`=`dependencies`.`depending_on`" .
+ mysql_join_dependencies_install_target_providers() .
" WHERE (`dependency_types`.`relevant_for_binary_packages` OR `repository_stabilities`.`name`=\"unbuilt\")" .
" LIMIT " . $limit
);
@@ -57,19 +57,19 @@ mysql_run_query(
"INSERT IGNORE INTO `cons` (`dep`,`itp`)" .
" SELECT `dependencies`.`id`,`install_target_providers`.`id`".
" FROM `binary_packages`" .
- " JOIN `binary_packages_in_repositories` ON `binary_packages`.`id`=`binary_packages_in_repositories`.`package`" .
- " JOIN `repositories` ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`" .
- " JOIN `architectures` ON `binary_packages`.`architecture`=`architectures`.`id`" .
- " JOIN `build_assignments` ON `binary_packages`.`build_assignment`= `build_assignments`.`id`" .
- " JOIN `package_sources` ON `build_assignments`.`package_source`= `package_sources`.`id`" .
+ mysql_join_binary_packages_binary_packages_in_repositories() .
+ mysql_join_binary_packages_in_repositories_repositories() .
+ mysql_join_binary_packages_architectures() .
+ mysql_join_binary_packages_build_assignments() .
+ mysql_join_build_assignments_package_sources() .
$match .
- " JOIN `install_target_providers` ON `install_target_providers`.`package`=`binary_packages`.`id`" .
- " JOIN `dependencies` ON `install_target_providers`.`install_target`=`dependencies`.`depending_on`" .
- " JOIN `binary_packages` AS `d_bp` ON `dependencies`.`dependent`=`d_bp`.`id`" .
- " JOIN `binary_packages_in_repositories` as `d_bpir` ON `d_bp`.`id`=`d_bpir`.`package`" .
- " JOIN `repositories` AS `d_r` ON `d_bpir`.`repository`=`d_r`.`id`" .
- " JOIN `repository_stabilities` AS `d_rs` ON `d_r`.`stability`=`d_rs`.`id`" .
- " JOIN `dependency_types` ON `dependencies`.`dependency_type`=`dependency_types`.`id`" .
+ mysql_join_binary_packages_install_target_providers() .
+ mysql_join_install_target_providers_dependencies() .
+ mysql_join_dependencies_binary_packages('','d_bp') .
+ mysql_join_binary_packages_binary_packages_in_repositories('d_bp','d_bpir') .
+ mysql_join_binary_packages_in_repositories_repositories('d_bpir','d_r') .
+ mysql_join_repositories_repository_stabilities('d_r','d_rs') .
+ mysql_join_dependencies_dependency_types() .
" WHERE (`dependency_types`.`relevant_for_binary_packages` OR `d_rs`.`name`=\"unbuilt\")" .
" LIMIT " . $limit
);
@@ -90,7 +90,7 @@ $result = mysql_run_query(
"SELECT DISTINCT `dependencies`.`dependent`,`dependencies`.`depending_on`,`dependency_types`.`name`" .
" FROM `cons`" .
" JOIN `dependencies` ON `cons`.`dep`=`dependencies`.`id`" .
- " JOIN `dependency_types` ON `dependencies`.`dependency_type`=`dependency_types`.`id`"
+ mysql_join_dependencies_dependency_types()
);
while ($row = $result->fetch_assoc())
@@ -100,7 +100,7 @@ $result = mysql_run_query(
"SELECT DISTINCT `install_targets`.`id`,`install_targets`.`name`" .
" FROM `cons`" .
" JOIN `dependencies` ON `cons`.`dep`=`dependencies`.`id`" .
- " JOIN `install_targets` ON `dependencies`.`depending_on`=`install_targets`.`id`"
+ mysql_join_dependencies_install_targets()
);
while ($row = $result->fetch_assoc())
@@ -124,11 +124,11 @@ $result = mysql_run_query(
$pkgfile_query .
" FROM `cons`" .
" JOIN `dependencies` ON `cons`.`dep`=`dependencies`.`id`" .
- " JOIN `binary_packages` ON `dependencies`.`dependent`=`binary_packages`.`id`" .
- " JOIN `architectures` ON `architectures`.`id`=`binary_packages`.`architecture`" .
- " JOIN `binary_packages_in_repositories` ON `binary_packages`.`id`=`binary_packages_in_repositories`.`package`" .
- " JOIN `repositories` ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`" .
- " JOIN `repository_stabilities` ON `repository_stabilities`.`id`=`repositories`.`stability`"
+ mysql_join_dependencies_binary_packages() .
+ mysql_join_binary_packages_architectures() .
+ mysql_join_binary_packages_binary_packages_in_repositories() .
+ mysql_join_binary_packages_in_repositories_repositories() .
+ mysql_join_repositories_repository_stabilities()
);
while ($row = $result->fetch_assoc())
@@ -141,11 +141,11 @@ $result = mysql_run_query(
$pkgfile_query .
" FROM `cons`" .
" JOIN `install_target_providers` ON `cons`.`itp`=`install_target_providers`.`id`" .
- " JOIN `binary_packages` ON `install_target_providers`.`package`=`binary_packages`.`id`" .
- " JOIN `architectures` ON `architectures`.`id`=`binary_packages`.`architecture`" .
- " JOIN `binary_packages_in_repositories` ON `binary_packages`.`id`=`binary_packages_in_repositories`.`package`" .
- " JOIN `repositories` ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`" .
- " JOIN `repository_stabilities` ON `repository_stabilities`.`id`=`repositories`.`stability`"
+ mysql_join_install_target_providers_binary_packages() .
+ mysql_join_binary_packages_architectures() .
+ mysql_join_binary_packages_binary_packages_in_repositories() .
+ mysql_join_binary_packages_in_repositories_repositories() .
+ mysql_join_repositories_repository_stabilities()
);
while ($row = $result->fetch_assoc())