misc/database-layout.dump: updated (incorporates also older changes than 556c423525f5a401f92fab5cb64eeb233e6a901d)

1 files changed, 8 insertions, 2 deletions

diff --git a/misc/database-layout.dump b/misc/database-layout.dump
index 8a48a5e..2fad44f 100644
--- a/misc/database-layout.dump
+++ b/misc/database-layout.dump
@@ -274,6 +274,10 @@ DELETE `replaced_bpir`,`moveable_bpir`
 	ON `bl_ba`.`id`=`bl_bp`.`build_assignment`
 	JOIN `binary_packages_in_repositories` AS `bl_bpir`
 	ON `bl_bp`.`id`=`bl_bpir`.`package`
+	JOIN `repositories`
+	ON `binary_packages_in_repositories`.`repository`=`repositories`.`id`
+	JOIN `repositories` AS `bl_r`
+	ON `bl_bpir`.`repository`=`bl_r`.`id` AND `repositories`.`architecture`=`bl_r`.`architecture`
 	WHERE NOT EXISTS (
 SELECT 1
 	FROM `moveable_bpir_copy`
@@ -419,7 +423,7 @@ INSERT INTO `knot_names` (`id`,`name`,`reason_length`,`and`,`relevant`,`active`)
 	JOIN `install_targets`
 	ON `knots`.`content_id`=`install_targets`.`id` AND `knots`.`content_type`="it";
 INSERT INTO `knot_names` (`id`,`name`,`reason_length`,`and`,`relevant`,`active`)
-	SELECT `knots`.`id`, CONCAT(`r_a`.`name`,"/",`repositories`.`name`,"/",CONCAT(`binary_packages`.`pkgname`,"-",IF(`binary_packages`.`epoch`=0,"",CONCAT(`binary_packages`.`epoch`,":")),`binary_packages`.`pkgver`,"-",`binary_packages`.`pkgrel`,IF(`binary_packages`.`sub_pkgrel_omitted`,"",CONCAT(".",`binary_packages`.`sub_pkgrel`)),"-",`architectures`.`name`,".pkg.tar.xz")) AS `name`, `knots`.`reason_length`, `knots`.`and`, `knots`.`relevant`, `knots`.`active`
+	SELECT `knots`.`id`, CONCAT(`r_a`.`name`,"/",`repositories`.`name`,"/",CONCAT(`binary_packages`.`pkgname`,"-",IF(`binary_packages`.`epoch`=0,"",CONCAT(`binary_packages`.`epoch`,":")),`binary_packages`.`pkgver`,"-",`binary_packages`.`pkgrel`,IF(`binary_packages`.`sub_pkgrel_omitted`,"",CONCAT(".",`binary_packages`.`sub_pkgrel`)),"-",`architectures`.`name`,".pkg.",IF(`compressions`.`suffix` IS NULL,"tar.xz",`compressions`.`suffix`))) AS `name`, `knots`.`reason_length`, `knots`.`and`, `knots`.`relevant`, `knots`.`active`
 	FROM `knots`
 	JOIN `binary_packages_in_repositories`
 	ON `knots`.`content_id`=`binary_packages_in_repositories`.`id` AND `knots`.`content_type`="bpir"
@@ -430,7 +434,9 @@ INSERT INTO `knot_names` (`id`,`name`,`reason_length`,`and`,`relevant`,`active`)
 	JOIN `architectures` AS `r_a`
 	ON `repositories`.`architecture`=`r_a`.`id`
 	JOIN `architectures`
-	ON `binary_packages`.`architecture`=`architectures`.`id`;
+	ON `binary_packages`.`architecture`=`architectures`.`id`
+	LEFT JOIN `compressions`
+	ON `binary_packages`.`compression`=`compressions`.`id`;
 INSERT INTO `knot_names_copy`
 	SELECT *
 	FROM `knot_names`;