java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 14
++++------
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit c08348142432e7176f1866135c75c3771e26219a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 26 15:00:47 2010 +0200
removing need of setNvreUpper method in PackageOverview
addressing:
javax.servlet.ServletException: com.redhat.rhn.common.util.MethodNotFoundException:
Could not find method called: setNvreUpper in class:
com.redhat.rhn.frontend.dto.PackageOverview with params: [type: java.lang.String, value:
AMANDA-2.5.0P2-4-I386]
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 d44526f..523babc 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
@@ -249,10 +249,9 @@ ORDER BY name_upper
<mode name="packages_in_errata"
class="com.redhat.rhn.frontend.dto.PackageOverview">
<query params="eid">
-SELECT DISTINCT P.id id, PN.name || '-' || PE.version
+SELECT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE
':' || PE.epoch END)
- || '-' || PA.label package_nvre,
- UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE
WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' ||
PA.label) as nvre_upper
+ || '-' || PA.label package_nvre
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -263,17 +262,16 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY nvre_upper
+ ORDER BY UPPER(PN.name), PE.version, PE.release, PE.epoch, PA.label, P.id
</query>
<elaborator name="package_channels" />
</mode>
<mode name="packages_in_tmp_errata"
class="com.redhat.rhn.frontend.dto.PackageOverview">
<query params="eid">
-SELECT DISTINCT P.id id, PN.name || '-' || PE.version
+SELECT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE
':' || PE.epoch END)
- || '-' || PA.label package_nvre,
- UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE
WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' ||
PA.label) as nvre_upper
+ || '-' || PA.label package_nvre
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -284,7 +282,7 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY nvre_upper
+ORDER BY UPPER(PN.name), PE.version, PE.release, PE.epoch, PA.label, P.id
</query>
<elaborator name="package_channels" />
</mode>
Show replies by date