summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-06-05 14:13:12 +0200
committerErich Eckner <git@eckner.net>2018-06-05 14:13:12 +0200
commit850addcb85166381a2e1ab99c3d269eb8fc4b244 (patch)
tree8605a2c2c7ff6d0ca4186f23132fc64a276b1311
parent3fb49965d3b08d9c91c011760beb3da300cf1796 (diff)
downloadbuilder-850addcb85166381a2e1ab99c3d269eb8fc4b244.tar.xz
bin/return-assignment: use ids instead of select queries
-rwxr-xr-xbin/return-assignment17
1 files changed, 9 insertions, 8 deletions
diff --git a/bin/return-assignment b/bin/return-assignment
index 5d9b5a7..0b3744c 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -58,7 +58,6 @@ if [ "$5" = 'ERROR' ]; then
mysql_join_package_sources_upstream_repositories
mysql_join_build_assignments_binary_packages
mysql_join_binary_packages_binary_packages_in_repositories
- mysql_join_binary_packages_in_repositories_repositories
printf ' WHERE `build_slaves`.`id`=from_base64("%s")' \
"$(
# shellcheck disable=SC2154
@@ -71,7 +70,8 @@ if [ "$5" = 'ERROR' ]; then
'mod_git_revision' "$(printf '%s' "$3" | base64 -w0)"
printf ' AND `upstream_repositories`.`name`=from_base64("%s")' \
"$(printf '%s' "$4" | base64 -w0)"
- printf ' AND `repositories`.`name`="build-list"'
+ printf ' AND `binary_packages_in_repositories`.`repository`=%s;\n' \
+ "${repository_ids__any_build_list}"
} | \
mysql_run_query | \
tr '\t' ' '
@@ -248,7 +248,6 @@ infos=$(
mysql_join_package_sources_upstream_repositories
mysql_join_build_assignments_binary_packages
mysql_join_binary_packages_binary_packages_in_repositories
- mysql_join_binary_packages_in_repositories_repositories
printf ' WHERE `build_slaves`.`id`=from_base64("%s")' \
"$(
# shellcheck disable=SC2154
@@ -261,7 +260,8 @@ infos=$(
'mod_git_revision' "$(printf '%s' "$3" | base64 -w0)"
printf ' AND `upstream_repositories`.`name`=from_base64("%s")' \
"$(printf '%s' "$4" | base64 -w0)"
- printf ' AND `repositories`.`name`="build-list"'
+ printf ' AND `binary_packages_in_repositories`.`repository`=%s' \
+ "${repository_ids__any_build_list}"
printf ' AND `binary_packages`.`sub_pkgrel`=from_base64("%s");\n' \
"$(printf '%s' "$5" | base64 -w0)"
} | \
@@ -453,15 +453,16 @@ if [ ! -s "${tmp_dir}/package-ids" ]; then
exit 4
fi
+# TODO: moving from build-list to *staging needs to depend on the architecture
+
# shellcheck disable=SC2016
infos=$(
{
printf 'SELECT `t`.`id`,`t`.`name`'
printf ' FROM `repository_moves`'
- printf ' JOIN `repositories` as `%s` ON `%s`.`id`=`repository_moves`.`%s_repository`' \
- 't' 't' 'to' \
- 'f' 'f' 'from'
- printf ' WHERE `f`.`name`="build-list"'
+ printf ' JOIN `repositories` as `t` ON `t`.`id`=`repository_moves`.`to_repository`'
+ printf ' WHERE `repository_moves`.`from_repository`=%s' \
+ "${repository_ids__any_build_list}"
printf ' AND `repository_moves`.`upstream_package_repository`=from_base64("%s");\n' \
"$(
printf '%s' "${upstream_repository_id}" | \