From c9f55c95cb382e22c41a310c1005e3de43379ae9 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 17 Jan 2019 15:24:40 +0100 Subject: style: WHERE,ON,FROM,SELECT,JOIN should be on beginning of source lines --- bin/seed-build-list | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'bin/seed-build-list') diff --git a/bin/seed-build-list b/bin/seed-build-list index dabb5da..566be63 100755 --- a/bin/seed-build-list +++ b/bin/seed-build-list @@ -268,13 +268,15 @@ if [ -s "${tmp_dir}/package-regexes" ]; then printf 'SELECT DISTINCT "pkgbase",`package_sources`.`pkgbase`,`upstream_repositories`.`name`' printf ' FROM `names`' - printf ' JOIN `package_sources` ON `package_sources`.`pkgbase` REGEXP `names`.`name`' + printf ' JOIN `package_sources`' + printf ' ON `package_sources`.`pkgbase` REGEXP `names`.`name`' mysql_join_package_sources_upstream_repositories printf ';\n' printf 'SELECT DISTINCT "pkgname",`binary_packages`.`pkgname`' printf ' FROM `names`' - printf ' JOIN `binary_packages` ON `binary_packages`.`pkgname` REGEXP `names`.`name`;\n' + printf ' JOIN `binary_packages`' + printf ' ON `binary_packages`.`pkgname` REGEXP `names`.`name`;\n' } | \ mysql_run_query | \ sed -n ' @@ -389,7 +391,8 @@ fi printf ' FROM `least_stable_bp`;\n' # remove packages that should never be rescheduled - printf 'DELETE `least_stable_bp` FROM `least_stable_bp`' + printf 'DELETE `least_stable_bp`' + printf ' FROM `least_stable_bp`' printf ' JOIN `binary_packages`' printf ' ON `binary_packages`.`id`=`least_stable_bp`.`id`' # 1) @@ -550,7 +553,8 @@ fi printf ' WHERE `build_assignments`.`is_black_listed` IS NOT NULL' printf ' OR `package_sources`.`pkgbase` LIKE "lib32-%%"' printf ' OR EXISTS (' - printf 'SELECT 1 FROM `dependencies`' + printf 'SELECT 1' + printf ' FROM `dependencies`' mysql_join_dependencies_dependency_types printf ' AND (' printf '`dependency_types`.`relevant_for_building`' @@ -559,7 +563,8 @@ fi mysql_join_dependencies_install_target_providers_with_versions '' 'it_dummy' printf ' WHERE `dependencies`.`dependent`=`binary_packages`.`id`' printf ' AND NOT EXISTS (' - printf 'SELECT 1 FROM `install_target_providers`' + printf 'SELECT 1' + printf ' FROM `install_target_providers`' mysql_join_install_target_providers_binary_packages '' 'it_bp' mysql_join_binary_packages_binary_packages_in_repositories 'it_bp' 'it_bpir' printf ' WHERE NOT `it_bpir`.`is_to_be_deleted`' @@ -580,7 +585,8 @@ fi printf '`pkgbases`.`pkgbase`,' printf '`git_repositories`.`head`,' printf '(' - printf 'SELECT `al32`.`head` FROM `git_repositories` AS `al32`' + printf 'SELECT `al32`.`head`' + printf ' FROM `git_repositories` AS `al32`' printf ' WHERE `al32`.`name`="archlinux32"' printf '),' printf '`pkgbases`.`repo`' @@ -589,13 +595,15 @@ fi printf ' ON `upstream_repositories`.`name`=`pkgbases`.`repo`' mysql_join_upstream_repositories_git_repositories printf ' WHERE NOT EXISTS (' - printf 'SELECT 1 FROM `ignore_packages`' + printf 'SELECT 1' + printf ' FROM `ignore_packages`' printf ' WHERE `ignore_packages`.`pkgbase`=`pkgbases`.`pkgbase`' printf ' AND `ignore_packages`.`priority`>=`pkgbases`.`priority`' printf ') AND (' printf '`pkgbases`.`priority`!=2' printf ' OR NOT EXISTS (' - printf 'SELECT 1 FROM `package_sources`' + printf 'SELECT 1' + printf ' FROM `package_sources`' mysql_join_package_sources_build_assignments mysql_join_build_assignments_binary_packages mysql_join_binary_packages_binary_packages_in_repositories -- cgit v1.2.3-54-g00ecf