From 470af8ab31b215a5334e188652636e0bdeed72e4 Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Thu, 20 Feb 2014 14:15:45 -0700 Subject: [PATCH] Changed the system_upgradable_package_list_no_errata_info query to filter out channels that are not assigned to a server. Updated rhnServerOutdatePackages to include arch during the select to populate the new column. --- .../common/db/datasource/xml/Package_queries.xml | 2 ++ .../common/views/rhnServerOutdatedPackages.sql | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index 47d9aa6..77bf841 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -917,6 +917,8 @@ SELECT n.id AS id, on latest_p.name_id = latest.package_name_id and latest_p.evr_id = latest_pe.id and latest_p.package_arch_id = latest.package_arch_id + JOIN rhnChannelPackage cp ON cp.package_id = latest_p.id + JOIN rhnServerChannel sc ON sc.channel_id = cp.channel_id AND sc.server_id = :sid join rhnPackageUpgradeArchCompat puac on puac.package_arch_id = sp.package_arch_id and puac.package_upgrade_arch_id = latest.package_arch_id diff --git a/schema/spacewalk/common/views/rhnServerOutdatedPackages.sql b/schema/spacewalk/common/views/rhnServerOutdatedPackages.sql index d1a4ba4..a085f47 100644 --- a/schema/spacewalk/common/views/rhnServerOutdatedPackages.sql +++ b/schema/spacewalk/common/views/rhnServerOutdatedPackages.sql @@ -28,6 +28,7 @@ AS SELECT DISTINCT SNPC.server_id, P.name_id, P.evr_id, + P.package_arch_id, PN.name || '-' || evr_t_as_vre_simple( PE.evr ), E.id, E.advisory -- 1.7.1