From 63953bf1520b423fdc9048d8b2a2559bd45613d9 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 8 Jun 2018 11:13:36 +0200 Subject: misc/database-layout.dump: actually update the stored function --- misc/database-layout.dump | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/misc/database-layout.dump b/misc/database-layout.dump index e4afcba..efaa7a1 100644 --- a/misc/database-layout.dump +++ b/misc/database-layout.dump @@ -97,8 +97,8 @@ INSERT IGNORE INTO `replaced_bpir` (`id`,`replaced_by`) ON `m_bpir`.`id`=`moveable_bpir`.`id` JOIN `binary_packages` AS `m_bp` ON `m_bpir`.`package`=`m_bp`.`id` - JOIN `repositories` AS `m_r` - ON `m_bpir`.`repository`=`m_r`.`id` + JOIN `repositories` AS `m_from_r` + ON `m_bpir`.`repository`=`m_from_r`.`id` JOIN `build_assignments` AS `m_ba` ON `m_bp`.`build_assignment`=`m_ba`.`id` JOIN `package_sources` AS `m_ps` @@ -106,9 +106,11 @@ INSERT IGNORE INTO `replaced_bpir` (`id`,`replaced_by`) JOIN `upstream_repositories` AS `m_ur` ON `m_ps`.`upstream_package_repository`=`m_ur`.`id` JOIN `repository_moves` - ON `m_ur`.`id`=`repository_moves`.`upstream_package_repository` AND `repository_moves`.`from_repository`=`m_r`.`id` + ON `m_ur`.`id`=`repository_moves`.`upstream_package_repository` AND `repository_moves`.`from_repository`=`m_from_r`.`id` + JOIN `repositories` AS `m_to_r` + ON `repository_moves`.`to_repository`=`m_to_r`.`id` JOIN `repositories` AS `r_r` - ON `repository_moves`.`to_repository`=`r_r`.`id` + ON `r_r`.`stability`=`m_to_r`.`stability` JOIN `binary_packages_in_repositories` AS `r_bpir` ON `r_r`.`id`=`r_bpir`.`repository` JOIN `binary_packages` AS `r_bp` @@ -208,7 +210,7 @@ SELECT 1 JOIN `binary_packages_in_repositories` AS `req_bpir` ON `req_bp`.`id`=`req_bpir`.`package` JOIN `repositories` AS `req_r` - ON `req_bpir`.`repository`=`req_r`.`id` + ON `req_bpir`.`repository`=`req_r`.`id` AND `repl_r`.`architecture`=`req_r`.`architecture` JOIN `repository_stability_relations` AS `repl_rr` ON `repl_rr`.`more_stable`=`repl_r`.`stability` AND `repl_rr`.`less_stable`=`req_r`.`stability` WHERE NOT EXISTS ( -- cgit v1.2.3-70-g09d2