2 commits - backend/spacewalk-backend.spec rel-eng/packages
by Devan Goodwin
backend/spacewalk-backend.spec | 10 +++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 021ab2fc788d9efe5ddcacd1c09e7afb4de22dd2
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Thu Aug 13 16:45:47 2009 -0300
Automatic commit of package [spacewalk-backend] release [0.7.1-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a5c19f2..8907f5e 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -580,6 +580,13 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Aug 13 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.7.1-1
+- Add spacewalk-backend Requires on python-pgsql. (dgoodwin(a)redhat.com)
+- 516237 - Fix the channel family population task to take into account None
+ counts and use 0 instead while computing the purge count.
+ (pkilambi(a)redhat.com)
+- bumping versions to 0.7.0 (jmatthew(a)redhat.com)
+
* Wed Aug 05 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.6.30-1
-
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index be33a60..fe89f4f 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.6.30-1 backend/
+0.7.1-1 backend/
commit e56e4e9dc2959c28553350533a6b2dcea92a73f7
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Thu Aug 13 16:43:51 2009 -0300
Add spacewalk-backend Requires on python-pgsql.
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 401c273..a5c19f2 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -17,6 +17,7 @@ Requires: python, rpm-python
# /etc/rhn is provided by spacewalk-proxy-common or by spacewalk-config
Requires: /etc/rhn
Requires: rhnlib >= 1.8
+Requires: python-pgsql
BuildRequires: /usr/bin/msgfmt
BuildRequires: /usr/bin/docbook2man
BuildRequires: docbook-utils
14 years, 9 months
Branch 'VADER' - java/code
by Jeff Ortel
java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ff46da02b53f59332282a1c0f9fd2b37e473949
Author: Jeff Ortel <jortel(a)redhat.com>
Date: Thu Aug 13 14:05:24 2009 -0500
494409 - Update TrustAction to removed shared subscriptions before removing trusts
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
index 81f37f5..acaef1c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
@@ -255,7 +255,6 @@ public class TrustAction extends FormDispatcher {
User orgUser = UserFactory.findRandomOrgAdmin(theOrg);
for (Org removed : getRemoved(theOrg, set)) {
- theOrg.removeTrust(removed);
User orgAdmin = UserFactory.findRandomOrgAdmin(removed);
DataResult<Map> dr =
SystemManager.subscribedInOrgTrust(theOrg.getId(), removed.getId());
@@ -284,6 +283,7 @@ public class TrustAction extends FormDispatcher {
ChannelFactory.save(channel);
SystemManager.unsubscribeServerFromChannel(orgUser, sid, cid);
}
+ theOrg.removeTrust(removed);
}
OrgFactory.save(theOrg);
14 years, 9 months
branding/spacewalk-branding.spec monitoring/spacewalk-monitoring monitoring/spacewalk-proxy-monitoring proxy/proxy-html schema/spacewalk selinux/spacewalk-monitoring-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux spacewalk/package spacewalk/setup utils/spacewalk-utils.spec
by John Matthews
branding/spacewalk-branding.spec | 2 +-
monitoring/spacewalk-monitoring/spacewalk-monitoring.spec | 2 +-
monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec | 2 +-
proxy/proxy-html/spacewalk-proxy-html.spec | 2 +-
schema/spacewalk/spacewalk-schema.spec | 2 +-
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 2 +-
selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 2 +-
spacewalk/package/spacewalk.spec | 2 +-
spacewalk/setup/spacewalk-setup.spec | 2 +-
utils/spacewalk-utils.spec | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 2d26e1117078c06b86ecb622cc9e232af0c4ae14
Author: John Matthews <jmatthew(a)redhat.com>
Date: Thu Aug 13 15:05:57 2009 -0400
bumping Version to 0.7.0
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index aade6ce..583d4a1 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 0.6.8
+Version: 0.7.0
Release: 1%{?dist}
Summary: Spacewalk branding data
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
index 8987976..47f32ec 100644
--- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
+++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec
@@ -8,7 +8,7 @@
Summary: Spacewalk monitoring
Name: spacewalk-monitoring
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.6.7
+Version: 0.7.0
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
License: GPLv2
diff --git a/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec b/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
index 6643146..1763f75 100644
--- a/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
+++ b/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
@@ -2,7 +2,7 @@
Summary: Meta-package that pulls in all of the Spacewalk monitoring packages
Name: spacewalk-proxy-monitoring
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.6.4
+Version: 0.7.0
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
License: GPLv2
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index 1f4c8d9..a217863 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.4.2
+Version: 0.7.0
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
BuildArch: noarch
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 962e6d6..0e21945 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: 0.6.21
+Version: 0.7.0
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
index 90e231a..15e8597 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
@@ -7,7 +7,7 @@
%define modulename spacewalk-monitoring
Name: spacewalk-monitoring-selinux
-Version: 0.6.13
+Version: 0.7.0
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk monitoring
diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
index d71e256..535a8dd 100644
--- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
+++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
@@ -7,7 +7,7 @@
%define modulename spacewalk-proxy
Name: spacewalk-proxy-selinux
-Version: 0.6.6
+Version: 0.7.0
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk Proxy
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index 7ce33b0..f2d6d1b 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux.spec
+++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec
@@ -7,7 +7,7 @@
%define modulename spacewalk
Name: spacewalk-selinux
-Version: 0.6.13
+Version: 0.7.0
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk Server
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 1b8c080..3b361b4 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,6 +1,6 @@
%define release_name Alpha
Name: spacewalk
-Version: 0.6.4
+Version: 0.7.0
Release: 1%{?dist}
Summary: Spacewalk Systems Management Application
URL: https://fedorahosted.org/spacewalk
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 6bdc6ac..2759b4c 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.6.20
+Version: 0.7.0
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index ea45320..16d2c8d 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 0.6.7
+Version: 0.7.0
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
14 years, 9 months
Changes to 'refs/tags/spacewalk-java-0.6.43-1'
by Pradeep Kilambi
Tag 'spacewalk-java-0.6.43-1' created by Pradeep Kilambi <pkilambi(a)redhat.com> at 2009-08-13 17:45 +0000
Tagging package [spacewalk-java] version [0.6.43-1] in directory [java/].
Changes since spacewalk-repo-0.6-5:
Pradeep Kilambi (2):
fixing the cloned channel creation to use the original channels checksum type and set to db. Once the cloned logic is converted from perl to java we can do this more nicely.
Automatic commit of package [spacewalk-java] release [0.6.43-1].
---
java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 15 ++++++++++
java/spacewalk-java.spec | 7 ++++
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 22 insertions(+), 2 deletions(-)
---
14 years, 9 months
Branch 'SPACEWALK-0.6' - java/spacewalk-java.spec rel-eng/packages
by Pradeep Kilambi
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit f4dbbca1746fbb5057058f873dbb857703d3a9ff
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Aug 13 13:45:41 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.43-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index eaab22c..3fda2a0 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.6.42
+Version: 0.6.43
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,11 @@ fi
%attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog
+* Thu Aug 13 2009 Pradeep Kilambi <pkilambi(a)redhat.com> 0.6.43-1
+- fixing the cloned channel creation to use the original channels checksum type
+ and set to db. Once the cloned logic is converted from perl to java we can do
+ this more nicely. (pkilambi(a)redhat.com)
+
* Fri Aug 07 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6.42-1
- adding reposync task to taskomatic config (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 089b5af..ee692cf 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.6.42-1 java/
+0.6.43-1 java/
14 years, 9 months
Branch 'SPACEWALK-0.6' - java/code
by Pradeep Kilambi
java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 15 ++++++++++
1 file changed, 15 insertions(+)
New commits:
commit 11e1848cb0274990d7b9eea378f95e2f635fd78a
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Aug 13 13:43:33 2009 -0400
fixing the cloned channel creation to use the original channels checksum type and set to db. Once the cloned logic is converted from perl to java we can do this more nicely.
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
index 8259495..35381db 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
@@ -14,6 +14,8 @@
*/
package com.redhat.rhn.domain.channel;
+import com.redhat.rhn.domain.common.ChecksumType;
+
/**
* ClonedChannel
* @version $Rev$
@@ -43,4 +45,17 @@ public class ClonedChannel extends Channel {
public boolean isCloned() {
return true;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ChecksumType getChecksum() {
+ if (super.getChecksum() == null) {
+ // if the checksum type is not set use the
+ //checksum of original channel instead.
+ setChecksum(getOriginal().getChecksum());
+ }
+ return super.getChecksum();
+ }
}
14 years, 9 months
java/code
by Pradeep Kilambi
java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 15 ++++++++++
1 file changed, 15 insertions(+)
New commits:
commit 1949d15abbc1dae321a1b54431602b89892c7f32
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Thu Aug 13 13:43:33 2009 -0400
fixing the cloned channel creation to use the original channels checksum type and set to db. Once the cloned logic is converted from perl to java we can do this more nicely.
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
index 8259495..35381db 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
@@ -14,6 +14,8 @@
*/
package com.redhat.rhn.domain.channel;
+import com.redhat.rhn.domain.common.ChecksumType;
+
/**
* ClonedChannel
* @version $Rev$
@@ -43,4 +45,17 @@ public class ClonedChannel extends Channel {
public boolean isCloned() {
return true;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public ChecksumType getChecksum() {
+ if (super.getChecksum() == null) {
+ // if the checksum type is not set use the
+ //checksum of original channel instead.
+ setChecksum(getOriginal().getChecksum());
+ }
+ return super.getChecksum();
+ }
}
14 years, 9 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 6233af8abb5271162389dde7c8d41016298137d6
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Aug 12 18:29:39 2009 -0400
509430 - fixing issue where the provisioning tab would ISE on 2.1 systems
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
index d2956b6..06cbd98 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
@@ -185,6 +185,11 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
Server server = cmd.getServer();
List<NetworkInterface> nics = new LinkedList<NetworkInterface>
(server.getNetworkInterfaces());
+
+ if (nics.isEmpty()) {
+ return;
+ }
+
for (Iterator<NetworkInterface> itr = nics.iterator(); itr.hasNext();) {
NetworkInterface nic = itr.next();
if (nic.isDisabled() || "127.0.0.1".equals(nic.getIpaddr())) {
14 years, 9 months
Branch 'VADER' - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 94ce5065a48f603b1356d4c5d10f68cc4021444d
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Aug 12 18:27:07 2009 -0400
509430 - fixing issue where the provisioning tab would ISE on 2.1 systems
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
index 498fbc2..c57c147 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
@@ -185,6 +185,11 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
Server server = cmd.getServer();
List<NetworkInterface> nics = new LinkedList<NetworkInterface>
(server.getNetworkInterfaces());
+
+ if (nics.isEmpty()) {
+ return;
+ }
+
for (Iterator<NetworkInterface> itr = nics.iterator(); itr.hasNext();) {
NetworkInterface nic = itr.next();
if (nic.isDisabled() || "127.0.0.1".equals(nic.getIpaddr())) {
14 years, 9 months
2 commits - schema/spacewalk
by Devan Goodwin
schema/spacewalk/common/tables/rhn_contact_group_members.sql | 6 ++--
schema/spacewalk/common/tables/rhn_ll_netsaint.sql | 2 -
schema/spacewalk/common/tables/rhn_probe_param_value.sql | 4 +-
schema/spacewalk/postgres/procs/rhn_prepare_install.sql | 2 -
schema/spacewalk/postgres/triggers/rhnFAQ.sql | 14 ----------
schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/001-numeric-12-columns.sql | 8 +++++
6 files changed, 15 insertions(+), 21 deletions(-)
New commits:
commit 4685b9e2225ba3c14f576fdf6a4cc980e74162d6
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Wed Aug 12 17:29:38 2009 -0300
Removing PostgreSQL rhnFAQ trigger, table no longer exists.
diff --git a/schema/spacewalk/postgres/triggers/rhnFAQ.sql b/schema/spacewalk/postgres/triggers/rhnFAQ.sql
deleted file mode 100644
index b9ee131..0000000
--- a/schema/spacewalk/postgres/triggers/rhnFAQ.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-create or replace function rhn_faq_mod_trig_fun() returns trigger as
-$$
-begin
- new.modified := current_timestamp;
-
- return new;
-end;
-$$ language plpgsql;
-
-create trigger
-rhn_faq_mod_trig
-before insert or update on rhnFaq
-for each row
-execute procedure rhn_faq_mod_trig_fun();
commit 9bfcee416f62ec342d249c51b8edc64d57b67ef6
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Wed Aug 12 11:29:03 2009 -0300
Fix numeric/smallint incompatible types in PostgreSQL.
Several columns use NUMERIC(12) in the common schema, which gets
translated to SMALLINT. Meanwhile other tables reference those columns
as foreign keys but are of type NUMERIC.
diff --git a/schema/spacewalk/common/tables/rhn_contact_group_members.sql b/schema/spacewalk/common/tables/rhn_contact_group_members.sql
index 25b67aa..952265b 100644
--- a/schema/spacewalk/common/tables/rhn_contact_group_members.sql
+++ b/schema/spacewalk/common/tables/rhn_contact_group_members.sql
@@ -16,16 +16,16 @@
CREATE TABLE rhn_contact_group_members
(
- contact_group_id NUMBER NOT NULL
+ contact_group_id NUMBER(12) NOT NULL
CONSTRAINT rhn_cntgm_cgid_fk
REFERENCES rhn_contact_groups (recid)
ON DELETE CASCADE,
order_number NUMBER NOT NULL,
- member_contact_method_id NUMBER
+ member_contact_method_id NUMBER(12)
CONSTRAINT rhn_cntgm_mcmid_fk
REFERENCES rhn_contact_methods (recid)
ON DELETE CASCADE,
- member_contact_group_id NUMBER
+ member_contact_group_id NUMBER(12)
CONSTRAINT rhn_cntgm_mcgid_fk
REFERENCES rhn_contact_groups (recid)
ON DELETE CASCADE,
diff --git a/schema/spacewalk/common/tables/rhn_ll_netsaint.sql b/schema/spacewalk/common/tables/rhn_ll_netsaint.sql
index eaf4553..eda6c67 100644
--- a/schema/spacewalk/common/tables/rhn_ll_netsaint.sql
+++ b/schema/spacewalk/common/tables/rhn_ll_netsaint.sql
@@ -16,7 +16,7 @@
CREATE TABLE rhn_ll_netsaint
(
- netsaint_id NUMBER NOT NULL,
+ netsaint_id NUMBER(12) NOT NULL,
city VARCHAR2(255)
)
ENABLE ROW MOVEMENT
diff --git a/schema/spacewalk/common/tables/rhn_probe_param_value.sql b/schema/spacewalk/common/tables/rhn_probe_param_value.sql
index e2f606b..ded05e1 100644
--- a/schema/spacewalk/common/tables/rhn_probe_param_value.sql
+++ b/schema/spacewalk/common/tables/rhn_probe_param_value.sql
@@ -16,8 +16,8 @@
CREATE TABLE rhn_probe_param_value
(
- probe_id NUMBER NOT NULL,
- command_id NUMBER NOT NULL,
+ probe_id NUMBER(12) NOT NULL,
+ command_id NUMBER(12) NOT NULL,
param_name VARCHAR2(40) NOT NULL,
value VARCHAR2(1024),
last_update_user VARCHAR2(40),
diff --git a/schema/spacewalk/postgres/procs/rhn_prepare_install.sql b/schema/spacewalk/postgres/procs/rhn_prepare_install.sql
index 05e51a6..5ebb34b 100644
--- a/schema/spacewalk/postgres/procs/rhn_prepare_install.sql
+++ b/schema/spacewalk/postgres/procs/rhn_prepare_install.sql
@@ -26,7 +26,7 @@ rhn_prepare_install
command_instance_id in out rhn_command_queue_instances.recid%type,
install_command in rhn_command_queue_instances.command_id%type
)
-returns numeric
+returns smallint
as $$
declare
/* ignore this command if it has not been run after five minutes */
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/001-numeric-12-columns.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/001-numeric-12-columns.sql
new file mode 100644
index 0000000..c5ec175
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/001-numeric-12-columns.sql
@@ -0,0 +1,8 @@
+-- Change columns to numeric 12 to match the columns of their foreign keys.
+alter table rhn_contact_group_members modify(contact_group_id NUMBER(12));
+alter table rhn_contact_group_members modify(member_contact_method_id NUMBER(12));
+alter table rhn_contact_group_members modify(member_contact_group_id NUMBER(12));
+alter table rhn_ll_netsaint modify(netsaint_id NUMBER(12));
+alter table rhn_probe_param_value modify(probe_id NUMBER(12));
+alter table rhn_probe_param_value modify(command_id NUMBER(12));
+
14 years, 9 months