misc/database-layout.dump: reflect changes of calculate_maximal_moveable_set()

1 files changed, 8 insertions, 2 deletions

diff --git a/misc/database-layout.dump b/misc/database-layout.dump
index 46cd8d4..cf75f18 100644
--- a/misc/database-layout.dump
+++ b/misc/database-layout.dump
@@ -147,9 +147,13 @@ DELETE `replaced_bpir`,`moveable_bpir`
 	ON `binary_packages`.`id`=`dependencies`.`dependent`
 	JOIN `dependency_types`
 	ON `dependencies`.`dependency_type`=`dependency_types`.`id` AND `dependency_types`.`relevant_for_binary_packages`
+	JOIN `versions`
+	ON `dependencies`.`version`=`versions`.`id`
 	WHERE NOT EXISTS (
 SELECT 1
 	FROM `install_target_providers`
+	JOIN `versions` AS `prov_v`
+	ON `install_target_providers`.`version`=`prov_v`.`id`
 	JOIN `binary_packages` AS `prov_bp`
 	ON `install_target_providers`.`package`=`prov_bp`.`id`
 	JOIN `binary_packages_in_repositories` AS `prov_bpir`
@@ -161,14 +165,16 @@ SELECT 1
 	WHERE `install_target_providers`.`install_target`=`dependencies`.`depending_on` AND `target_repositories`.`stability`=`repository_stability_relations`.`less_stable` AND `target_repositories`.`architecture`=`prov_r`.`architecture` AND NOT EXISTS (
 SELECT 1
 	FROM `replaced_bpir_copy`
-	WHERE `replaced_bpir_copy`.`id`=`prov_bpir`.`id`)) AND NOT EXISTS (
+	WHERE `replaced_bpir_copy`.`id`=`prov_bpir`.`id`) AND((`dependencies`.`version_relation`="<" AND `prov_v`.`order`<`versions`.`order`) OR (`dependencies`.`version_relation`="<=" AND `prov_v`.`order`<=`versions`.`order`) OR (`dependencies`.`version_relation`=">" AND `prov_v`.`order`>`versions`.`order`) OR (`dependencies`.`version_relation`=">=" AND `prov_v`.`order`>=`versions`.`order`) OR (`dependencies`.`version_relation`="=" AND `prov_v`.`order`=`versions`.`order`))) AND NOT EXISTS (
 SELECT 1
 	FROM `install_target_providers`
+	JOIN `versions` AS `prov_v`
+	ON `install_target_providers`.`version`=`prov_v`.`id`
 	JOIN `binary_packages_in_repositories` AS `itp_bpir`
 	ON `install_target_providers`.`package`=`itp_bpir`.`package`
 	JOIN `moveable_bpir_copy`
 	ON `moveable_bpir_copy`.`id`=`itp_bpir`.`id`
-	WHERE `install_target_providers`.`install_target`=`dependencies`.`depending_on`);
+	WHERE `install_target_providers`.`install_target`=`dependencies`.`depending_on` AND ((`dependencies`.`version_relation`="<" AND `prov_v`.`order`<`versions`.`order`) OR (`dependencies`.`version_relation`="<=" AND `prov_v`.`order`<=`versions`.`order`) OR (`dependencies`.`version_relation`=">" AND `prov_v`.`order`>`versions`.`order`) OR (`dependencies`.`version_relation`=">=" AND `prov_v`.`order`>=`versions`.`order`) OR (`dependencies`.`version_relation`="=" AND `prov_v`.`order`=`versions`.`order`)));
 SET row_count_saved = row_count_saved + ROW_COUNT();
 DELETE
 	FROM `replaced_bpir_copy`;