diff options
| author | Erich Eckner <git@eckner.net> | 2018-01-17 14:54:32 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-01-17 14:54:32 +0100 |
| commit | 041139bd471096ddc6be8c8b80c0f5619238dc7a (patch) | |
| tree | 99f274d58889c141aeb7ed16ab3c958b365e24e8 | |
| parent | 677ed896b4c2232756068dc5c8e96f398350a341 (diff) | |
| download | builder-041139bd471096ddc6be8c8b80c0f5619238dc7a.tar.xz | |
bin/mysql-functions, bin/bootstrap-mysql: move `is_blocked` from `binary_packages` to `build_assignments`
| -rwxr-xr-x | bin/bootstrap-mysql | 2 | ||||
| -rwxr-xr-x | bin/mysql-functions | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql index 23cb2d1..3fa2da3 100755 --- a/bin/bootstrap-mysql +++ b/bin/bootstrap-mysql @@ -45,7 +45,6 @@ if [ ! "$1" = 'slim' ]; then ' pkgrel MEDIUMINT' \ ' sub_pkgrel MEDIUMINT' \ ' has_issues BIT' \ - ' is_blocked VARCHAR(128)' \ ' is_tested BIT' \ ' pkgname VARCHAR(64)' \ ' architecture SMALLINT :architectures' \ @@ -66,6 +65,7 @@ if [ ! "$1" = 'slim' ]; then 'build_assignments BIGINT' \ ' package_source BIGINT :package_sources' \ ' architecture SMALLINT :architectures' \ + ' is_blocked VARCHAR(128) NULL' \ ' UNIQUE content package_source architecture' \ 'build_dependency_loops BIGINT' \ ' loop MEDIUMINT' \ diff --git a/bin/mysql-functions b/bin/mysql-functions index c37ebbb..1d1169b 100755 --- a/bin/mysql-functions +++ b/bin/mysql-functions @@ -284,8 +284,8 @@ mysql_generate_package_metadata() { fi } | \ while read -r arch; do - printf 'INSERT IGNORE INTO `build_assignments` (`package_source`,`architecture`)' - printf ' SELECT `package_sources`.`id`,`architectures`.`id`' + printf 'INSERT IGNORE INTO `build_assignments` (`package_source`,`architecture`,`is_blocked`)' + printf ' SELECT `package_sources`.`id`,`architectures`.`id`,0' printf ' FROM `architectures` JOIN `package_sources`' printf ' WHERE `architectures`.`name` = from_base64("%s")' \ "$( @@ -429,7 +429,6 @@ mysql_generate_package_metadata() { 'sub_pkgrel' \ 'pkgname' \ 'has_issues' \ - 'is_blocked' \ 'is_tested' printf ') SELECT ' printf '`%s`.`id`,' \ @@ -442,7 +441,7 @@ mysql_generate_package_metadata() { "${pkgrel}" \ "${sub_pkgrel}" \ "${pkgname}" - printf '0,0,0 FROM' + printf '0,0 FROM' printf ' `%s` JOIN' \ 'repositories' \ 'architectures' \ |