Changes to 'refs/tags/spacewalk-java-1.2.72-1'
by Lukas Zapletal
Tag 'spacewalk-java-1.2.72-1' created by Lukas Zapletal <lzap+git(a)redhat.com> at 2010-10-25 10:17 +0000
Tagging package [spacewalk-java] version [1.2.72-1] in directory [java/].
Changes since rhncfg-5.9.31-1:
Jan Pazdziora (1):
Need to truncate the values upon select as well.
Lukas Zapletal (9):
Use the { call ... } syntax instead of the direct PL/SQL.
Default cast fix for PostgreSQL
Reverting "Removed unnecessary ORDER BY" commits and fixing
Sorting fix in packages for PostgreSQL
Addressing subquery in FROM must have an alias issue
Error in packages dependencies and obsoletes (PXT)
Taskomatic data being inserted in PostgreSQL schema now
Addressing subquery in FROM must have an alias issue (fix)
Automatic commit of package [spacewalk-java] release [1.2.72-1].
---
backend/server/importlib/backend.py | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 70 ++--
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 46 +--
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 10
java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java | 16 +
java/spacewalk-java.spec | 9
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/postgres/data/data.deps | 3
schema/spacewalk/postgres/data/rhnTaskoSchedule.sql | 100 ++++++
schema/spacewalk/postgres/data/rhnTaskoTemplate.sql | 150 ++++++++++
schema/spacewalk/postgres/views/rhnServerOverview.sql | 4
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 128 ++++----
web/modules/rhn/RHN/DB/Package.pm | 16 -
13 files changed, 431 insertions(+), 125 deletions(-)
---
13 years, 6 months
10 commits - java/code java/spacewalk-java.spec rel-eng/packages schema/spacewalk web/modules
by Lukas Zapletal
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 70 ++--
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 46 +--
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 10
java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java | 16 +
java/spacewalk-java.spec | 9
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/postgres/data/data.deps | 3
schema/spacewalk/postgres/data/rhnTaskoSchedule.sql | 100 ++++++
schema/spacewalk/postgres/data/rhnTaskoTemplate.sql | 150 ++++++++++
schema/spacewalk/postgres/views/rhnServerOverview.sql | 4
schema/spacewalk/spacewalk-schema.spec | 6
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 128 ++++----
web/modules/rhn/RHN/DB/Package.pm | 16 -
14 files changed, 436 insertions(+), 126 deletions(-)
New commits:
commit 934b57b964904c35db468f260c140707e57a7401
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Oct 25 12:18:09 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.2.54-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index ad617d4..72ebf36 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.2.53-1 schema/spacewalk/
+1.2.54-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 2dafcfd..bc17bc8 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.2.53
+Version: 1.2.54
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Mon Oct 25 2010 Lukas Zapletal 1.2.54-1
+- Taskomatic data being inserted in PostgreSQL schema now
+- Default cast fix for PostgreSQL
+
* Mon Oct 25 2010 Jan Pazdziora 1.2.53-1
- Fix dependencies for rhnUserReceiveNotifications.
commit 89a9e072930ff8b59dc1508de45c3331f2d10eed
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Oct 25 12:17:52 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.72-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d6737e6..a88c1ac 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.71
+Version: 1.2.72
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -358,6 +358,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Oct 25 2010 Lukas Zapletal 1.2.72-1
+- Addressing subquery in FROM must have an alias issue (fix)
+- Sorting fix in packages for PostgreSQL
+- Reverting "Removed unnecessary ORDER BY" commits and fixing
+- Default cast fix for PostgreSQL
+- Use the { call ... } syntax instead of the direct PL/SQL.
+
* Mon Oct 25 2010 Jan Pazdziora 1.2.71-1
- 639999 - adding %end tags to generated kickstart files if os is fedora or
RHEL 6 (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d503ceb..629cf38 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.71-1 java/
+1.2.72-1 java/
commit 546adc9416d999ae8f198bf7a5952a9956d204be
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Oct 25 12:01:48 2010 +0200
Addressing subquery in FROM must have an alias issue (fix)
The AS keyword is not acceptable by Oracle here. Fixing. This works for both
PostgreSQL and Oracle.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index 760f2f8..1cf81f2 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -42,7 +42,7 @@ SELECT cc.id from rhnConfigChannel cc
AND CF.latest_config_revision_id = CR.id
AND CCT.label = :cct_label
AND USP.user_id = :user_id
- AND rhn_config_channel.get_user_file_access(CF.id, :user_id) = 1) AS subselect
+ AND rhn_config_channel.get_user_file_access(CF.id, :user_id) = 1) subselect
GROUP by file_type
</query>
</mode>
@@ -115,7 +115,7 @@ the were associated to a scheduled action on a server-->
where
rac.server_id = :sid and
rac.action_id = :aid
- ) AS subselect GROUP BY file_type
+ ) subselect GROUP BY file_type
</query>
</mode>
@@ -133,7 +133,7 @@ successfully compared in a scheduled diff action on a server-->
acr.server_id = :sid and
acr.action_id = :aid and
acr.failure_id is null
- ) AS subselect GROUP BY file_type
+ ) subselect GROUP BY file_type
</query>
</mode>
@@ -155,7 +155,7 @@ on the server in a scheduled diff action on a server-->
acr.action_id = :aid and
acr.failure_id is null and
acrr.result is not null
- ) AS subselect GROUP BY file_type
+ ) subselect GROUP BY file_type
</query>
</mode>
commit 1deb66c696a8cabfc49de8f8299e5a69abeda93d
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Oct 25 11:26:26 2010 +0200
Taskomatic data being inserted in PostgreSQL schema now
Starting working on Taskomatic on PostgreSQL.
diff --git a/schema/spacewalk/postgres/data/data.deps b/schema/spacewalk/postgres/data/data.deps
index a8b823b..a8736bb 100644
--- a/schema/spacewalk/postgres/data/data.deps
+++ b/schema/spacewalk/postgres/data/data.deps
@@ -20,5 +20,6 @@ rhnKickstartTimezone :: data/rhnKSInstallType
rhnTemplateString :: data/rhnTemplateCategory
rhnBlacklistObsoletes :: lookup_functions
rhn_schedule_days :: data/rhn_schedules
-
+rhnTaskoSchedule :: rhnTaskoBunch
+rhnTaskoTemplate :: rhnTaskoBunch rhnTaskoTask
diff --git a/schema/spacewalk/postgres/data/rhnTaskoSchedule.sql b/schema/spacewalk/postgres/data/rhnTaskoSchedule.sql
new file mode 100644
index 0000000..1977f7a
--- /dev/null
+++ b/schema/spacewalk/postgres/data/rhnTaskoSchedule.sql
@@ -0,0 +1,100 @@
+--
+-- 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.
+--
+
+-- Top of every minute
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'sync-probe-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='sync-probe-bunch'),
+ sysdate, '0 * * * * ?');
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'errata-queue-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='errata-queue-bunch'),
+ sysdate, '0 * * * * ?');
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'cobbler-sync-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='cobbler-sync-bunch'),
+ sysdate, '0 * * * * ?');
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'channel-repodata-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='channel-repodata-bunch'),
+ sysdate, '0 * * * * ?');
+
+-- Every 10 minutes
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'package-cleanup-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='package-cleanup-bunch'),
+ sysdate, '0 0/10 * * * ?');
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'kickstart-cleanup-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='kickstart-cleanup-bunch'),
+ sysdate, '0 0/10 * * * ?');
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'errata-cache-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='errata-cache-bunch'),
+ sysdate, '0 0/10 * * * ?');
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'kickstartfile-sync-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='kickstartfile-sync-bunch'),
+ sysdate, '0 0/10 * * * ?');
+
+-- Every 15 minutes
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'session-cleanup-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='session-cleanup-bunch'),
+ sysdate, '0 0/15 * * * ?');
+
+-- Once a day at 4:05:00 AM (beware of 2AM cronjobs)
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'sandbox-cleanup-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='sandbox-cleanup-bunch'),
+ sysdate, '0 5 4 ? * *');
+
+-- Once a day at 4:35:00 AM (beware of 2AM cronjobs)
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'clean-alerts-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='clean-alerts-bunch'),
+ sysdate, '0 35 4 ? * *');
+
+-- Once a day at 11:00 PM
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'daily-status-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='daily-status-bunch'),
+ sysdate, '0 0 23 ? * *');
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'compare-configs-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='compare-configs-bunch'),
+ sysdate, '0 0 23 ? * *');
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'satcert-check-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='satcert-check-bunch'),
+ sysdate, '0 0 23 ? * *');
+
+INSERT INTO rhnTaskoSchedule (id, job_label, bunch_id, active_from, cron_expr)
+ VALUES(nextval('rhn_tasko_schedule_id_seq'), 'clear-taskologs-default',
+ (SELECT id FROM rhnTaskoBunch WHERE name='clear-taskologs-bunch'),
+ sysdate, '0 0 23 ? * *');
diff --git a/schema/spacewalk/postgres/data/rhnTaskoTemplate.sql b/schema/spacewalk/postgres/data/rhnTaskoTemplate.sql
new file mode 100644
index 0000000..980af96
--- /dev/null
+++ b/schema/spacewalk/postgres/data/rhnTaskoTemplate.sql
@@ -0,0 +1,150 @@
+--
+-- 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 rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='daily-status-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='summary-population'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='daily-status-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='daily-summary'),
+ 1,
+ 'FINISHED');
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='sat-sync-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='satellite-sync'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='clear-taskologs-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='clear-log-history'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='cobbler-sync-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='cobbler-sync'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='compare-configs-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='compare-config-files'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='clean-alerts-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='clean-current-alerts'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='sync-probe-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='sync-probe-state'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='session-cleanup-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='session-cleanup'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='sandbox-cleanup-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='sandbox-cleanup'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='repo-sync-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='repo-sync'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='package-cleanup-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='package-cleanup'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='kickstartfile-sync-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='kickstartfile-sync'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='kickstart-cleanup-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='kickstart-cleanup'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='errata-queue-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='errata-queue'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='channel-repodata-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='channel-repodata'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='satcert-check-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='sat-cert-check'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='errata-cache-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='errata-cache'),
+ 0,
+ null);
+
+INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
+ VALUES (nextval('rhn_tasko_template_id_seq'),
+ (SELECT id FROM rhnTaskoBunch WHERE name='errata-cache-bunch'),
+ (SELECT id FROM rhnTaskoTask WHERE name='errata-mailer'),
+ 1,
+ 'FINISHED');
+
+commit;
commit 6f792cb6112a439988b28a4121346f023348f9b4
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Oct 25 10:09:43 2010 +0200
Error in packages dependencies and obsoletes (PXT)
Addressing for SELECT DISTINCT, ORDER BY expressions must appear in select list.
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index 492f50b..b5c6e47 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -297,11 +297,11 @@ sub provides {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageProvides P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
@@ -324,11 +324,11 @@ sub requires {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageRequires P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
$sth = $dbh->prepare($query);
@@ -352,11 +352,11 @@ sub obsoletes {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageObsoletes P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
$sth = $dbh->prepare($query);
@@ -379,11 +379,11 @@ sub conflicts {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageConflicts P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
$sth = $dbh->prepare($query);
commit f8097b624c41cd37b003d03371f026e0a12b3a2a
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Oct 25 09:59:47 2010 +0200
Addressing subquery in FROM must have an alias issue
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index f814f88..760f2f8 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -29,7 +29,7 @@ SELECT cc.id from rhnConfigChannel cc
that are aacessible to the user-->
<mode name ="count_locally_managed_file_paths">
<query params = "sid, user_id, cct_label">
- select file_type, count(file_type) as count from (
+ select file_type, count(file_type) as count from (
SELECT CFT.label as file_type
FROM rhnConfigChannelType CCT
INNER JOIN rhnConfigChannel CC ON CCT.ID = CC.confchan_type_id
@@ -42,7 +42,7 @@ SELECT cc.id from rhnConfigChannel cc
AND CF.latest_config_revision_id = CR.id
AND CCT.label = :cct_label
AND USP.user_id = :user_id
- AND rhn_config_channel.get_user_file_access(CF.id, :user_id) = 1)
+ AND rhn_config_channel.get_user_file_access(CF.id, :user_id) = 1) AS subselect
GROUP by file_type
</query>
</mode>
@@ -115,7 +115,7 @@ the were associated to a scheduled action on a server-->
where
rac.server_id = :sid and
rac.action_id = :aid
- ) GROUP BY file_type
+ ) AS subselect GROUP BY file_type
</query>
</mode>
@@ -133,7 +133,7 @@ successfully compared in a scheduled diff action on a server-->
acr.server_id = :sid and
acr.action_id = :aid and
acr.failure_id is null
- ) GROUP BY file_type
+ ) AS subselect GROUP BY file_type
</query>
</mode>
@@ -155,7 +155,7 @@ on the server in a scheduled diff action on a server-->
acr.action_id = :aid and
acr.failure_id is null and
acrr.result is not null
- ) GROUP BY file_type
+ ) AS subselect GROUP BY file_type
</query>
</mode>
commit 6515739405e461be225c0a8a34ba326a63854b12
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Fri Oct 22 16:59:06 2010 +0200
Sorting fix in packages for PostgreSQL
This is correction of commit 783c4bc72099f07742978d9ca76e897fba2ed348 that was previously
reverted. This one applies only to NON DISTINCT queries.
Postgres does not allow sorting of string-concatenated columns. We have
many sorts in our java code (package management). This was fixed by
sorting based on columns and not the concatenated string.
Example fix follows. In the statement
SELECT xxx || yyy AS NVRE
...
ORDER BY UPPER(NVRE)
the order by clause is rewritten as
ORDER BY UPPER(xxx), UPPER(yyy)
com.redhat.rhn.common.db.WrappedSQLException: ERROR: column "nvre" does
not exist
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index de657c1..d44526f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -309,7 +309,7 @@ SELECT PN.id || '|' || PE.id || '|' || PA.id AS ID_COMBO,
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
@@ -400,7 +400,7 @@ SELECT PN.id || '|' || PE.id || '|' || PA.id AS ID_COMBO,
INNER JOIN rhnPackageEVR PE on SP.evr_id = PE.id
LEFT JOIN rhnPackageArch PA on SP.PACKAGE_ARCH_ID = PA.id
WHERE SP.server_id = :sid
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
@@ -637,6 +637,7 @@ SELECT P.id, P.summary, PP.name as provider
<mode name="system_available_packages" class="com.redhat.rhn.frontend.dto.PackageListItem">
<query params="sid">
SELECT distinct pn.name AS NAME,
+ UPPER(pn.name) AS name_upper,
pn.name || '-' || evr_t_as_vre_simple(full_list.evr) AS NVRE,
pn.name || '-' || evr_t_as_vre_simple(full_list.evr) || '.' || full_list.arch_label AS NVREA,
pn.id || '|' || lookup_evr((full_list.evr).epoch, (full_list.evr).version, (full_list.evr).release) || '|' || full_list.arch_id AS ID_COMBO,
@@ -662,7 +663,7 @@ SELECT distinct pn.name AS NAME,
WHERE SP.server_id = :sid
AND SP.name_id = full_list.name_id
AND (SP.package_arch_id = full_list.arch_id or SP.package_arch_id is null))
-ORDER BY UPPER(pn.name)
+ORDER BY name_upper
</query>
</mode>
@@ -930,7 +931,7 @@ WHERE SP.server_id = :sid
WHERE PA.id = SP.package_arch_id
AND AT.id = PA.arch_type_id
AND AT.label = 'solaris-patch' )
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
<elaborator params="sid" multiple="t">
SELECT PN.id,
@@ -974,7 +975,7 @@ SELECT PN.id || '|' || PE.id AS ID_COMBO,
AND S.user_id = :user_id
AND S.element = PN.id
AND S.element_two = PE.id
- ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
@@ -996,7 +997,7 @@ SELECT PN.id || '|' || PE.id AS ID_COMBO,
INNER JOIN rhnArchType AT ON AT.id = PA.arch_type_id
WHERE SP.server_id = :sid
AND AT.label = 'sysv-solaris'
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
@@ -1633,7 +1634,7 @@ SELECT P.id AS ID,
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
AND P.id = SP.package_id
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index 66b98b4..a864e47 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -184,7 +184,7 @@ SELECT PN.id || '|' || PE.id AS ID,
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
@@ -211,7 +211,7 @@ SELECT P.id AS ID,
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
@@ -236,7 +236,7 @@ SELECT P.id AS ID,
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
AND P.id = SP.package_id
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
@@ -263,7 +263,7 @@ SELECT P.id AS ID,
AND PA.id = P.package_arch_id
AND P.id = SP.package_id
AND SP.patch_type = SPT.id
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
@@ -289,14 +289,10 @@ SELECT P.id AS ID,
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
AND P.id = SP.package_id
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
-
-
-
-
<mode name="packages_available_to_errata">
<query params="">
SELECT 1 FROM DUAL
@@ -485,7 +481,7 @@ SELECT PN.id || '|' || PE.id AS ID,
AND SP.name_id = PN.id
AND SP.evr_id = PE.id
AND SP.package_arch_id = PA.id
-ORDER BY UPPER(NVRE)
+ORDER BY UPPER(PN.name), evr_t_as_vre_simple(PE.evr)
</query>
</mode>
commit e549a9907132b4622735b6429890fcbd091e715f
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Fri Oct 22 16:37:50 2010 +0200
Reverting "Removed unnecessary ORDER BY" commits and fixing
Several ORDER BY clauses in SELECT DISTINCT were removed which was incorrect.
The changes were reverted and ORDER BY clauses were rewritten in the proper way by
creating extra column.
This reverts commits 263859eb85c9aa56d3707d7cfc808c162be1493b
263859eb85c9aa56d3707d7cfc808c162be1493b c432623008328d08746068a21da8e7bf4fc5e155
783c4bc72099f07742978d9ca76e897fba2ed348 f3aa49da371994bbd631272b0f66eda8642511df
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 7c0e0ba..de657c1 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -44,41 +44,41 @@ ORDER BY UPPER(pn.name), full_list.evr
<mode name="package_conflicts">
<query params="pid">
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageConflicts P
WHERE P.package_id = :pid
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
</query>
</mode>
<mode name="package_provides">
<query params="pid">
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageProvides P
WHERE P.package_id = :pid
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
</query>
</mode>
<mode name="package_obsoletes">
<query params="pid">
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageObsoletes P
WHERE P.package_id = :pid
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
</query>
</mode>
<mode name="package_requires">
<query params="pid">
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageRequires P
WHERE P.package_id = :pid
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
</query>
</mode>
@@ -194,7 +194,7 @@ ORDER BY UPPER(C.label)
<mode name="name_by_provide" class="com.redhat.rhn.frontend.dto.PackageListItem">
<query params="org_id, cap_name">
-SELECT DISTINCT PN.name
+SELECT DISTINCT PN.name, UPPER(PN.name) AS name_upper
FROM rhnPackageName PN,
rhnPackage P,
rhnPackageProvides PP,
@@ -212,14 +212,13 @@ WHERE PC.name = :cap_name
AND CFM.CHANNEL_ID = CP.channel_id
AND CP.package_id = P.id))
AND P.name_id = PN.id
-ORDER BY UPPER(PN.name)
+ORDER BY name_upper
</query>
</mode>
<mode name="name_by_provide_and_channel" class="com.redhat.rhn.frontend.dto.PackageListItem">
<query params="channel_id, org_id, cap_name">
-SELECT DISTINCT PN.name
-
+SELECT DISTINCT PN.name, UPPER(PN.name) AS name_upper
FROM rhnPackageName PN,
rhnPackage P,
rhnPackageProvides PP,
@@ -244,7 +243,7 @@ WHERE PC.name = :cap_name
AND CFM.CHANNEL_ID = CP.channel_id
AND CP.package_id = P.id))
AND P.name_id = PN.id
-ORDER BY UPPER(PN.name)
+ORDER BY name_upper
</query>
</mode>
@@ -252,7 +251,8 @@ ORDER BY UPPER(PN.name)
<query params="eid">
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label package_nvre
+ || '-' || PA.label package_nvre,
+ UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label) as nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -263,7 +263,7 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label)
+ORDER BY nvre_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -272,7 +272,8 @@ ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN P
<query params="eid">
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label package_nvre
+ || '-' || PA.label package_nvre,
+ UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label) as nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -283,7 +284,7 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label)
+ORDER BY nvre_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -308,7 +309,7 @@ SELECT PN.id || '|' || PE.id || '|' || PA.id AS ID_COMBO,
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -339,6 +340,7 @@ SELECT P.id AS ID,
SELECT DISTINCT
CNP.package_id as id,
PN.name as name,
+ UPPER(PN.name) as name_upper,
NVL(PE.version, ' ') as version,
NVL(PE.release, ' ') as release,
NVL(PE.epoch, ' ') as epoch,
@@ -353,7 +355,7 @@ SELECT DISTINCT
AND PN.id = CNP.name_id
AND PE.id = CNP.evr_id
AND PA.id = CNP.package_arch_id
-ORDER BY UPPER(PN.name)
+ORDER BY name_upper
</query>
</mode>
@@ -364,6 +366,7 @@ ORDER BY UPPER(PN.name)
SELECT DISTINCT
PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS nvre,
+ UPPER(PN.name || '-' || evr_t_as_vre_simple(PE.evr)) AS nvre_upper,
PN.id || '|' || CNP.evr_id || '|' || PA.id AS id_combo,
(SELECT MAX(summary) FROM rhnPackage P WHERE P.id = CNP.package_id) SUMMARY,
PA.label as arch
@@ -375,7 +378,7 @@ SELECT DISTINCT
AND PN.id = CNP.name_id
AND PE.id = CNP.evr_id
AND PA.id = CNP.PACKAGE_ARCH_ID
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY nvre_upper
</query>
</mode>
@@ -397,7 +400,7 @@ SELECT PN.id || '|' || PE.id || '|' || PA.id AS ID_COMBO,
INNER JOIN rhnPackageEVR PE on SP.evr_id = PE.id
LEFT JOIN rhnPackageArch PA on SP.PACKAGE_ARCH_ID = PA.id
WHERE SP.server_id = :sid
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -514,7 +517,8 @@ ORDER BY UPPER(NVREA)
<query params="org_id, eid">
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label PACKAGE_NVRE
+ || '-' || PA.label PACKAGE_NVRE,
+ UPPER(PACKAGE_NVRE) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -530,7 +534,7 @@ SELECT DISTINCT P.id id, PN.name || '-' || PE.version
FROM rhnErrataPackage EP
WHERE EP.errata_id = :eid
AND EP.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVRE)
+ORDER BY nvre_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -540,7 +544,8 @@ ORDER BY UPPER(PACKAGE_NVRE)
SELECT DISTINCT P.id ID,
PN.name || '-' || PE.version || '-' || PE.release
|| (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label PACKAGE_NVRE
+ || '-' || PA.label PACKAGE_NVRE,
+ UPPER(PACKAGE_NVRE) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -556,7 +561,7 @@ ORDER BY UPPER(PACKAGE_NVRE)
FROM rhnErrataPackageTmp EP
WHERE EP.errata_id = :eid
AND EP.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVRE)
+ORDER BY nvre_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -657,6 +662,7 @@ SELECT distinct pn.name AS NAME,
WHERE SP.server_id = :sid
AND SP.name_id = full_list.name_id
AND (SP.package_arch_id = full_list.arch_id or SP.package_arch_id is null))
+ORDER BY UPPER(pn.name)
</query>
</mode>
@@ -861,14 +867,15 @@ SELECT CP.package_id as ID,
<mode name="packages_associated_with_action">
<query params="aid">
-SELECT DISTINCT PN.id || '|' || PE.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE
+SELECT DISTINCT PN.id || '|' || PE.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE,
+ UPPER(NVRE) as nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnActionPackage AP
WHERE AP.action_id = :aid
AND PN.id = AP.name_id
AND PE.id = AP.evr_id
-ORDER BY UPPER(NVRE)
+ORDER BY nvre_upper
</query>
</mode>
@@ -923,7 +930,7 @@ WHERE SP.server_id = :sid
WHERE PA.id = SP.package_arch_id
AND AT.id = PA.arch_type_id
AND AT.label = 'solaris-patch' )
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
<elaborator params="sid" multiple="t">
SELECT PN.id,
@@ -967,7 +974,7 @@ SELECT PN.id || '|' || PE.id AS ID_COMBO,
AND S.user_id = :user_id
AND S.element = PN.id
AND S.element_two = PE.id
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -989,7 +996,7 @@ SELECT PN.id || '|' || PE.id AS ID_COMBO,
INNER JOIN rhnArchType AT ON AT.id = PA.arch_type_id
WHERE SP.server_id = :sid
AND AT.label = 'sysv-solaris'
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -1626,7 +1633,7 @@ SELECT P.id AS ID,
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
AND P.id = SP.package_id
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
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 a4c102f..eee8d89 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
@@ -4,6 +4,7 @@
<query params="user_id, feature">
SELECT DISTINCT S.id,
S.name,
+ UPPER(NVL(S.name, '(none)')) name_upper,
SI.server_id AS IS_RHN_SATELLITE,
PI.server_id AS IS_RHN_PROXY,
TO_CHAR(Sinfo.checkin, 'YYYY-MM-DD HH24:MI:SS') AS LAST_CHECKIN
@@ -14,14 +15,15 @@
AND S.id = USP.server_id
AND Sinfo.server_id = S.id
AND EXISTS(SELECT 1 FROM rhnServerFeaturesView SFV WHERE SFV.server_id = S.ID AND SFV.label = :feature)
-ORDER BY UPPER(NVL(S.name, '(none)')), S.id
+ORDER BY name_upper, S.id
</query>
</mode>
<mode name="virtual_hosts_for_user" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query params="user_id">
SELECT DISTINCT S.id,
- S.name
+ S.name,
+ UPPER(NVL(S.name, '(none)')) name_upper
FROM rhnServer S,
rhnUserServerPerms USP,
rhnVirtualInstance VI
@@ -30,7 +32,7 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id
AND VI.host_system_id = S.id
AND USP.server_id = S.id
AND USP.user_id = :user_id
-ORDER BY UPPER(NVL(S.name, '(none)')), S.id
+ORDER BY name_upper, S.id
</query>
<elaborator name="system_overview" />
</mode>
@@ -72,6 +74,7 @@ ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
<mode name="ssm_remote_commandable">
<query params="user_id">
SELECT DISTINCT S.id,
+ UPPER(NVL(S.name, '(none)')) name_upper,
S.name AS SERVER_NAME
FROM rhnServer S,
rhnClientCapabilityName CCN,
@@ -87,7 +90,7 @@ SELECT DISTINCT S.id,
AND CC.capability_name_id = CCN.id
AND CCN.name = 'script.run'
AND USP.server_id = S.id
-ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
+ORDER BY name_upper, S.ID
</query>
<elaborator name="system_overview" />
</mode>
@@ -114,7 +117,7 @@ SELECT CDK.id,
<query name="ssm_package_upgrades_systems" params="user_id, set_label, package_set_label">
SELECT DISTINCT
S.id,
- S.name AS SERVER_NAME
+ S.name AS SERVER_NAME, UPPER(S.name) AS name_upper
FROM rhnChannelPackage CP,
rhnChannel C,
rhnServerChannel SC,
@@ -139,7 +142,7 @@ SELECT DISTINCT
AND C.id = CP.channel_id
AND CP.package_id = P.id
AND P.package_arch_id = PA.id
-ORDER BY UPPER(S.name)
+ORDER BY name_upper
</query>
<mode name="ssm_package_upgrades_conf">
@@ -153,7 +156,8 @@ SELECT DISTINCT
P.name_id AS NAME_ID,
P.evr_id AS EVR_ID,
PA.id AS ARCH_ID,
- C.name AS PROVIDING_CHANNEL_NAME
+ C.name AS PROVIDING_CHANNEL_NAME,
+ UPPER(S.name) AS name_upper, UPPER(PN.name || '-' || PE.evr.as_vre_simple() || '-' || PA.label) AS name_evr_upper
FROM rhnChannelPackage CP,
rhnChannel C,
rhnServerChannel SC,
@@ -179,7 +183,7 @@ SELECT DISTINCT
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND P.package_arch_id = PA.id
-ORDER BY UPPER(S.name), UPPER(PN.name || '-' || PE.evr.as_vre_simple() || '-' || PA.label)
+ORDER BY name_upper, name_evr_upper
</elaborator>
</mode>
@@ -403,12 +407,13 @@ SELECT ES.id, S.name, 1 as selectable
<query params="user_id">
SELECT DISTINCT S.id AS ID,
S.name AS NAME,
+ UPPER(NVL(S.name, '(none)')) AS name_upper,
INFO.checkin AS LAST_CHECKIN
FROM rhnServer S, rhnUserServerPerms USP, rhnServerInfo INFO
WHERE USP.user_id = :user_id
AND S.id = USP.server_id
AND S.id = INFO.server_id
-ORDER BY UPPER(NVL(S.name, '(none)')), S.id
+ORDER BY name_upper, S.id
</query>
</mode>
@@ -469,6 +474,7 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id
<query name="available_to_uid" params="formvar_uid">
SELECT DISTINCT S.id AS ID,
S.name AS SERVER_NAME,
+ UPPER(NVL(S.name, '(none)')) AS name_upper,
(SELECT 1
FROM rhnServerFeaturesView SFV
WHERE SFV.server_id = S.id
@@ -476,7 +482,7 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id
FROM rhnServer S, rhnUserServerPerms USP
WHERE USP.user_id = :formvar_uid
AND S.id = USP.server_id
-ORDER BY UPPER(NVL(S.name, '(none)')), S.id
+ORDER BY name_upper, S.id
</query>
@@ -531,6 +537,7 @@ where a.user_id = :formvar_uid
<query params="eid, user_id">
SELECT DISTINCT S.id as system_id,
S.name as system_name,
+ UPPER(NVL(S.name, '(none)')) AS name_upper,
S.id as id,
S.name as name
FROM rhnServerNeededErrataCache SNEC,
@@ -540,7 +547,7 @@ where a.user_id = :formvar_uid
AND USP.user_id = :user_id
AND S.id = USP.server_id
AND S.id = SNEC.server_id
-ORDER BY UPPER(NVL(S.name, '(none)')), S.id
+ORDER BY name_upper, S.id
</query>
</mode>
@@ -607,7 +614,8 @@ ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
<query name="system_set_remove_package_query" params="user_id, set_label, package_set_label">
SELECT DISTINCT S.id,
- S.name SYSTEM_NAME
+ S.name SYSTEM_NAME,
+ UPPER(S.name) AS name_upper
FROM rhnServer S,
rhnServerPackage SP,
rhnSet ST2
@@ -618,7 +626,7 @@ ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
AND SP.evr_id = ST2.element_two
AND (SP.package_arch_id = ST2.element_three OR (SP.package_arch_id is null and ST2.element_three is null))
AND SP.server_id = S.id
- ORDER BY UPPER(S.name), S.id
+ ORDER BY name_upper, S.id
</query>
@@ -1283,7 +1291,7 @@ ORDER BY NAME, VI.virtual_system_id, VI.uuid DESC
</mode>
<query name="system_package_data_from_set" params="user_id, package_set_label">
-SELECT DISTINCT S.id SYSTEM_ID, S.name SYSTEM_NAME, PN.name || '-' || PE.evr.as_vre_simple() NVRE
+SELECT DISTINCT S.id SYSTEM_ID, S.name SYSTEM_NAME, UPPER(S.name) AS name_upper, PN.name || '-' || PE.evr.as_vre_simple() NVRE
FROM rhnServer S,
rhnPackageEVR PE,
rhnPackageName PN,
@@ -1293,7 +1301,7 @@ SELECT DISTINCT S.id SYSTEM_ID, S.name SYSTEM_NAME, PN.name || '-' || PE.evr.as
AND PN.id IN (SELECT element FROM rhnSet WHERE user_id = :user_id AND label = :package_set_label)
AND SP.evr_id = PE.id
AND SP.server_id = S.id
-ORDER BY UPPER(S.name)
+ORDER BY name_upper
</query>
<mode name="system_installed_packages">
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index ce88ae0..66b98b4 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -2,7 +2,7 @@
<mode name="name_by_provide">
<query params="org_id, cap_name">
-SELECT DISTINCT PN.name
+SELECT DISTINCT PN.name, UPPER(PN.name) AS name_upper
FROM rhnPackageName PN,
rhnPackage P,
rhnPackageProvides PP,
@@ -18,7 +18,7 @@ WHERE PC.name = :cap_name
AND AC.channel_id = CP.channel_id
AND CP.package_id = P.id))
AND P.name_id = PN.id
-ORDER BY UPPER(PN.name)
+ORDER BY name_upper
</query>
</mode>
@@ -127,7 +127,8 @@ ORDER BY UPPER(PACKAGE)
<query params="eid">
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label package_nvre
+ || '-' || PA.label package_nvre,
+ UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -138,7 +139,7 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label)
+ORDER BY nvre_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -147,7 +148,8 @@ ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN P
<query params="eid">
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label package_nvre
+ || '-' || PA.label package_nvre,
+ UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -158,7 +160,7 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label)
+ORDER BY nvre_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -182,7 +184,7 @@ SELECT PN.id || '|' || PE.id AS ID,
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -209,7 +211,7 @@ SELECT P.id AS ID,
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -234,7 +236,7 @@ SELECT P.id AS ID,
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
AND P.id = SP.package_id
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -261,7 +263,7 @@ SELECT P.id AS ID,
AND PA.id = P.package_arch_id
AND P.id = SP.package_id
AND SP.patch_type = SPT.id
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -287,7 +289,7 @@ SELECT P.id AS ID,
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
AND P.id = SP.package_id
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -343,7 +345,8 @@ SELECT DISTINCT CNP.package_id as ID,
PE.version,
PE.release,
PA.label AS arch,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) nvre
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) nvre,
+ UPPER(nvre) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -354,13 +357,14 @@ SELECT DISTINCT CNP.package_id as ID,
AND PN.id = CNP.name_id
AND PE.id = CNP.evr_id
AND PA.id = CNP.package_arch_id
-ORDER BY UPPER(nvre)
+ORDER BY nvre_upper
</query>
<mode name="latest_packages_in_channel">
<query params="cid">
SELECT DISTINCT
PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label nvrea,
+ UPPER(nvrea) AS nvrea_upper,
CNP.channel_id AS channel_id,
P.id as ID,
P.SUMMARY as SUMMARY
@@ -381,7 +385,7 @@ SELECT DISTINCT
AND PE.id = CNP.evr_id
AND PA.id = CNP.PACKAGE_ARCH_ID
AND PA.id = P.package_arch_id
-ORDER BY UPPER(NVREA)
+ORDER BY nvrea_upper
</query>
</mode>
@@ -390,6 +394,7 @@ ORDER BY UPPER(NVREA)
<query params="cid">
SELECT DISTINCT
PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label nvrea,
+ UPPER(nvrea) AS nvrea_upper,
CNP.channel_id AS channel_id,
P.id,
P.SUMMARY as SUMMARY
@@ -410,7 +415,7 @@ SELECT DISTINCT
AND PE.id = CNP.evr_id
AND PA.id = CNP.PACKAGE_ARCH_ID
AND PA.arch_type_id = CA.arch_type_id
-ORDER BY UPPER(NVREA)
+ORDER BY nvrea_upper
</query>
</mode>
@@ -420,6 +425,7 @@ ORDER BY UPPER(NVREA)
will be the name -->
SELECT DISTINCT
PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label nvrea,
+ UPPER(nvrea) AS nvrea_upper,
CNP.channel_id AS channel_id,
PN.id || '|' || CNP.evr_id AS id,
(SELECT MAX(summary) FROM rhnPackage P WHERE P.id = CNP.package_id) SUMMARY
@@ -434,7 +440,7 @@ SELECT DISTINCT
AND PA.id = CNP.PACKAGE_ARCH_ID
AND PA.arch_type_id = AT.id
AND AT.label = 'solaris-patch'
-ORDER BY UPPER(NVREA)
+ORDER BY nvrea_upper
</query>
</mode>
@@ -444,6 +450,7 @@ ORDER BY UPPER(NVREA)
will be the name -->
SELECT DISTINCT
PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label nvrea,
+ UPPER(nvrea) AS nvrea_upper,
CNP.channel_id AS channel_id,
PN.id || '|' || CNP.evr_id AS id,
(SELECT MAX(summary) FROM rhnPackage P WHERE P.id = CNP.package_id) SUMMARY
@@ -458,7 +465,7 @@ SELECT DISTINCT
AND PA.id = CNP.PACKAGE_ARCH_ID
AND PA.arch_type_id = AT.id
AND AT.label = 'solaris-patch-cluster'
-ORDER BY UPPER(NVREA)
+ORDER BY nvrea_upper
</query>
</mode>
@@ -478,7 +485,7 @@ SELECT PN.id || '|' || PE.id AS ID,
AND SP.name_id = PN.id
AND SP.evr_id = PE.id
AND SP.package_arch_id = PA.id
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
+ORDER BY UPPER(NVRE)
</query>
</mode>
@@ -798,7 +805,8 @@ ORDER BY UPPER(NVREA)
<query params="org_id">
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label package_nvre
+ || '-' || PA.label package_nvre,
+ UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label) AS name_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -807,7 +815,7 @@ ORDER BY UPPER(NVREA)
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label)
+ORDER BY name_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -816,7 +824,8 @@ ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN P
<query params="org_id, eid">
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label PACKAGE_NVRE
+ || '-' || PA.label PACKAGE_NVRE,
+ UPPER(PACKAGE_NVRE) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -829,7 +838,7 @@ ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN P
FROM rhnErrataPackage EP
WHERE EP.errata_id = :eid
AND EP.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVRE)
+ORDER BY nvre_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -839,7 +848,8 @@ ORDER BY UPPER(PACKAGE_NVRE)
SELECT DISTINCT P.id ID,
PN.name || '-' || PE.version || '-' || PE.release
|| (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
- || '-' || PA.label PACKAGE_NVRE
+ || '-' || PA.label PACKAGE_NVRE,
+ UPPER(PACKAGE_NVRE) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -852,7 +862,7 @@ ORDER BY UPPER(PACKAGE_NVRE)
FROM rhnErrataPackageTmp EP
WHERE EP.errata_id = :eid
AND EP.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVRE)
+ORDER BY nvre_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -915,7 +925,8 @@ SELECT CP.package_id id, C.name package_channels
<query params="channel_id, org_id">
SELECT DISTINCT CP.package_id id, PN.name || '-' || PE.version ||
'-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':'
- || PE.epoch END) || '-' || PA.label package_nvre
+ || PE.epoch END) || '-' || PA.label package_nvre,
+ UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -927,7 +938,7 @@ SELECT CP.package_id id, C.name package_channels
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
AND P.org_id = :org_id
-ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label)
+ORDER BY nvre_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -936,7 +947,8 @@ ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN P
<query params="org_id">
SELECT DISTINCT P.id, PN.name || '-' || PE.version || '-' ||
PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' ||
- PE.epoch END) || '-' || PA.label package_nvre
+ PE.epoch END) || '-' || PA.label package_nvre,
+ UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -948,7 +960,7 @@ ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN P
AND NOT EXISTS (SELECT 1
FROM rhnChannelPackage CP
WHERE P.id = CP.package_id)
-ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END) || '-' || PA.label)
+ORDER BY nvre_upper
</query>
</mode>
@@ -956,6 +968,7 @@ ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN P
<query params="source_cid, target_cid">
SELECT DISTINCT P.id,
PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS PACKAGE_NVREA,
+ UPPER(PACKAGE_NVREA) as nvrea_upper,
P.summary
FROM rhnPackageName PN,
rhnPackageEVR PE,
@@ -977,7 +990,7 @@ SELECT DISTINCT P.id,
FROM rhnChannelPackage CP2
WHERE CP2.channel_id = C2.id
AND CP2.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVREA)
+ORDER BY nvrea_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -986,6 +999,7 @@ ORDER BY UPPER(PACKAGE_NVREA)
<query params="source_cid, target_cid">
SELECT DISTINCT P.id,
PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS PACKAGE_NVREA,
+ UPPER(PACKAGE_NVREA) as nvrea_upper,
P.summary
FROM rhnPackageName PN,
rhnPackageEVR PE,
@@ -1009,7 +1023,7 @@ SELECT DISTINCT P.id,
FROM rhnChannelPackage CP2
WHERE CP2.channel_id = C2.id
AND CP2.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVREA)
+ORDER BY nvrea_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -1018,6 +1032,7 @@ ORDER BY UPPER(PACKAGE_NVREA)
<query params="source_cid, target_cid">
SELECT DISTINCT P.id,
PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS PATCH_NVREA,
+ UPPER(PATCH_NVREA) as nvrea_upper,
P.summary
FROM rhnPackageName PN,
rhnPackageEVR PE,
@@ -1041,7 +1056,7 @@ SELECT DISTINCT P.id,
FROM rhnChannelPackage CP2
WHERE CP2.channel_id = C2.id
AND CP2.package_id = P.id)
-ORDER BY UPPER(PATCH_NVREA)
+ORDER BY nvrea_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -1049,7 +1064,8 @@ ORDER BY UPPER(PATCH_NVREA)
<mode name="unused_patches_available_to_channel">
<query params="org_id, cid">
SELECT DISTINCT P.id,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PATCH_NVREA
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PATCH_NVREA,
+ UPPER(PATCH_NVREA) as nvrea_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -1068,14 +1084,15 @@ ORDER BY UPPER(PATCH_NVREA)
AND NOT EXISTS (SELECT 1
FROM rhnChannelPackage CP
WHERE P.id = CP.package_id)
-ORDER BY UPPER(PATCH_NVREA)
+ORDER BY nvrea_upper
</query>
</mode>
<mode name="all_patches_available_to_channel">
<query params="org_id, cid">
SELECT DISTINCT P.id,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PATCH_NVREA
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PATCH_NVREA,
+ UPPER(PATCH_NVREA) as nvrea_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -1091,7 +1108,7 @@ ORDER BY UPPER(PATCH_NVREA)
AND C.id = :cid
AND CPAC.channel_arch_id = C.channel_arch_id
AND CPAC.package_arch_id = P.package_arch_id
-ORDER BY UPPER(PATCH_NVREA)
+ORDER BY nvrea_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -1100,6 +1117,7 @@ ORDER BY UPPER(PATCH_NVREA)
<query params="source_cid, target_cid">
SELECT DISTINCT P.id,
PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS PATCHSET_NVREA,
+ UPPER(PATCHSET_NVREA) as nvrea_upper,
P.summary
FROM rhnPackageName PN,
rhnPackageEVR PE,
@@ -1123,7 +1141,7 @@ SELECT DISTINCT P.id,
FROM rhnChannelPackage CP2
WHERE CP2.channel_id = C2.id
AND CP2.package_id = P.id)
-ORDER BY UPPER(PATCHSET_NVREA)
+ORDER BY nvrea_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -1131,7 +1149,8 @@ ORDER BY UPPER(PATCHSET_NVREA)
<mode name="unused_patchsets_available_to_channel">
<query params="org_id, cid">
SELECT DISTINCT P.id,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PATCHSET_NVREA
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PATCHSET_NVREA,
+ UPPER(PATCHSET_NVREA) as nvrea_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -1150,14 +1169,15 @@ ORDER BY UPPER(PATCHSET_NVREA)
AND NOT EXISTS (SELECT 1
FROM rhnChannelPackage CP
WHERE P.id = CP.package_id)
-ORDER BY UPPER(PATCHSET_NVREA)
+ORDER BY nvrea_upper
</query>
</mode>
<mode name="all_patchsets_available_to_channel">
<query params="org_id, cid">
SELECT DISTINCT P.id,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PATCHSET_NVREA
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PATCHSET_NVREA,
+ UPPER(PATCHSET_NVREA) as nvrea_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -1173,7 +1193,7 @@ ORDER BY UPPER(PATCHSET_NVREA)
AND C.id = :cid
AND CPAC.channel_arch_id = C.channel_arch_id
AND CPAC.package_arch_id = P.package_arch_id
-ORDER BY UPPER(PATCHSET_NVREA)
+ORDER BY nvrea_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -1181,7 +1201,8 @@ ORDER BY UPPER(PATCHSET_NVREA)
<mode name="unused_packages_available_to_channel">
<query params="org_id, cid">
SELECT DISTINCT P.id,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PACKAGE_NVREA
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PACKAGE_NVREA,
+ UPPER(PACKAGE_NVREA) as nvrea_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -1198,14 +1219,15 @@ ORDER BY UPPER(PATCHSET_NVREA)
AND NOT EXISTS (SELECT 1
FROM rhnChannelPackage CP
WHERE P.id = CP.package_id)
-ORDER BY UPPER(PACKAGE_NVREA)
+ORDER BY nvrea_upper
</query>
</mode>
<mode name="all_packages_available_to_channel">
<query params="org_id, cid">
SELECT DISTINCT P.id,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PACKAGE_NVREA
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PACKAGE_NVREA,
+ UPPER(PACKAGE_NVREA) as nvrea_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -1219,7 +1241,7 @@ ORDER BY UPPER(PACKAGE_NVREA)
AND C.id = :cid
AND CPAC.channel_arch_id = C.channel_arch_id
AND CPAC.package_arch_id = P.package_arch_id
-ORDER BY UPPER(PACKAGE_NVREA)
+ORDER BY nvrea_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -1227,7 +1249,8 @@ ORDER BY UPPER(PACKAGE_NVREA)
<mode name="unused_solaris_packages_available_to_channel">
<query params="org_id, cid">
SELECT DISTINCT P.id,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PACKAGE_NVREA
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PACKAGE_NVREA,
+ UPPER(PACKAGE_NVREA) as nvrea_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -1246,14 +1269,15 @@ ORDER BY UPPER(PACKAGE_NVREA)
AND NOT EXISTS (SELECT 1
FROM rhnChannelPackage CP
WHERE P.id = CP.package_id)
-ORDER BY UPPER(PACKAGE_NVREA)
+ORDER BY nvrea_upper
</query>
</mode>
<mode name="all_solaris_packages_available_to_channel">
<query params="org_id, cid">
SELECT DISTINCT P.id,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PACKAGE_NVREA
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' || PA.label PACKAGE_NVREA,
+ UPPER(PACKAGE_NVREA) as nvrea_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageArch PA,
@@ -1269,7 +1293,7 @@ ORDER BY UPPER(PACKAGE_NVREA)
AND C.id = :cid
AND CPAC.channel_arch_id = C.channel_arch_id
AND CPAC.package_arch_id = P.package_arch_id
-ORDER BY UPPER(PACKAGE_NVREA)
+ORDER BY nvrea_upper
</query>
<elaborator name="package_channels" />
</mode>
@@ -1563,14 +1587,14 @@ ORDER BY CHANNEL_NAME DESC, EVR DESC
<mode name="packages_associated_with_action">
<query params="aid">
-SELECT DISTINCT PN.id || '|' || PE.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE
+SELECT DISTINCT PN.id || '|' || PE.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE, UPPER(NVRE) AS nvre_upper
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnActionPackage AP
WHERE AP.action_id = :aid
AND PN.id = AP.name_id
AND PE.id = AP.evr_id
-ORDER BY UPPER(NVRE)
+ORDER BY nvre_upper
</query>
</mode>
commit ef84b2561ba2971efbd0d7a34da8e8de54e07c59
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Fri Oct 22 13:48:05 2010 +0200
Default cast fix for PostgreSQL
The default cast is now fixed properly according to
https://fedorahosted.org/spacewalk/wiki/PostgreSQLPortingGuide#Defaultcas...
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
index 979dfc7..3faf9b6 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
@@ -265,6 +265,13 @@ public class SystemOverview extends BaseDto implements Serializable {
return locked;
}
/**
+ * This overloaded method is for PostgreSQL compatibility reasons.
+ * @param lockedIn The locked to set.
+ */
+ public void setLocked(Integer lockedIn) {
+ setLocked(new Long(lockedIn));
+ }
+ /**
* @param lockedIn The locked to set.
*/
public void setLocked(Long lockedIn) {
@@ -288,6 +295,15 @@ public class SystemOverview extends BaseDto implements Serializable {
public Long getNoteCount() {
return noteCount;
}
+
+ /**
+ * This overloaded method is for PostgreSQL compatibility reasons.
+ * @param noteCountIn The noteCount to set.
+ */
+ public void setNoteCount(Integer noteCountIn) {
+ setNoteCount(new Long(noteCountIn));
+ }
+
/**
* @param noteCountIn The noteCount to set.
*/
diff --git a/schema/spacewalk/postgres/views/rhnServerOverview.sql b/schema/spacewalk/postgres/views/rhnServerOverview.sql
index acdb8a0..5b41836 100644
--- a/schema/spacewalk/postgres/views/rhnServerOverview.sql
+++ b/schema/spacewalk/postgres/views/rhnServerOverview.sql
@@ -43,7 +43,7 @@ rhnServerOverview
)
as
select
- s.org_id, s.id, s.name, cast(0 as bigint), s.modified,
+ s.org_id, s.id, s.name, 0, s.modified,
( select count(user_id) from rhnUserServerPerms ap
where server_id = s.id ),
( select count(server_group_id) from rhnVisibleServerGroupMembers
@@ -106,7 +106,7 @@ select
os,
release,
( select name from rhnServerArch where id = s.server_arch_id),
- cast(coalesce((select 1 from rhnServerLock SL WHERE SL.server_id = S.id), 0) as numeric)
+ coalesce((select 1 from rhnServerLock SL WHERE SL.server_id = S.id), 0)
from
rhnServer S
;
commit 728d6d8c82d77fc36de6caa238da372139f4745f
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Oct 21 15:35:32 2010 +0200
Use the { call ... } syntax instead of the direct PL/SQL.
For system deletion.
More info 73a318ccd254d4abd16ee40f2913dc183f652f8e
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 0c6eab5..a4c102f 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
@@ -1346,17 +1346,13 @@ SELECT S.id,
<callable-mode name="delete_server">
<query params="server_id">
-BEGIN
- delete_server(:server_id);
-END;
+ { call delete_server(:server_id) }
</query>
</callable-mode>
<callable-mode name="snapshot_server">
<query params="server_id, reason">
-BEGIN
- rhn_server.snapshot_server(:server_id, :reason);
-END;
+ { call rhn_server.snapshot_server(:server_id, :reason) }
</query>
</callable-mode>
13 years, 6 months
backend/server
by Jan Pazdziora
backend/server/importlib/backend.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2c5621e6478f1b4433eb41ac3692f36d80ed5a77
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 25 11:32:08 2010 +0200
Need to truncate the values upon select as well.
Addressing
(1460, 'ORA-01460: unimplemented or unreasonable conversion requested\n', 'select id from rhnPackageChangeLogData where name = :name and time = :time and text = :text')
in spacewalk-repo-sync.
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index 663825d..472d036 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -131,7 +131,7 @@ class Backend:
h = self.dbmodule.prepare(sql)
toinsert = [[], [], [], []]
for name, time, text in changelogHash.keys():
- h.execute(name=name, time=time, text=text)
+ h.execute(name=name[0:128], time=time, text=text[0:3000])
row = h.fetchone_dict()
if row:
changelogHash[(name, time, text)] = row['id']
13 years, 6 months
Changes to 'refs/tags/rhncfg-5.9.31-1'
by Jan Pazdziora
Tag 'rhncfg-5.9.31-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-25 09:07 +0000
Tagging package [rhncfg] version [5.9.31-1] in directory [client/tools/rhncfg/].
Changes since rhn-client-tools-1.2.10-1:
Jan Pazdziora (1):
Automatic commit of package [rhncfg] release [5.9.31-1].
---
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 6 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 71677dac33a57c76f7a671f4c6c58d229586f834
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 25 11:07:22 2010 +0200
Automatic commit of package [rhncfg] release [5.9.31-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 1d31d18..9624877 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.30
+Version: 5.9.31
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -99,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Oct 25 2010 Jan Pazdziora 5.9.31-1
+- 645795 - making script actions (within rhncfg) work with RHEL 4 by using
+ popen2 if subprocess is not available (jsherril(a)redhat.com)
+
* Fri Oct 22 2010 Jan Pazdziora 5.9.30-1
- 628920 - Fixed an rhcfg-manager-diff issue where files were not being
properly checked (paji(a)redhat.com)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 9c36e7c..81e9ee6 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.30-1 client/tools/rhncfg/
+5.9.31-1 client/tools/rhncfg/
13 years, 6 months
Changes to 'refs/tags/rhn-client-tools-1.2.10-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.2.10-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-25 09:06 +0000
Tagging package [rhn-client-tools] version [1.2.10-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-koan-0.2.13-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-client-tools] release [1.2.10-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 6 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 89b4d3779f1d128ecb6e5e5c8831da06a6ca667b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 25 11:06:46 2010 +0200
Automatic commit of package [rhn-client-tools] release [1.2.10-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 440d75e..ebbb264 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.2.9
+Version: 1.2.10
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -281,6 +281,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon Oct 25 2010 Jan Pazdziora 1.2.10-1
+- correct man page acording to reality (msuchy(a)redhat.com)
+
* Tue Oct 12 2010 Jan Pazdziora 1.2.9-1
- l10n: Updates to Panjabi (Punjabi) (pa) translation (jassy(a)fedoraproject.org)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 64d9d33..b0c2254 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.2.9-1 client/rhel/rhn-client-tools/
+1.2.10-1 client/rhel/rhn-client-tools/
13 years, 6 months
Changes to 'refs/tags/spacewalk-koan-0.2.13-1'
by Jan Pazdziora
Tag 'spacewalk-koan-0.2.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-25 09:06 +0000
Tagging package [spacewalk-koan] version [0.2.13-1] in directory [client/tools/spacewalk-koan/].
Changes since spacewalk-java-1.2.71-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-koan] release [0.2.13-1].
---
client/tools/spacewalk-koan/spacewalk-koan.spec | 7 ++++++-
rel-eng/packages/spacewalk-koan | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
13 years, 6 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/spacewalk-koan/spacewalk-koan.spec | 7 ++++++-
rel-eng/packages/spacewalk-koan | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 53f678ad8c51906ade888fdebe77f3d4c7a68bf2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 25 11:06:24 2010 +0200
Automatic commit of package [spacewalk-koan] release [0.2.13-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec
index 23e1d10..e02e68f 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -3,7 +3,7 @@ Name: spacewalk-koan
Group: System Environment/Kernel
License: GPLv2
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.2.12
+Version: 0.2.13
Release: 1%{?dist}
BuildArch : noarch
URL: https://fedorahosted.org/spacewalk
@@ -47,6 +47,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/rhn/actions/
%changelog
+* Mon Oct 25 2010 Jan Pazdziora 0.2.13-1
+- 645795 - changing spaceawlk-koan to use subproccess only if it is available
+ and to fall back to popen2 if its not, this enables RHEL 4 support again
+ (jsherril(a)redhat.com)
+
* Wed Oct 20 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.2.12-1
- must not provide & conflict with same (unversioned) package
diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan
index f76f314..1a391ed 100644
--- a/rel-eng/packages/spacewalk-koan
+++ b/rel-eng/packages/spacewalk-koan
@@ -1 +1 @@
-0.2.12-1 client/tools/spacewalk-koan/
+0.2.13-1 client/tools/spacewalk-koan/
13 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.2.71-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.2.71-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-25 09:05 +0000
Tagging package [spacewalk-java] version [1.2.71-1] in directory [java/].
Changes since spacewalk-schema-1.2.53-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.2.71-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 6 months