spacewalk-commits September 2010

spacewalk-commits@lists.fedorahosted.org

12 participants
372 discussions

Changes to 'refs/tags/spacewalk-config-1.2.2-1'
by Michael Mraka 06 Sep '10

06 Sep '10

Tag 'spacewalk-config-1.2.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-09-06 11:41 +0000 Tagging package [spacewalk-config] version [1.2.2-1] in directory [spacewalk/config/]. Changes since spacewalk-backend-1.2.10-1: Michael Mraka (1): Automatic commit of package [spacewalk-config] release [1.2.2-1]. --- rel-eng/packages/spacewalk-config | 2 +- spacewalk/config/spacewalk-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages spacewalk/config
by Michael Mraka 06 Sep '10

06 Sep '10

rel-eng/packages/spacewalk-config | 2 +- spacewalk/config/spacewalk-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit f2ee3290b0d46fa652df9701016656bdec19616d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 13:41:11 2010 +0200 Automatic commit of package [spacewalk-config] release [1.2.2-1]. diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config index 3c677c6..be904f2 100644 --- a/rel-eng/packages/spacewalk-config +++ b/rel-eng/packages/spacewalk-config @@ -1 +1 @@ -1.2.1-1 spacewalk/config/ +1.2.2-1 spacewalk/config/ diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec index 8474f6f..3ede1e9 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -2,7 +2,7 @@ Name: spacewalk-config Summary: Spacewalk Configuration -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} URL: http://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -91,6 +91,9 @@ fi %changelog +* Mon Sep 06 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.2-1 +- removed unneeded oracle settings from httpd environment + * Wed Sep 01 2010 Jan Pazdziora 1.2.1-1 - As 00-spacewalk-mod_jk.conf which referenced workers.properties is gone, remove it now as well.

1 0

Changes to 'refs/tags/spacewalk-backend-1.2.10-1'
by Michael Mraka 06 Sep '10

06 Sep '10

Tag 'spacewalk-backend-1.2.10-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-09-06 11:40 +0000 Tagging package [spacewalk-backend] version [1.2.10-1] in directory [backend/]. Changes since spacewalk-java-1.2.24-1: Justin Sherrill (3): 598845 - fixing issue where syncing errata would fail with a Hibernate NonUniqueObjectException because keywords on errata were being duplicated durign sync file attribute was removed from the wrong method in PackageHelper unit test fix Michael Mraka (13): converted dates to ISO format (independent of NLS_LANG settings) removed outdated log comments rhnPackageUpgradeArchCompat - an <package_arch> package can be upgraded by newer <package_upgrade_arch> package 585965 - rhnServerNeededView rewritten from scratch fixed table name capitalization fixed dependencies for rhnPackageUpgradeArchCompat and rhnServerNeededView distinct is no more needed rhnPackage is useless here 573630 - move update_needed_cache implementation to db 573630 - reuse pl/sql implementation of update_needed_cache in python 573630 - reuse pl/sql implementation of update_needed_cache in java 573630 - schema upgrade scripts Automatic commit of package [spacewalk-backend] release [1.2.10-1]. Partha Aji (1): 614918 - Made SSM Select Systems to work with I18n languages Tomas Lestach (1): fixing unit test --- backend/server/rhnServer/server_packages.py | 102 ------ backend/spacewalk-backend.spec | 6 java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml | 6 java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 6 java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java | 10 java/code/src/com/redhat/rhn/frontend/action/rhnset/SetItemSelectionAction.java | 143 -------- java/code/src/com/redhat/rhn/frontend/action/rhnset/test/SetItemSelectionActionTest.java | 134 -------- java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java | 132 ++++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackageHelper.java | 4 java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 12 java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java | 58 --- java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java | 4 java/code/src/com/redhat/rhn/testing/ServerTestUtils.java | 2 java/code/webapp/WEB-INF/decorators/layout_head.jsp | 4 java/code/webapp/WEB-INF/dwr.xml | 4 rel-eng/packages/spacewalk-backend | 2 schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql | 159 ++++++++++ schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql | 35 ++ schema/spacewalk/common/views/rhnServerNeededView.sql | 115 +++---- schema/spacewalk/common/views/views.deps | 5 schema/spacewalk/oracle/data/rhn_schedule_days.sql | 41 -- schema/spacewalk/oracle/packages/rhn_server.pkb | 55 +++ schema/spacewalk/oracle/packages/rhn_server.pks | 5 schema/spacewalk/postgres/data/rhn_schedule_days.sql | 41 -- schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/060-rhnPackageUpgradeArchCompat.sql | 35 ++ schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/061-rhnPackageUpgradeArchCompat-data.sql | 159 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/062-rhnServerNeededView.sql | 86 +++++ web/html/javascript/check_all.js | 65 ---- 28 files changed, 821 insertions(+), 609 deletions(-) ---

1 0

2 commits - backend/spacewalk-backend.spec rel-eng/packages schema/spacewalk
by Michael Mraka 06 Sep '10

06 Sep '10

backend/spacewalk-backend.spec | 6 rel-eng/packages/spacewalk-backend | 2 schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/060-rhnPackageUpgradeArchCompat.sql | 35 ++ schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/061-rhnPackageUpgradeArchCompat-data.sql | 159 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/062-rhnServerNeededView.sql | 86 +++++ 5 files changed, 286 insertions(+), 2 deletions(-) New commits: commit e4548be9653e86f093605bdeefee8d5eb08eb656 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 13:40:40 2010 +0200 Automatic commit of package [spacewalk-backend] release [1.2.10-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 1ac7db6..63d2a5a 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -10,7 +10,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 and Python -Version: 1.2.9 +Version: 1.2.10 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -686,6 +686,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Mon Sep 06 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.10-1 +- 573630 - reused pl/sql implementation of update_needed_cache in python +- fixing broken string substitiution (wrong number of arguments) + * Mon Aug 30 2010 Justin Sherrill <jsherril(a)redhat.com> 1.2.9-1 - 626749 - fixing spacewalk-repo-sync to ignore source packages (jsherril(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 36d1870..cd8cb71 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.2.9-1 backend/ +1.2.10-1 backend/ commit 0b7713a25ff2661612268d01890fb11c408883ec Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 13:39:33 2010 +0200 573630 - schema upgrade scripts diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/060-rhnPackageUpgradeArchCompat.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/060-rhnPackageUpgradeArchCompat.sql new file mode 100644 index 0000000..1dd9a38 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/060-rhnPackageUpgradeArchCompat.sql @@ -0,0 +1,35 @@ +-- +-- Copyright (c) 2010 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. +-- + + +CREATE TABLE rhnPackageUpgradeArchCompat +( + package_arch_id NUMBER NOT NULL + CONSTRAINT rhn_puac_paid_fk + REFERENCES rhnPackageArch (id), + package_upgrade_arch_id NUMBER NOT NULL + CONSTRAINT rhn_puac_pauid_fk + REFERENCES rhnPackageArch (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL +) +ENABLE ROW MOVEMENT +; + +CREATE INDEX rhn_puac_pa_pua + ON rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id) + TABLESPACE [[64k_tbs]]; diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/061-rhnPackageUpgradeArchCompat-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/061-rhnPackageUpgradeArchCompat-data.sql new file mode 100644 index 0000000..6b8df92 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/061-rhnPackageUpgradeArchCompat-data.sql @@ -0,0 +1,159 @@ +-- +-- Copyright (c) 2010 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. +-- +-- +-- + +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386'), LOOKUP_PACKAGE_ARCH('i386'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i486'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i486'), LOOKUP_PACKAGE_ARCH('i486'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i486'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i586'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i586'), LOOKUP_PACKAGE_ARCH('i586'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i586'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i686'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i686'), LOOKUP_PACKAGE_ARCH('i686'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i686'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alpha'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alpha'), LOOKUP_PACKAGE_ARCH('alpha'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('alpha'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alphaev6'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alphaev6'), LOOKUP_PACKAGE_ARCH('alphaev6'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('alphaev6'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia64'), LOOKUP_PACKAGE_ARCH('ia64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ia64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc'), LOOKUP_PACKAGE_ARCH('sparc'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparcv9'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparcv9'), LOOKUP_PACKAGE_ARCH('sparcv9'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparcv9'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc64'), LOOKUP_PACKAGE_ARCH('sparc64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390'), LOOKUP_PACKAGE_ARCH('s390'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('s390'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('athlon'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('athlon'), LOOKUP_PACKAGE_ARCH('athlon'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('athlon'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390x'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390x'), LOOKUP_PACKAGE_ARCH('s390x'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('s390x'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc'), LOOKUP_PACKAGE_ARCH('ppc'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ppc'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64'), LOOKUP_PACKAGE_ARCH('ppc64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ppc64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('pSeries'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('pSeries'), LOOKUP_PACKAGE_ARCH('pSeries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('pSeries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('iSeries'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('iSeries'), LOOKUP_PACKAGE_ARCH('iSeries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('iSeries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('x86_64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('x86_64'), LOOKUP_PACKAGE_ARCH('x86_64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('x86_64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64iseries'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64iseries'), LOOKUP_PACKAGE_ARCH('ppc64iseries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ppc64iseries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64pseries'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64pseries'), LOOKUP_PACKAGE_ARCH('ppc64pseries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ppc64pseries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris'), LOOKUP_PACKAGE_ARCH('sparc-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc.sun4u-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc.sun4u-solaris'), LOOKUP_PACKAGE_ARCH('sparc.sun4u-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc.sun4u-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('tar'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('tar'), LOOKUP_PACKAGE_ARCH('tar'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('tar'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia32e'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia32e'), LOOKUP_PACKAGE_ARCH('ia32e'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ia32e'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('amd64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('amd64'), LOOKUP_PACKAGE_ARCH('amd64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('amd64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris'), LOOKUP_PACKAGE_ARCH('i386-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris-patch'), LOOKUP_PACKAGE_ARCH('sparc-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris-patch'), LOOKUP_PACKAGE_ARCH('i386-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('sparc-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('i386-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('noarch-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('all-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('all-deb'), LOOKUP_PACKAGE_ARCH('all-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('all-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-deb'), LOOKUP_PACKAGE_ARCH('i386-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alpha-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alpha-deb'), LOOKUP_PACKAGE_ARCH('alpha-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('alpha-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia64-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia64-deb'), LOOKUP_PACKAGE_ARCH('ia64-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ia64-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-deb'), LOOKUP_PACKAGE_ARCH('sparc-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('src-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('src-deb'), LOOKUP_PACKAGE_ARCH('src-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('src-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390-deb'), LOOKUP_PACKAGE_ARCH('s390-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('s390-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('powerpc-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('powerpc-deb'), LOOKUP_PACKAGE_ARCH('powerpc-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('powerpc-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('arm-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('arm-deb'), LOOKUP_PACKAGE_ARCH('arm-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('arm-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('mips-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('mips-deb'), LOOKUP_PACKAGE_ARCH('mips-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('mips-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('amd64-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('amd64-deb'), LOOKUP_PACKAGE_ARCH('amd64-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('amd64-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('solaris-patch'), LOOKUP_PACKAGE_ARCH('solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('solaris-patch-cluster'), sysdate, sysdate); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/062-rhnServerNeededView.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/062-rhnServerNeededView.sql new file mode 100644 index 0000000..ee10e96 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/062-rhnServerNeededView.sql @@ -0,0 +1,86 @@ +-- +-- Copyright (c) 2010 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. +-- + + +-- A view that displays packages which can be updated on selected client. +-- This is an uncached version of rhnServerNeededCache. + +create or replace view +rhnServerNeededView +( + org_id, + server_id, + errata_id, + package_id, + package_name_id, + channel_id +) +as +select s.org_id, + s.id as server_id, + pce.errata_id, + pkg.id as package_id, + neededpkg.name_id as package_name_id, + scp.min_channel_id as channel_id + from (select sc.server_id, np.name_id, np.package_arch_id, max(np.evr) max_evr + from (-- list of newest packages in channels with EVR + select np_np.*, np_pe.evr + from rhnChannelNewestPackage np_np + join rhnPackageEVR np_pe + on np_pe.id = np_np.evr_id) np + join (-- list of packages on the server with EVR + select sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id, max(sp_pe.evr) as max_evr + from rhnServerPackage sp_sp + join rhnPackageEVR sp_pe + on sp_pe.id = sp_sp.evr_id + group by sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp + on -- at first - we want only newer (=higher EVR) packages than there are on the server + sp.name_id = np.name_id and sp.max_evr < np.evr + join -- secondly - packages must be upgrade compatible + rhnPackageUpgradeArchCompat puac + on puac.package_arch_id = sp.package_arch_id and puac.package_upgrade_arch_id = np.package_arch_id + join -- thirdly - packages must be in channel where server is subscribed to + rhnServerChannel sc + on sc.server_id = sp.server_id and sc.channel_id = np.channel_id + group by sc.server_id, np.name_id, np.package_arch_id + ) neededpkg + join -- lookup org_id by server + rhnServer s + on neededpkg.server_id = s.id + join (--lookup package_id by max_evr, name and package_arch + select p.*, p_evr.evr + -- + , p_evr.release, p_evr.version, p_evr.epoch + from rhnPackage p + join rhnPackageEVR p_evr + on p_evr.id = p.evr_id) pkg + on pkg.evr = neededpkg.max_evr + and pkg.name_id = neededpkg.name_id + and pkg.package_arch_id = neededpkg.package_arch_id + join (-- lookup channel_id - we want only one id eve if package is in more channels + -- so pick lowest one + select cp.package_id, csc.server_id, min(cp.channel_id) as min_channel_id + from rhnChannelPackage cp + join rhnServerChannel csc + on csc.channel_id = cp.channel_id + group by cp.package_id, csc.server_id) scp + on scp.package_id = pkg.id and scp.server_id = neededpkg.server_id + left join (-- lookup errata id (can be NULL) + select ep.package_id, ce.errata_id, ce.channel_id + from rhnErrataPackage ep + join rhnChannelErrata ce + on ce.errata_id = ep.errata_id) pce + on pce.package_id = pkg.id and pce.channel_id = scp.min_channel_id +;

1 0

4 commits - backend/server java/code schema/spacewalk
by Michael Mraka 06 Sep '10

06 Sep '10

backend/server/rhnServer/server_packages.py | 102 ---------- java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml | 4 java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 6 java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java | 58 ----- schema/spacewalk/oracle/packages/rhn_server.pkb | 55 +++++ schema/spacewalk/oracle/packages/rhn_server.pks | 5 6 files changed, 80 insertions(+), 150 deletions(-) New commits: commit f9d3cd577ce30ce3208eb145b41e0b04a791e90e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 13:34:49 2010 +0200 573630 - reuse pl/sql implementation of update_needed_cache in java diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml index 7860b68..93fa651 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml @@ -1369,6 +1369,12 @@ END; </query> </callable-mode> +<callable-mode name="update_needed_cache"> + <query params="server_id"> + {call rhn_server.update_needed_cache(:server_id)} + </query> +</callable-mode> + <mode name="actions_count"> <query params="server_id"> SELECT count(distinct SA.action_id) as COUNT diff --git a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java b/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java index 3fa82fe..0fc5959 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java +++ b/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java @@ -189,24 +189,6 @@ public class UpdateErrataCacheCommand extends BaseTransactionCommand { private Map internalUpdateErrataCacheForServer(Long serverId) { - /* - * get packages_needing_updates - * foreach item put entry in pseen hashmap - * get errata_needing_application - * foreach item in get newpackages - * if not in pseen - * add to padded - * else - * delete from p_seen - * increment p_unchanged - * - * if there is anything in pseen - * call delete_needed_package_cache - * if there is something in padded - * call insert_needed_package_cache - * - */ - // let's avoid the dreaded nullpointer if (serverId == null) { return null; @@ -216,10 +198,17 @@ public class UpdateErrataCacheCommand extends BaseTransactionCommand { log.debug("internalUpdateErrataCacheForServer - sid: " + serverId); } - - DataResult newpkgs = ErrataCacheManager.newPackages(serverId); DataResult pkgs = ErrataCacheManager.packagesNeedingUpdates(serverId); + CallableMode m = ModeFactory.getCallableMode( + "System_queries", "update_needed_cache"); + Map inParams = new HashMap(); + inParams.put("server_id", serverId); + + m.execute(inParams, new HashMap()); + + DataResult newpkgs = ErrataCacheManager.packagesNeedingUpdates(serverId); + if (log.isDebugEnabled()) { log.debug("newpkgs: " + newpkgs); log.debug("Packages: " + pkgs); @@ -229,6 +218,7 @@ public class UpdateErrataCacheCommand extends BaseTransactionCommand { List pAdded = new ArrayList(); + // get list of new packages Iterator itr = null; for (itr = newpkgs.iterator(); itr.hasNext();) { ErrataCacheDto ecd = (ErrataCacheDto) itr.next(); @@ -240,34 +230,6 @@ public class UpdateErrataCacheCommand extends BaseTransactionCommand { log.debug("pkgs doesn't contain current ecd"); pAdded.add(ecd); } - else { - // remove the package we've already seen - log.debug("removing ecd."); - pkgs.remove(ecd); - } - } - - - // delete the needed package cache - if (!pkgs.isEmpty()) { - for (itr = pkgs.iterator(); itr.hasNext();) { - ErrataCacheDto ecd = (ErrataCacheDto) itr.next(); - log.debug("Deleting needed package cache."); - ErrataCacheManager.deleteNeededPackageCache( - ecd.getServerId(), ecd.getErrataId(), - ecd.getPackageId()); - } - } - - // reinsert the needed package cache - if (!pAdded.isEmpty()) { - for (itr = pAdded.iterator(); itr.hasNext();) { - log.debug("reinsert the needed package cache."); - ErrataCacheDto ecd = (ErrataCacheDto) itr.next(); - ErrataCacheManager.insertNeededPackageCache( - ecd.getServerId(), ecd.getErrataId(), - ecd.getPackageId()); - } } Map retval = new HashMap(); commit 770a80672a08768d2fda14ee5de891a80dfc205d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 13:32:58 2010 +0200 573630 - reuse pl/sql implementation of update_needed_cache in python diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 2e17d58..d093fa8 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -278,107 +278,11 @@ class Packages: def update_errata_cache(server_id): log_debug(2, "Updating the errata cache", server_id) h = rhnSQL.prepare(""" - select - server_id, errata_id, package_id - from - rhnServerNeededView - where - server_id = :server_id + begin + rhn_server.update_needed_cache(:server_id); + end; """) - - # Use a dictionary to store the final state - new_packages = {} h.execute(server_id=server_id) - while 1: - r = h.fetchone_dict() - if not r: - break - p = ( r['errata_id'], r['package_id']) - new_packages[p] = None - - h = rhnSQL.prepare(""" - select - server_id, errata_id, package_id - from - rhnServerNeededCache - where - server_id = :server_id - """) - - # Fetch the current state and do the diff as we go - deleted_packages = [] - h.execute(server_id=server_id) - while 1: - r = h.fetchone_dict() - if not r: - break - p = (r['errata_id'], r['package_id']) - if new_packages.has_key(p): - # The entry is already present - del new_packages[p] - continue - - # Remove this entry - deleted_packages.append(p) - - - # Delete unneeded packages - non_null_errata = filter(lambda x: x[0] is not None, deleted_packages) - null_errata = filter(lambda x: x[0] is None, deleted_packages) - - changed = 0 - - if non_null_errata: - h = rhnSQL.prepare(""" - delete from rhnServerNeededCache - where - server_id = :server_id - and errata_id = :errata_id - and package_id = :package_id - """) - dict = rhnLib.transpose_to_hash(non_null_errata, - ['errata_id', 'package_id']) - # Add server_id - dict['server_id'] = [server_id] * len(dict['package_id']) - h.execute_bulk(dict) - changed = changed + len(non_null_errata) - - if null_errata: - h = rhnSQL.prepare(""" - delete from rhnServerNeededCache - where - server_id = :server_id - and package_id = :package_id - """) - dict = rhnLib.transpose_to_hash(null_errata, - [ 'errata_id', 'package_id']) - # Add server_id - dict['server_id'] = [server_id] * len(dict['package_id']) - # We don't need errata_id since it's null - del dict['errata_id'] - h.execute_bulk(dict) - changed = changed + len(null_errata) - - log_debug(4, "Deleted packages", len(deleted_packages)) - - - if new_packages: - changed = changed + len(new_packages.keys()) - h = rhnSQL.prepare(""" - insert into rhnServerNeededCache - (server_id, errata_id, package_id) - values (:server_id, :errata_id, :package_id) - """) - dict = rhnLib.transpose_to_hash(new_packages.keys(), - [ 'errata_id', 'package_id']) - dict['server_id'] = [server_id] * len(new_packages.keys()) - - h.execute_bulk(dict) - - log_debug(4, "Inserted packages", len(new_packages.keys())) - - # Return the number of changes - return changed def processPackageKeyAssociations(header, checksum_type, checksum): provider_sql = rhnSQL.prepare(""" commit 4cd52580a2af5d66496a3f80af53e8ee90d564d7 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 13:32:31 2010 +0200 573630 - move update_needed_cache implementation to db there are several (different) implementation of update_needed_cache in python, java and perl; so let move the logic to one place everyone can utilize it diff --git a/schema/spacewalk/oracle/packages/rhn_server.pkb b/schema/spacewalk/oracle/packages/rhn_server.pkb index 293bf8b..b4b1178 100644 --- a/schema/spacewalk/oracle/packages/rhn_server.pkb +++ b/schema/spacewalk/oracle/packages/rhn_server.pkb @@ -730,6 +730,61 @@ is end loop; return NULL; end get_ip_address; + + procedure update_needed_cache(server_id_in in number) + is + type package_id_hash_t is table of number index by pls_integer; + old_packages package_id_hash_t; + old_package_id number; + new_packages package_id_hash_t; + new_package_id number; + begin + -- old packages to be deleted + for i in ( + select errata_id, package_id + from rhnServerNeededCache + where server_id = server_id_in + ) loop + old_packages(i.package_id) := i.errata_id; + end loop; + + -- new packages to be added + for i in ( + select errata_id, package_id + from rhnServerNeededView + where server_id = server_id_in + ) loop + if old_packages.exists(i.package_id) + and (old_packages(i.package_id) = i.errata_id + or old_packages(i.package_id) is null and i.errata_id is null) + then + -- package is both old and new, so simply do nothing + old_packages.delete(i.package_id); + else + new_packages(i.package_id) := i.errata_id; + end if; + end loop; + + -- delete old packages + old_package_id := old_packages.first; + while old_package_id is not null loop + delete from rhnServerNeededCache + where server_id = server_id_in + and package_id = old_package_id + and (errata_id = old_packages(old_package_id) + or errata_id is null and old_packages(old_package_id) is null); + old_package_id := old_packages.next(old_package_id); + end loop; + + -- insert new packages + new_package_id := new_packages.first; + while new_package_id is not null loop + insert into rhnServerNeededCache (server_id, errata_id, package_id) + values (server_id_in, new_packages(new_package_id), new_package_id); + new_package_id := new_packages.next(new_package_id); + end loop; + end update_needed_cache; + end rhn_server; / SHOW ERRORS diff --git a/schema/spacewalk/oracle/packages/rhn_server.pks b/schema/spacewalk/oracle/packages/rhn_server.pks index 5a0505e..cbb72e6 100644 --- a/schema/spacewalk/oracle/packages/rhn_server.pks +++ b/schema/spacewalk/oracle/packages/rhn_server.pks @@ -124,6 +124,11 @@ is function get_ip_address ( server_id_in in number ) return varchar2; + + procedure update_needed_cache( + server_id_in in number + ); + end rhn_server; / SHOW ERRORS commit 35e253cb51d17c484fcfd02a1879bcbefc513daf Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Aug 18 14:22:56 2010 +0200 rhnPackage is useless here diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml index 82bd031..c98a5ff 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml @@ -4,10 +4,8 @@ class="com.redhat.rhn.frontend.dto.ErrataCacheDto"> <query params="server_id"> select snpc.server_id, snpc.errata_id, snpc.package_id - from rhnServerNeededCache snpc, - rhnpackage p + from rhnServerNeededCache snpc where server_id = :server_id - and p.id = package_id </query> </mode>

1 0

3 commits - java/code schema/spacewalk
by Michael Mraka 06 Sep '10

06 Sep '10

java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml | 2 - schema/spacewalk/common/views/rhnServerNeededView.sql | 14 +++++----- schema/spacewalk/common/views/views.deps | 5 ++- 3 files changed, 11 insertions(+), 10 deletions(-) New commits: commit c7f036eeba187171c511dde51b8413037c6932e9 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 11:58:12 2010 +0200 distinct is no more needed diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml index 42acec8..82bd031 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/ErrataCache_queries.xml @@ -122,7 +122,7 @@ WHERE EC.server_id in <query params="channel_id"> INSERT INTO rhnServerNeededCache (server_id, package_id, errata_id) - (SELECT DISTINCT SNV.server_id, SNV.package_id, SNV.errata_id + (SELECT SNV.server_id, SNV.package_id, SNV.errata_id FROM rhnServerNeededView SNV WHERE SNV.server_id in (select SC.server_id from rhnServerChannel SC where SC.channel_id = :channel_id )) commit ca4f0ddc7d6c54d68e60ad9a0244ed6ee4fc87eb Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 11:57:19 2010 +0200 fixed dependencies for rhnPackageUpgradeArchCompat and rhnServerNeededView diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps index 6622cf0..d25fe37 100644 --- a/schema/spacewalk/common/views/views.deps +++ b/schema/spacewalk/common/views/views.deps @@ -58,6 +58,7 @@ rhnOrgPackageOverview :: rhnPackageName rhnPackageEVR rhnPackageArch rhn_package.pks rhnPrivateErrataMail :: rhnServerPackage \ rhnWebContactDisabled +rhnPackageUpgradeArchCompat :: rhnPackageArch rhnServerErrataTypeView :: rhnErrata rhnServerNeededErrataCache rhnServerFeaturesView :: rhnFeature rhnServerGroupTypeFeature \ rhnServerGroupMembers rhnServerGroup @@ -100,8 +101,8 @@ rhnSharedChannelView :: rhnChannel rhnChannelTrust rhnTrustedOrgs rhnSharedChannelTreeView :: rhnSharedChannelView rhnUserActionOverview :: rhnActionStatus rhnUserServerPerms rhnServerAction \ rhnActionOverview -rhnServerNeededView :: rhnPackage rhnServerPackageArchCompat \ +rhnServerNeededView :: rhnPackage rhnChannelNewestPackage \ rhnPackageEVR rhnServerPackage \ rhnChannelPackage rhnServerChannel \ rhnServer rhnErrataPackage \ - rhnChannelErrata + rhnChannelErrata rhnPackageUpgradeArchCompat commit 6ad50647529c9a4f9e4706ec35a33f30cbedc937 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 11:49:46 2010 +0200 fixed table name capitalization diff --git a/schema/spacewalk/common/views/rhnServerNeededView.sql b/schema/spacewalk/common/views/rhnServerNeededView.sql index 473ad7f..ee10e96 100644 --- a/schema/spacewalk/common/views/rhnServerNeededView.sql +++ b/schema/spacewalk/common/views/rhnServerNeededView.sql @@ -37,22 +37,22 @@ select s.org_id, from (select sc.server_id, np.name_id, np.package_arch_id, max(np.evr) max_evr from (-- list of newest packages in channels with EVR select np_np.*, np_pe.evr - from rhnchannelnewestpackage np_np - join rhnpackageEVR np_pe + from rhnChannelNewestPackage np_np + join rhnPackageEVR np_pe on np_pe.id = np_np.evr_id) np join (-- list of packages on the server with EVR select sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id, max(sp_pe.evr) as max_evr - from rhnserverpackage sp_sp - join rhnpackageEVR sp_pe + from rhnServerPackage sp_sp + join rhnPackageEVR sp_pe on sp_pe.id = sp_sp.evr_id group by sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp on -- at first - we want only newer (=higher EVR) packages than there are on the server sp.name_id = np.name_id and sp.max_evr < np.evr join -- secondly - packages must be upgrade compatible - rhnpackageupgradearchcompat puac + rhnPackageUpgradeArchCompat puac on puac.package_arch_id = sp.package_arch_id and puac.package_upgrade_arch_id = np.package_arch_id join -- thirdly - packages must be in channel where server is subscribed to - rhnserverchannel sc + rhnServerChannel sc on sc.server_id = sp.server_id and sc.channel_id = np.channel_id group by sc.server_id, np.name_id, np.package_arch_id ) neededpkg @@ -64,7 +64,7 @@ select s.org_id, -- , p_evr.release, p_evr.version, p_evr.epoch from rhnPackage p - join rhnpackageevr p_evr + join rhnPackageEVR p_evr on p_evr.id = p.evr_id) pkg on pkg.evr = neededpkg.max_evr and pkg.name_id = neededpkg.name_id

1 0

2 commits - schema/spacewalk
by Michael Mraka 06 Sep '10

06 Sep '10

schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql | 159 ++++++++++ schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql | 35 ++ schema/spacewalk/common/views/rhnServerNeededView.sql | 115 +++---- 3 files changed, 254 insertions(+), 55 deletions(-) New commits: commit 6e717160dcddef1225f18af6b98d96b9a625888d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 11:23:55 2010 +0200 585965 - rhnServerNeededView rewritten from scratch it utilize rhnChannelNewestPackage cache table and new table for package upgrade compatibility diff --git a/schema/spacewalk/common/views/rhnServerNeededView.sql b/schema/spacewalk/common/views/rhnServerNeededView.sql index 57ced6a..473ad7f 100644 --- a/schema/spacewalk/common/views/rhnServerNeededView.sql +++ b/schema/spacewalk/common/views/rhnServerNeededView.sql @@ -1,5 +1,5 @@ -- --- Copyright (c) 2008 Red Hat, Inc. +-- Copyright (c) 2010 Red Hat, Inc. -- -- This software is licensed to you under the GNU General Public License, -- version 2 (GPLv2). There is NO WARRANTY for this software, express or @@ -14,9 +14,10 @@ -- --- A view that displays an uncached version of rhnServerNeededCache +-- A view that displays packages which can be updated on selected client. +-- This is an uncached version of rhnServerNeededCache. -CREATE OR REPLACE VIEW +create or replace view rhnServerNeededView ( org_id, @@ -26,56 +27,60 @@ rhnServerNeededView package_name_id, channel_id ) -AS -SELECT DISTINCT S.org_id, - S.id as server_id, - ep.errata_id as errata_id, - P.id as package_id, - P.name_id as package_name_id, - CP.channel_id as channel_id -FROM - rhnPackage P - inner join rhnPackageEVR P_EVR on P_EVR.id = P.evr_id - inner join rhnPackageEVR SP_EVR on SP_EVR.evr < P_EVR.evr - inner join rhnServerPackage SP on SP.name_id = P.name_id - and SP.evr_id = SP_EVR.id - AND SP.evr_id != P.evr_id - inner join rhnServer S on SP.server_id = S.id - inner join rhnServerPackageArchCompat SPAC on spac.server_arch_id = s.server_arch_id - AND p.package_arch_id = spac.package_arch_id - inner join rhnServerChannel SC on SC.server_id = S.id - inner join rhnChannelPackage CP on CP.package_id = P.id - and SC.channel_id = CP.channel_id - left outer join rhnErrataPackage EP on EP.package_id = P.id - AND EXISTS - (SELECT 1 from rhnChannelErrata CE where ce.channel_id = SC.channel_id - AND CE.errata_id = EP.errata_id) - where - --- If the channel has more than 1 package with the same NVRE but different arches - --- Then we need to add an additional join condition (the server's package arch id) - P.package_arch_id = COALESCE( - (select distinct 1 - from rhnPackage P2 inner join rhnChannelPackage CP2 - on P2.id = CP2.package_id - where CP2.channel_id = SC.channel_id and - P2.id = CP2.package_id and - P2.name_id = P.name_id - group by P2.evr_id having count(*) > 1), - COALESCE(SP.package_arch_id, P.package_arch_id), - P.package_arch_id - ) - AND - --- If we can use arch to find the MAX EVR, use that - --- Otherwise just use whatever they have - SP_EVR.evr = - COALESCE( - (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rhnPackageEvr PE - WHERE PE.id = SP2.evr_id AND SP2.server_id = SP.server_id AND - SP2.name_id = SP.name_id - AND COALESCE(SP2.package_arch_id, P.package_arch_id) = P.package_arch_id - ), - (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rhnPackageEvr PE - WHERE PE.id = SP2.evr_id AND SP2.server_id = SP.server_id AND - SP2.name_id = SP.name_id) - ) +as +select s.org_id, + s.id as server_id, + pce.errata_id, + pkg.id as package_id, + neededpkg.name_id as package_name_id, + scp.min_channel_id as channel_id + from (select sc.server_id, np.name_id, np.package_arch_id, max(np.evr) max_evr + from (-- list of newest packages in channels with EVR + select np_np.*, np_pe.evr + from rhnchannelnewestpackage np_np + join rhnpackageEVR np_pe + on np_pe.id = np_np.evr_id) np + join (-- list of packages on the server with EVR + select sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id, max(sp_pe.evr) as max_evr + from rhnserverpackage sp_sp + join rhnpackageEVR sp_pe + on sp_pe.id = sp_sp.evr_id + group by sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp + on -- at first - we want only newer (=higher EVR) packages than there are on the server + sp.name_id = np.name_id and sp.max_evr < np.evr + join -- secondly - packages must be upgrade compatible + rhnpackageupgradearchcompat puac + on puac.package_arch_id = sp.package_arch_id and puac.package_upgrade_arch_id = np.package_arch_id + join -- thirdly - packages must be in channel where server is subscribed to + rhnserverchannel sc + on sc.server_id = sp.server_id and sc.channel_id = np.channel_id + group by sc.server_id, np.name_id, np.package_arch_id + ) neededpkg + join -- lookup org_id by server + rhnServer s + on neededpkg.server_id = s.id + join (--lookup package_id by max_evr, name and package_arch + select p.*, p_evr.evr + -- + , p_evr.release, p_evr.version, p_evr.epoch + from rhnPackage p + join rhnpackageevr p_evr + on p_evr.id = p.evr_id) pkg + on pkg.evr = neededpkg.max_evr + and pkg.name_id = neededpkg.name_id + and pkg.package_arch_id = neededpkg.package_arch_id + join (-- lookup channel_id - we want only one id eve if package is in more channels + -- so pick lowest one + select cp.package_id, csc.server_id, min(cp.channel_id) as min_channel_id + from rhnChannelPackage cp + join rhnServerChannel csc + on csc.channel_id = cp.channel_id + group by cp.package_id, csc.server_id) scp + on scp.package_id = pkg.id and scp.server_id = neededpkg.server_id + left join (-- lookup errata id (can be NULL) + select ep.package_id, ce.errata_id, ce.channel_id + from rhnErrataPackage ep + join rhnChannelErrata ce + on ce.errata_id = ep.errata_id) pce + on pce.package_id = pkg.id and pce.channel_id = scp.min_channel_id ; commit d02a5eec45b0b0283770dcf88e6141f4caed37a0 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Sep 3 21:57:34 2010 +0200 rhnPackageUpgradeArchCompat - an <package_arch> package can be upgraded by newer <package_upgrade_arch> package e.g. tzdata-2010e-1.el5.noarch can be upgraded by tzdata-2010f-10.el5.x86_64 rhnmd-5.3.0-4.el5sat.x86_64 can be upgraded by rhnmd-5.3.0-5.el5sat.noarch openldap-2.3.27-5.i386 can be upgraded by openldap-2.3.27-8.el5_1.3.i386 but not by openldap-2.3.27-8.el5_1.3.x86_64 diff --git a/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql b/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql new file mode 100644 index 0000000..6b8df92 --- /dev/null +++ b/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql @@ -0,0 +1,159 @@ +-- +-- Copyright (c) 2010 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. +-- +-- +-- + +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386'), LOOKUP_PACKAGE_ARCH('i386'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i486'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i486'), LOOKUP_PACKAGE_ARCH('i486'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i486'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i586'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i586'), LOOKUP_PACKAGE_ARCH('i586'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i586'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i686'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i686'), LOOKUP_PACKAGE_ARCH('i686'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i686'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alpha'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alpha'), LOOKUP_PACKAGE_ARCH('alpha'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('alpha'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alphaev6'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alphaev6'), LOOKUP_PACKAGE_ARCH('alphaev6'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('alphaev6'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia64'), LOOKUP_PACKAGE_ARCH('ia64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ia64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc'), LOOKUP_PACKAGE_ARCH('sparc'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparcv9'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparcv9'), LOOKUP_PACKAGE_ARCH('sparcv9'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparcv9'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc64'), LOOKUP_PACKAGE_ARCH('sparc64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390'), LOOKUP_PACKAGE_ARCH('s390'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('s390'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('athlon'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('athlon'), LOOKUP_PACKAGE_ARCH('athlon'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('athlon'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390x'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390x'), LOOKUP_PACKAGE_ARCH('s390x'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('s390x'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc'), LOOKUP_PACKAGE_ARCH('ppc'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ppc'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64'), LOOKUP_PACKAGE_ARCH('ppc64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ppc64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('pSeries'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('pSeries'), LOOKUP_PACKAGE_ARCH('pSeries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('pSeries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('iSeries'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('iSeries'), LOOKUP_PACKAGE_ARCH('iSeries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('iSeries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('x86_64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('x86_64'), LOOKUP_PACKAGE_ARCH('x86_64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('x86_64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64iseries'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64iseries'), LOOKUP_PACKAGE_ARCH('ppc64iseries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ppc64iseries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64pseries'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ppc64pseries'), LOOKUP_PACKAGE_ARCH('ppc64pseries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ppc64pseries'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris'), LOOKUP_PACKAGE_ARCH('sparc-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc.sun4u-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc.sun4u-solaris'), LOOKUP_PACKAGE_ARCH('sparc.sun4u-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc.sun4u-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc.sun4v-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('tar'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('tar'), LOOKUP_PACKAGE_ARCH('tar'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('tar'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia32e'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia32e'), LOOKUP_PACKAGE_ARCH('ia32e'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ia32e'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('amd64'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('amd64'), LOOKUP_PACKAGE_ARCH('amd64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('amd64'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris'), LOOKUP_PACKAGE_ARCH('i386-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris-patch'), LOOKUP_PACKAGE_ARCH('sparc-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris-patch'), LOOKUP_PACKAGE_ARCH('i386-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('sparc-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('i386-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris'), LOOKUP_PACKAGE_ARCH('noarch-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('noarch-solaris'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('noarch-solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('all-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('all-deb'), LOOKUP_PACKAGE_ARCH('all-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('all-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('i386-deb'), LOOKUP_PACKAGE_ARCH('i386-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('i386-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alpha-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('alpha-deb'), LOOKUP_PACKAGE_ARCH('alpha-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('alpha-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia64-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('ia64-deb'), LOOKUP_PACKAGE_ARCH('ia64-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('ia64-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('sparc-deb'), LOOKUP_PACKAGE_ARCH('sparc-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('sparc-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('src-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('src-deb'), LOOKUP_PACKAGE_ARCH('src-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('src-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('s390-deb'), LOOKUP_PACKAGE_ARCH('s390-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('s390-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('powerpc-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('powerpc-deb'), LOOKUP_PACKAGE_ARCH('powerpc-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('powerpc-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('arm-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('arm-deb'), LOOKUP_PACKAGE_ARCH('arm-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('arm-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('mips-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('mips-deb'), LOOKUP_PACKAGE_ARCH('mips-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('mips-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('amd64-deb'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('amd64-deb'), LOOKUP_PACKAGE_ARCH('amd64-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('amd64-deb'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('solaris-patch'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('solaris-patch'), LOOKUP_PACKAGE_ARCH('solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('solaris-patch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('noarch'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('solaris-patch-cluster'), LOOKUP_PACKAGE_ARCH('solaris-patch-cluster'), sysdate, sysdate); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('solaris-patch-cluster'), sysdate, sysdate); diff --git a/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql b/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql new file mode 100644 index 0000000..1dd9a38 --- /dev/null +++ b/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql @@ -0,0 +1,35 @@ +-- +-- Copyright (c) 2010 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. +-- + + +CREATE TABLE rhnPackageUpgradeArchCompat +( + package_arch_id NUMBER NOT NULL + CONSTRAINT rhn_puac_paid_fk + REFERENCES rhnPackageArch (id), + package_upgrade_arch_id NUMBER NOT NULL + CONSTRAINT rhn_puac_pauid_fk + REFERENCES rhnPackageArch (id), + created DATE + DEFAULT (sysdate) NOT NULL, + modified DATE + DEFAULT (sysdate) NOT NULL +) +ENABLE ROW MOVEMENT +; + +CREATE INDEX rhn_puac_pa_pua + ON rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id) + TABLESPACE [[64k_tbs]];

1 0

java/code
by Tomas Lestach 06 Sep '10

06 Sep '10

java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d88dccd944f383a82b9fc7897af7497ae286afd0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Sep 6 10:06:36 2010 +0200 fixing unit test diff --git a/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java b/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java index 566225a..34270c3 100644 --- a/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/user/test/UserManagerTest.java @@ -388,9 +388,9 @@ public class UserManagerTest extends RhnBaseTestCase { assertTrue(lst.get(5) instanceof RhnTimeZone); assertTrue(lst.get(34) instanceof RhnTimeZone); - assertTrue(((RhnTimeZone)lst.get(4)).equals(UserManager + assertTrue(((RhnTimeZone)lst.get(5)).equals(UserManager .getTimeZone("America/Phoenix"))); - assertTrue(((RhnTimeZone)lst.get(4)).getOlsonName().equals("America/Phoenix")); + assertTrue(((RhnTimeZone)lst.get(5)).getOlsonName().equals("America/Phoenix")); } public void testUsersInSet() throws Exception {

1 0

2 commits - schema/spacewalk
by Michael Mraka 06 Sep '10

06 Sep '10

schema/spacewalk/oracle/data/rhn_schedule_days.sql | 41 ++++++------------- schema/spacewalk/postgres/data/rhn_schedule_days.sql | 41 ++++++------------- 2 files changed, 30 insertions(+), 52 deletions(-) New commits: commit 52384ab2b0a886ec2415641a15223e5c9af004a9 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 09:48:38 2010 +0200 removed outdated log comments diff --git a/schema/spacewalk/oracle/data/rhn_schedule_days.sql b/schema/spacewalk/oracle/data/rhn_schedule_days.sql index b8133b7..bf701bf 100644 --- a/schema/spacewalk/oracle/data/rhn_schedule_days.sql +++ b/schema/spacewalk/oracle/data/rhn_schedule_days.sql @@ -72,20 +72,3 @@ end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) null,null,null,null,null,null,'system',null); commit; --- ---Revision 1.5 2004/06/17 20:48:59 kja ---bugzilla 124970 -- _data is in for 350. --- ---Revision 1.4 2004/05/29 21:51:49 pjones ---bugzilla: none -- _data is not for 340, so says kja. --- ---Revision 1.3 2004/05/07 23:30:22 kja ---Shortened constraint/other names as needed. Fixed minor syntax errors. --- ---Revision 1.2 2004/05/04 20:03:38 kja ---Added commits. --- ---Revision 1.1 2004/04/22 19:05:45 kja ---Added the 24 x 7 schedule data. Corrected logic for skipping sequence numbers ---in rhn_notification_formats_data.sql and rhn_strategies_data.sql. --- diff --git a/schema/spacewalk/postgres/data/rhn_schedule_days.sql b/schema/spacewalk/postgres/data/rhn_schedule_days.sql index 47b8fd2..2f2bb72 100644 --- a/schema/spacewalk/postgres/data/rhn_schedule_days.sql +++ b/schema/spacewalk/postgres/data/rhn_schedule_days.sql @@ -1,5 +1,5 @@ -- --- Copyright (c) 2008 Red Hat, Inc. +-- Copyright (c) 2010 Red Hat, Inc. -- -- This software is licensed to you under the GNU General Public License, -- version 2 (GPLv2). There is NO WARRANTY for this software, express or @@ -72,20 +72,3 @@ end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) null,null,null,null,null,null,'system',null); commit; --- ---Revision 1.5 2004/06/17 20:48:59 kja ---bugzilla 124970 -- _data is in for 350. --- ---Revision 1.4 2004/05/29 21:51:49 pjones ---bugzilla: none -- _data is not for 340, so says kja. --- ---Revision 1.3 2004/05/07 23:30:22 kja ---Shortened constraint/other names as needed. Fixed minor syntax errors. --- ---Revision 1.2 2004/05/04 20:03:38 kja ---Added commits. --- ---Revision 1.1 2004/04/22 19:05:45 kja ---Added the 24 x 7 schedule data. Corrected logic for skipping sequence numbers ---in rhn_notification_formats_data.sql and rhn_strategies_data.sql. --- commit b66bcac0e2cfd00c47529086bb238780c1258aee Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Sep 6 09:44:49 2010 +0200 converted dates to ISO format (independent of NLS_LANG settings) addressing ERROR at line 5: ORA-01843: invalid month diff --git a/schema/spacewalk/oracle/data/rhn_schedule_days.sql b/schema/spacewalk/oracle/data/rhn_schedule_days.sql index f8fa954..b8133b7 100644 --- a/schema/spacewalk/oracle/data/rhn_schedule_days.sql +++ b/schema/spacewalk/oracle/data/rhn_schedule_days.sql @@ -1,5 +1,5 @@ -- --- Copyright (c) 2008 Red Hat, Inc. +-- Copyright (c) 2010 Red Hat, Inc. -- -- This software is licensed to you under the GNU General Public License, -- version 2 (GPLv2). There is NO WARRANTY for this software, express or @@ -25,50 +25,50 @@ insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( rhn_schedule_days_recid_seq.nextval, ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),0, - to_date('08-SEP-2000 12:00:02 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:02 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( rhn_schedule_days_recid_seq.nextval, ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),1, - to_date('08-SEP-2000 12:00:09 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:09 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( rhn_schedule_days_recid_seq.nextval, ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),2, - to_date('08-SEP-2000 12:00:14 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:14 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( rhn_schedule_days_recid_seq.nextval, ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),3, - to_date('08-SEP-2000 12:00:20 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:20 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( rhn_schedule_days_recid_seq.nextval, ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),4, - to_date('08-SEP-2000 12:00:25 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:25 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( rhn_schedule_days_recid_seq.nextval, ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),5, - to_date('08-SEP-2000 12:00:31 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:31 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( rhn_schedule_days_recid_seq.nextval, ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),6, - to_date('08-SEP-2000 12:00:36 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:36 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); commit; diff --git a/schema/spacewalk/postgres/data/rhn_schedule_days.sql b/schema/spacewalk/postgres/data/rhn_schedule_days.sql index 1119e59..47b8fd2 100644 --- a/schema/spacewalk/postgres/data/rhn_schedule_days.sql +++ b/schema/spacewalk/postgres/data/rhn_schedule_days.sql @@ -25,50 +25,50 @@ insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( nextval('rhn_schedule_days_recid_seq'), ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),0, - to_date('08-SEP-2000 12:00:02 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:02 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( nextval('rhn_schedule_days_recid_seq'), ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),1, - to_date('08-SEP-2000 12:00:09 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:09 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( nextval('rhn_schedule_days_recid_seq'), ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),2, - to_date('08-SEP-2000 12:00:14 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:14 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( nextval('rhn_schedule_days_recid_seq'), ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),3, - to_date('08-SEP-2000 12:00:20 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:20 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( nextval('rhn_schedule_days_recid_seq'), ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),4, - to_date('08-SEP-2000 12:00:25 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:25 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( nextval('rhn_schedule_days_recid_seq'), ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),5, - to_date('08-SEP-2000 12:00:31 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:31 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); insert into rhn_schedule_days(recid,schedule_id,ord,start_1,end_1,start_2, end_2,start_3,end_3,start_4,end_4,last_update_user,last_update_date) values ( nextval('rhn_schedule_days_recid_seq'), ( select recid from rhn_schedules where customer_id is null and description = '24x7' ),6, - to_date('08-SEP-2000 12:00:36 AM','DD-MON-YYYY HH:MI:SS AM'), - to_date('09-SEP-2000 12:00:00 AM','DD-MON-YYYY HH:MI:SS AM'), + to_date('2000-09-08 12:00:36 AM','YYYY-MM-DD HH:MI:SS AM'), + to_date('2000-09-09 12:00:00 AM','YYYY-MM-DD HH:MI:SS AM'), null,null,null,null,null,null,'system',null); commit;

1 0

java/code
by Justin Sherrill 03 Sep '10

03 Sep '10

java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 12 ++++------ java/code/src/com/redhat/rhn/testing/ServerTestUtils.java | 2 - 2 files changed, 6 insertions(+), 8 deletions(-) New commits: commit 812a563b966e9877d0ff5c07782c2acc76285ee9 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Fri Sep 3 17:40:05 2010 -0400 unit test fix diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java index c0f55cd..4ceb38e 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java @@ -37,7 +37,6 @@ import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerFactory; -import com.redhat.rhn.domain.server.VirtualInstance; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.ChannelOverview; @@ -380,11 +379,10 @@ public class ChannelManagerTest extends BaseTestCaseWithUser { public void testBaseChannelsForSystemIncludesEus() throws Exception { Server s = ServerTestUtils.createTestSystem(user); String version = "5Server"; - String release = "5.0.0"; + String release = "5.0.0.9"; s = ServerTestUtils.addRedhatReleasePackageToServer(user, s, version, release); - - String release2 = "5.2.0"; - String release3 = "5.3.0"; + String release2 = "5.2.0.4"; + String release3 = "5.3.0.3"; // Create some base channels and corresponding entries in rhnReleaseChannelMap: Channel base1 = ChannelFactoryTest.createBaseChannel(user); Channel base2 = ChannelFactoryTest.createBaseChannel(user); @@ -398,10 +396,10 @@ public class ChannelManagerTest extends BaseTestCaseWithUser { ChannelManager.RHEL_PRODUCT_NAME, version, release2); ChannelManagerTest.createReleaseChannelMap(base2, ChannelManager.RHEL_PRODUCT_NAME, version, release3); + HibernateFactory.getSession().flush(); List<EssentialChannelDto> channels = ChannelManager.listBaseChannelsForSystem( user, s); - assertTrue(channels.size() >= 2); } @@ -541,7 +539,7 @@ public class ChannelManagerTest extends BaseTestCaseWithUser { public void testIsChannelFree() throws Exception { Server s = ServerTestUtils.createVirtHostWithGuests(user, 1); - Server guest = ((VirtualInstance) s.getGuests().iterator().next()).getGuestSystem(); + Server guest = (s.getGuests().iterator().next()).getGuestSystem(); Channel b1 = ChannelTestUtils.createTestChannel(user); Channel b2 = ChannelTestUtils.createTestChannel(user); assertFalse(ChannelManager.isChannelFreeForSubscription(s, b1)); diff --git a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java index 3acca26..48f3c71 100644 --- a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java @@ -96,7 +96,7 @@ public class ServerTestUtils { throws Exception { InstalledPackage testInstPack = new InstalledPackage(); - String epoch = "idontcare"; + String epoch = ""; PackageEvr evr = PackageEvrFactory.createPackageEvr(epoch, version, release); testInstPack.setEvr(evr);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits September 2010