java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 4 ++--
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 4 ++--
web/spacewalk-web.spec | 5 ++++-
4 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit b23c553b27a6e841345e980c870ede5eb18b6ec1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jul 10 13:44:54 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.26-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 12b02c0..da6a923 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.25-1 web/
+1.8.26-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index b7165a0..e2cb974 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.25
+Version: 1.8.26
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Jul 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.26-1
+- cross-database references are not implemented: pe.evr.as_vre_simple
+
* Thu Jun 28 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.25-1
- removed unused query
commit 7ad7d88f149455baa9514f2f3aabb65faf076487
Author: Pierre Casenove <pcasenove(a)gmail.com>
Date: Wed Jul 4 11:34:31 2012 +0000
cross-database references are not implemented: pe.evr.as_vre_simple
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index 805589a..89b388e 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -1191,7 +1191,7 @@ ORDER BY S.name, S.id
<elaborator params="pid" multiple="t">
SELECT SPP.server_id AS ID,
PN.name AS PACKAGE_NAME,
- PN.name || '-' || PE.evr.as_vre_simple() AS PACKAGE_NVRE,
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE_NVRE,
PN.id || '|' || PE.id AS PACKAGE_ID_COMBO
FROM rhnPackageName PN,
rhnPackageEVR PE,
@@ -1237,7 +1237,7 @@ ORDER BY S.name, S.id
<elaborator params="pid" multiple="t">
SELECT DISTINCT S.id,
PN.name AS PACKAGE_NAME,
- PN.name || '-' || PE.evr.as_vre_simple() AS PACKAGE_NVRE,
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE_NVRE,
PN.id || '|' || PE.id AS PACKAGE_ID_COMBO
FROM rhnPackageName PN,
rhnPackageEVR PE,
commit 4921d0e2c1541a028044326eea8d697b70a62eee
Author: Pierre Casenove <pcasenove(a)gmail.com>
Date: Wed Jul 4 11:13:24 2012 +0000
COALESCE instead of NVL keyword for pgsql compatibility ERROR: function nvl(timestamp
with time zone, timestamp with time zone) does not exist at character 56 HINT: No function
matches the given name and argument types. You might need to add explicit type casts.
STATEMENT: SELECT P.id, NVL(SA.completion_time, NVL(SA.pickup_time, SA.created)) AS
TIMESTAMP, ACS.name AS ACTION_STATUS FROM rhnActionStatus ACS, rhnActionPackage AP,
rhnPackage P, rhnServerAction SA WHERE SA.server_id = $1 AND P.id IN ($2) AND AP.action_id
= SA.action_id AND AP.name_id = P.name_id AND AP.evr_id = P.evr_id AND ACS.id = SA.status
ORDER BY SA.completion_time desc, SA.pickup_time desc, SA.created desc
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 59d3ce5..dc40fd9 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
@@ -1085,8 +1085,8 @@ ORDER BY UPPER(pn.name)
</query>
<elaborator params="sid" multiple="t">
SELECT P.id,
- NVL(SA.completion_time,
- NVL(SA.pickup_time,
+ COALESCE(SA.completion_time,
+ COALESCE(SA.pickup_time,
SA.created)) AS TIMESTAMP,
ACS.name AS ACTION_STATUS
FROM rhnActionStatus ACS,