From 041139bd471096ddc6be8c8b80c0f5619238dc7a Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 17 Jan 2018 14:54:32 +0100
Subject: bin/mysql-functions, bin/bootstrap-mysql: move `is_blocked` from
 `binary_packages` to `build_assignments`

---
 bin/bootstrap-mysql | 2 +-
 bin/mysql-functions | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'bin')

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' \
-- 
cgit v1.2.3-70-g09d2