Changes to 'refs/tags/spacewalk-schema-1.8.72-1'
by Michael Mraka
Tag 'spacewalk-schema-1.8.72-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-09-03 12:47 +0000
Tagging package [spacewalk-schema] version [1.8.72-1] in directory [schema/spacewalk/].
Changes since spacewalk-utils-1.8.27-1:
Michael Mraka (2):
oracle's sql parser doesn't like comments after semicolon
Automatic commit of package [spacewalk-schema] release [1.8.72-1].
Tomas Lestach (1):
839960 - rewrite query for system.listLatestUpgradablePackages API
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 65 +++++-----
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql | 6
4 files changed, 46 insertions(+), 32 deletions(-)
---
11 years, 7 months
2 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql | 6 ++++--
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 5cc5bf68bd7ab78531b8971a16f9ebf2a1581bbd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 3 14:47:57 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.72-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 81ef0ae..b45a273 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.71-1 schema/spacewalk/
+1.8.72-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 39e1463..c8ebd4d 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.71
+Version: 1.8.72
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Mon Sep 03 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.72-1
+- oracle's sql parser doesn't like comments after semicolon
+
* Wed Aug 22 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.71-1
- Insert pxt session errors on postgres
commit a06abd5cf5503710a0b011fc078cb31079731614
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 3 14:36:07 2012 +0200
oracle's sql parser doesn't like comments after semicolon
fixing
ERROR at line 1:
ORA-00001: unique constraint (RHNSAT.RHN_PACKAGE_GROUP_NAME_UQ) violated
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql
index 8dbbff5..84dfba0 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql
@@ -14,7 +14,8 @@ update rhnpackage set package_group = (select n.id
-- delete unused groups
delete from rhnpackagegroup pg
where not exists (select 1 from rhnpackage p where p.package_group = pg.id)
- and id > 1; -- don't remove 'NoGroup'
+ -- don't remove 'NoGroup'
+ and id > 1;
-- remove trailing \n
update rhnpackagegroup set name = substr(name, 1, length(name)-1)
@@ -48,7 +49,8 @@ update rhnPackageSource set package_group = (select n.id
-- delete unused groups
delete from rhnpackagegroup pg
where not exists (select 1 from rhnpackage p where p.package_group = pg.id)
- and id > 1; -- don't remove 'NoGroup'
+ -- don't remove 'NoGroup'
+ and id > 1;
-- remove trailing spaces from rest of packages
update rhnpackagegroup set name = trim(name)
11 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 65 +++++-----
1 file changed, 37 insertions(+), 28 deletions(-)
New commits:
commit 4823565b2e634bc73010d366ff82c432630bca85
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 31 15:57:21 2012 +0200
839960 - rewrite query for system.listLatestUpgradablePackages API
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 a62ac0c..eb91858 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
@@ -805,34 +805,43 @@ ORDER BY UPPER(PN.name)
<mode name="system_upgradable_package_list_no_errata_info">
<query params="sid">
-SELECT PN.name,
- NVL(PE.epoch, ' ') as FROM_EPOCH,
- NVL(PE.version, ' ') as FROM_VERSION,
- NVL(PE.release, ' ') as FROM_RELEASE,
- NVL((full_list.evr).epoch, ' ') as TO_EPOCH,
- NVL((full_list.evr).version, ' ') as TO_VERSION,
- NVL((full_list.evr).release, ' ') as TO_RELEASE,
- full_list.arch_label as ARCH,
- P.id as TO_PACKAGE_ID
- FROM (
- SELECT SOP.package_name_id name_id,
- MAX(PE.evr) evr,
- PE.id evr_id,
- SP.package_arch_id,
- PA.label as arch_label
- FROM rhnServerOutdatedPackages SOP
- INNER JOIN rhnServerPackage SP ON SP.server_id = SOP.server_id
- INNER JOIN rhnPackageEVR PE ON SOP.package_evr_id = PE.id
- LEFT JOIN rhnPackageArch PA ON PA.id = SP.package_arch_id
- WHERE SOP.server_id = :sid
- AND SOP.package_name_id = SP.name_id
- GROUP BY SOP.package_name_id, SP.package_arch_id, PA.label, PE.id
- ) full_list
- INNER JOIN rhnServerPackage SP ON ( full_list.name_id = SP.name_id AND full_list.package_arch_id = SP.package_arch_id )
- INNER JOIN rhnPackageName PN ON ( PN.id = full_list.name_id )
- INNER JOIN rhnPackageEVR PE ON ( SP.evr_id = PE.id )
- INNER JOIN rhnPackage P on ( P.name_id = full_list.name_id AND P.evr_id = full_list.evr_id AND P.package_arch_id = full_list.package_arch_id )
- WHERE SP.server_id = :sid
+ SELECT n.name,
+ NVL(sp.evr.epoch, ' ') as from_epoch,
+ NVL(sp.evr.version, ' ') as from_version,
+ NVL(sp.evr.release, ' ') as from_release,
+ spa.label as from_arch,
+ spa.label as arch,
+ NVL(up.evr.epoch, ' ') as to_epoch,
+ NVL(up.evr.version, ' ') as to_version,
+ NVL(up.evr.release, ' ') as to_release,
+ up.arch_label as to_arch,
+ up.id as to_package_id
+ FROM
+ (SELECT sp.server_id, sp.name_id, sp.package_arch_id, sp_pe.evr
+ FROM rhnServerPackage sp
+ join rhnPackageEvr sp_pe ON sp_pe.id = sp.evr_id
+ WHERE sp.server_id = :sid) sp
+ JOIN rhnPackageName n ON n.id = sp.name_id
+ JOIN rhnPackageArch spa ON spa.id = sp.package_arch_id,
+ (
+ SELECT p.id, p.name_id, e.evr, a.id as arch_id, a.label as arch_label
+ FROM
+ (SELECT p.name_id, max(e.evr) as max_evr
+ FROM rhnServerChannel sc
+ JOIN rhnChannelPackage cp ON cp.channel_id = sc.channel_id
+ JOIN rhnPackage p ON p.id = cp.package_id
+ JOIN rhnPackageEvr e ON e.id = p.evr_id
+ WHERE sc.server_id = :sid
+ GROUP BY p.name_id) u
+ JOIN rhnPackageEvr e ON e.evr = u.max_evr
+ JOIN rhnPackage p ON p.name_id = u.name_id AND p.evr_id = e.id
+ JOIN rhnPackageArch a ON a.id = p.package_arch_id
+ ) up,
+ rhnPackageUpgradeArchCompat puac
+ WHERE puac.package_arch_id = sp.package_arch_id
+ AND puac.package_upgrade_arch_id = up.arch_id
+ AND sp.evr < up.evr
+ AND sp.name_id = up.name_id
</query>
</mode>
11 years, 7 months