schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql
| 45 --
schema/spacewalk/oracle/packages/rhn_channel.pkb
| 4
schema/spacewalk/oracle/packages/rhn_channel.pks
| 97 -----
schema/spacewalk/oracle/procs/delete_server.sql
| 3
schema/spacewalk/oracle/procs/procs.deps
| 3
schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql
| 25 -
schema/spacewalk/postgres/packages/rhn_channel.pkb
| 1
schema/spacewalk/postgres/procs/delete_server.sql
| 1
schema/spacewalk/postgres/procs/procs.deps
| 3
schema/spacewalk/postgres/triggers/rhnSatelliteChannelFamily.sql
| 18 -
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql
| 3
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql
| 97 -----
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
| 165 ----------
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql
| 4
14 files changed, 4 insertions(+), 465 deletions(-)
New commits:
commit c4ee53cef24c8c10d5d879e35f171959834a816b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:34:06 2010 +0200
Clearing the ancient changelogs for rhn_channel.
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb
b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index 76064bc..096c001 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
CREATE OR REPLACE
PACKAGE BODY rhn_channel
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pks
b/schema/spacewalk/oracle/packages/rhn_channel.pks
index f0d4634..fc73c02 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pks
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pks
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
CREATE OR REPLACE
PACKAGE rhn_channel
@@ -147,97 +144,3 @@ IS
END rhn_channel;
/
SHOW ERRORS
-
---
--- Revision 1.37 2004/04/14 00:09:24 pjones
--- bugzilla: 120761 -- split rhnChannelPermissions into two tables, eliminating
--- a frequent full table scan
---
--- Revision 1.36 2004/03/26 18:11:32 rbb
--- Bugzilla: 114057
---
--- Add a script to determine channel priority.
---
--- Revision 1.35 2004/02/17 20:16:52 pjones
--- bugzilla: none -- add cvs tags into the package as long as we're touching
--- it anyway
---
--- Revision 1.34 2003/11/13 18:13:09 cturner
--- pragmas can now return now that rhn_user pragmas are fixed
---
--- Revision 1.32 2003/09/22 21:00:40 cturner
--- add method for easy acl check
---
--- Revision 1.31 2003/09/17 22:14:11 misa
--- bugzilla: 103639 Changes to allow me to move the base channel guess into plsql
---
--- Revision 1.30 2003/07/24 16:44:16 misa
--- bugzilla: none A function more usable on the rhnapp side
---
--- Revision 1.29 2003/07/24 14:00:17 misa
--- bugzilla: none PRAGMA RESTRICT_REFERENCES good
---
--- Revision 1.28 2003/07/23 21:59:19 cturner
--- rework how rhnUserChannel works; move to plsql for speed and maintenance
---
--- Revision 1.27 2003/07/21 17:49:12 pjones
--- bugzilla: none
---
--- add optional user for subscribe_server
---
--- Revision 1.26 2002/12/19 18:13:42 misa
--- Added caller with a default value
---
--- Revision 1.25 2002/12/11 22:18:46 pjones
--- rhnChannelNewestPackage
---
--- Revision 1.24 2002/11/21 22:08:11 pjones
--- make unsubscribe_channels have a "unsubscribe_children_in number := 0"
--- argument so that you can tell it to unsubscribe children.
---
--- Also, make it raise an exception instead of silent failure in the
--- other case.
---
--- Revision 1.23 2002/11/18 17:20:50 pjones
--- this should have gone back too
---
--- Revision 1.22 2002/11/13 23:16:18 pjones
--- lookup_*_arch()
---
--- Revision 1.21 2002/10/07 20:01:59 rnorwood
--- guess base channel for ssm and single system
---
--- Revision 1.20 2002/10/02 19:21:03 bretm
--- o 3rd party channel schema changes, no more clobs...
---
--- Revision 1.19 2002/09/20 19:21:58 bretm
--- o more 3rd party channel stuff...
---
--- Revision 1.18 2002/06/12 22:33:03 pjones
--- procedure bulk_guess_server_base_from(
--- set_label_in in varchar2,
--- set_uid_in in number,
--- channel_id_in in number);
---
--- for bretm
---
--- Revision 1.17 2002/06/12 22:12:25 pjones
--- procedure bulk_guess_server_base(
--- set_label_in in varchar2,
--- set_uid_in in number);
---
--- for bretm
---
--- Revision 1.16 2002/06/12 19:37:55 pjones
--- bulk_server_basechange_from(
--- set_label_in in varchar2,
--- set_uid_in in number,
--- old_channel_id_in in number,
--- new_channel_id_in in number
--- );
---
--- for bretm
---
--- Revision 1.15 2002/05/10 22:08:22 pjones
--- id/log
---
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql
index f0d4634..fc73c02 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/063-rhn_channel.sql
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
CREATE OR REPLACE
PACKAGE rhn_channel
@@ -147,97 +144,3 @@ IS
END rhn_channel;
/
SHOW ERRORS
-
---
--- Revision 1.37 2004/04/14 00:09:24 pjones
--- bugzilla: 120761 -- split rhnChannelPermissions into two tables, eliminating
--- a frequent full table scan
---
--- Revision 1.36 2004/03/26 18:11:32 rbb
--- Bugzilla: 114057
---
--- Add a script to determine channel priority.
---
--- Revision 1.35 2004/02/17 20:16:52 pjones
--- bugzilla: none -- add cvs tags into the package as long as we're touching
--- it anyway
---
--- Revision 1.34 2003/11/13 18:13:09 cturner
--- pragmas can now return now that rhn_user pragmas are fixed
---
--- Revision 1.32 2003/09/22 21:00:40 cturner
--- add method for easy acl check
---
--- Revision 1.31 2003/09/17 22:14:11 misa
--- bugzilla: 103639 Changes to allow me to move the base channel guess into plsql
---
--- Revision 1.30 2003/07/24 16:44:16 misa
--- bugzilla: none A function more usable on the rhnapp side
---
--- Revision 1.29 2003/07/24 14:00:17 misa
--- bugzilla: none PRAGMA RESTRICT_REFERENCES good
---
--- Revision 1.28 2003/07/23 21:59:19 cturner
--- rework how rhnUserChannel works; move to plsql for speed and maintenance
---
--- Revision 1.27 2003/07/21 17:49:12 pjones
--- bugzilla: none
---
--- add optional user for subscribe_server
---
--- Revision 1.26 2002/12/19 18:13:42 misa
--- Added caller with a default value
---
--- Revision 1.25 2002/12/11 22:18:46 pjones
--- rhnChannelNewestPackage
---
--- Revision 1.24 2002/11/21 22:08:11 pjones
--- make unsubscribe_channels have a "unsubscribe_children_in number := 0"
--- argument so that you can tell it to unsubscribe children.
---
--- Also, make it raise an exception instead of silent failure in the
--- other case.
---
--- Revision 1.23 2002/11/18 17:20:50 pjones
--- this should have gone back too
---
--- Revision 1.22 2002/11/13 23:16:18 pjones
--- lookup_*_arch()
---
--- Revision 1.21 2002/10/07 20:01:59 rnorwood
--- guess base channel for ssm and single system
---
--- Revision 1.20 2002/10/02 19:21:03 bretm
--- o 3rd party channel schema changes, no more clobs...
---
--- Revision 1.19 2002/09/20 19:21:58 bretm
--- o more 3rd party channel stuff...
---
--- Revision 1.18 2002/06/12 22:33:03 pjones
--- procedure bulk_guess_server_base_from(
--- set_label_in in varchar2,
--- set_uid_in in number,
--- channel_id_in in number);
---
--- for bretm
---
--- Revision 1.17 2002/06/12 22:12:25 pjones
--- procedure bulk_guess_server_base(
--- set_label_in in varchar2,
--- set_uid_in in number);
---
--- for bretm
---
--- Revision 1.16 2002/06/12 19:37:55 pjones
--- bulk_server_basechange_from(
--- set_label_in in varchar2,
--- set_uid_in in number,
--- old_channel_id_in in number,
--- new_channel_id_in in number
--- );
---
--- for bretm
---
--- Revision 1.15 2002/05/10 22:08:22 pjones
--- id/log
---
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
index b0a8b10..096c001 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
@@ -12,9 +12,6 @@
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
--
---
---
---
CREATE OR REPLACE
PACKAGE BODY rhn_channel
@@ -1216,164 +1213,3 @@ IS
END rhn_channel;
/
SHOW ERRORS
-
---
--- Revision 1.75 2005/03/04 00:04:19 jslagle
--- bz #147617
--- Made Red Hat Desktop sort a little better.
---
--- Revision 1.74 2005/02/22 03:24:47 jslagle
--- bz #147617
--- Improve channel_priority function to order channels better.
---
--- Revision 1.73 2004/08/16 20:39:30 pjones
--- bugzilla: 129889 -- make bulk_server_basechange_from() actually work.
---
--- Revision 1.72 2004/04/14 00:09:24 pjones
--- bugzilla: 120761 -- split rhnChannelPermissions into two tables, eliminating
--- a frequent full table scan
---
--- Revision 1.71 2004/04/13 16:28:36 bretm
--- bugzilla: 119871
---
--- keep track of rhnServer.channels_changed through the pl/sql fns
---
--- Revision 1.70 2004/03/26 18:11:32 rbb
--- Bugzilla: 114057
---
--- Add a script to determine channel priority.
---
--- Revision 1.69 2004/02/17 20:16:52 pjones
--- bugzilla: none -- add cvs tags into the package as long as we're touching
--- it anyway
---
--- Revision 1.68 2004/02/17 20:05:38 pjones
--- bugzilla: 115782 -- make bulk_server_basechange_from() filter out servers
--- with arches incompatible with the target channel
---
--- Revision 1.67 2004/02/06 02:36:10 misa
--- Changed normalize_server_arch to allow for solaris arches
---
--- Revision 1.66 2003/11/13 16:58:34 cturner
--- make use of new rhn_user.check_role_implied call; pragmas broke, removed them for now
since I have no idea how to fix them
---
--- Revision 1.65 2003/10/23 20:26:24 bretm
--- bugzilla: none
---
--- note the channel label when we unsubscribe, too
---
--- Revision 1.64 2003/10/15 14:47:17 bretm
--- bugzilla: none
---
--- add the channel label to the server history summary line when we log a channel change
---
--- Revision 1.63 2003/09/24 19:25:56 pjones
--- this wasn't the right fix, put it back
---
--- Revision 1.62 2003/09/24 17:42:19 pjones
--- bugzilla: none
---
--- limit our server base channel guess to channels with available permissions
---
--- Revision 1.61 2003/09/22 21:00:40 cturner
--- add method for easy acl check
---
--- Revision 1.60 2003/09/17 22:14:11 misa
--- bugzilla: 103639 Changes to allow me to move the base channel guess into plsql
---
--- Revision 1.59 2003/08/21 13:41:17 cturner
--- bugzilla: 99187. properly test for satellite and proxy in bulk_guess_server_base;
reorg code for better reuse
---
--- Revision 1.58 2003/07/24 16:46:22 cturner
--- bugzilla: 100723, the perm check was returning duplicates, so now it just calls the
function it should have called anyway
---
--- Revision 1.57 2003/07/24 16:44:16 misa
--- bugzilla: none A function more usable on the rhnapp side
---
--- Revision 1.56 2003/07/23 22:36:51 cturner
--- argh, max returns null even when now rows; use distinct. how revolting
---
--- Revision 1.55 2003/07/23 22:01:31 cturner
--- oops, this one can return multiple rows; eliminate that in a lazy way
---
--- Revision 1.54 2003/07/23 21:59:19 cturner
--- rework how rhnUserChannel works; move to plsql for speed and maintenance
---
--- Revision 1.53 2003/07/21 17:49:12 pjones
--- bugzilla: none
---
--- add optional user for subscribe_server
---
--- Revision 1.52 2003/07/14 22:19:29 misa
--- bugzilla: none Updating guess_base_channel to work more like the rhnapp server code
---
--- Revision 1.51 2003/06/26 22:09:04 pjones
--- bugzilla: none
---
--- log subscribe and unsubscribe
---
--- Revision 1.50 2003/06/05 19:31:15 pjones
--- bugzilla: 88278 -- make the cursor name smaller
---
--- Revision 1.49 2003/06/05 19:18:21 pjones
--- bugzilla: 88278
---
--- unsubscribe_server() opens the package-level cursor when it invokes itself,
--- so we're using a local copy instead.
---
--- Revision 1.48 2003/06/04 16:41:39 pjones
--- bugzilla: none
---
--- make bulk_guess_server_base() silently ignore unguessables
---
--- Revision 1.47 2003/06/04 16:27:03 pjones
--- bugzilla: 88822
---
--- eliminate the last outliers that remove things from channels without using
--- unsubscribe_server, I think.
---
--- Revision 1.46 2003/06/03 20:49:37 pjones
--- bugzilla: 88822
--- unsubscribing from rhn-satellite now clears rhnSatelliteChannelFamily
--- for the server in question
---
--- Revision 1.45 2003/06/02 20:41:45 pjones
--- bugzilla: none - fix rhnProxyInfo/rhnSatelliteInfo channel unsubscribe
--- problem. Basicly, if you're out of the channel for any reason, you're
--- also out of rhnProxyInfo/rhnProxyInfo
---
--- Revision 1.44 2003/03/24 15:26:28 pjones
--- bugzilla: 85812
---
--- bulk_server_base_change silently ignores servers that are satellites
--- or proxies, as requested.
---
--- Revision 1.43 2003/02/26 20:28:17 pjones
--- rhn_channel.update_family_counts() in rhn_channel.entitle_customer()
--- the old codepath is:
---
--- ep ->
--- rhn_ep.entitlement_run_me() ->
--- rhn_ep.poll_customer() ->
--- rhn_channel.entitle_customer()
---
--- which doesn't change current_members, even though it may remove servers
--- from the family.
---
--- There's another bug here: currently, we don't try to order forced
--- unsubscribes in any way; we just use
--- rhn_channel.unsubscribe_server_from_family . If there are any child
--- channel subscriptions, this will leave them subscribed. We really need
--- to iterate across the channels again, and subscribe any channel for which
--- there are no parent channel subscriptions.
---
--- Ugh.
---
--- Revision 1.42 2003/01/28 00:19:45 pjones
--- fix clear_subscriptions; AFAICT, this is only hit on the
--- bulk_server_base_change / bulk_server_base_guess codepaths, which puts
--- it infrequent enough that it could be our "bad count" culprit.
---
--- Revision 1.41 2003/01/14 19:51:45 pjones
--- make setting current_members on rhnChannelFamilyPermissions work when
--- a server is in more than one channel in a single family.
commit a5f54a14e92a5fa2d8dc2afd56bedcc03ebb863c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 29 14:28:48 2010 +0200
Removing rhnSatelliteChannelFamily as it is no longer referenced.
diff --git a/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql
b/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql
deleted file mode 100644
index dd523ac..0000000
--- a/schema/spacewalk/common/tables/rhnSatelliteChannelFamily.sql
+++ /dev/null
@@ -1,45 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
---
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-
-CREATE TABLE rhnSatelliteChannelFamily
-(
- server_id NUMBER NOT NULL
- CONSTRAINT rhn_sat_cf_sid_fk
- REFERENCES rhnServer (id),
- channel_family_id NUMBER NOT NULL
- CONSTRAINT rhn_sat_cf_cfid_fk
- REFERENCES rhnChannelFamily (id)
- ON DELETE CASCADE,
- quantity NUMBER,
- created DATE
- DEFAULT (sysdate) NOT NULL,
- modified DATE
- DEFAULT (sysdate) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
-CREATE INDEX rhn_sat_cf_sid_cfid_idx
- ON rhnSatelliteChannelFamily (server_id, channel_family_id)
- TABLESPACE [[2m_tbs]];
-
-CREATE INDEX rhn_sat_cf_cfid_idx
- ON rhnSatelliteChannelFamily (channel_family_id)
- TABLESPACE [[2m_tbs]];
-
-ALTER TABLE rhnSatelliteChannelFamily
- ADD CONSTRAINT rhn_sat_cf_sid_cfid_uq UNIQUE (server_id, channel_family_id);
-
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb
b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index 4270c67..76064bc 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -538,7 +538,6 @@ IS
for ignore in channel_family_is_satellite(channel_family_id_val) loop
delete from rhnSatelliteInfo where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
end loop;
for ignore in channel_family_is_proxy(channel_family_id_val) loop
diff --git a/schema/spacewalk/oracle/procs/delete_server.sql
b/schema/spacewalk/oracle/procs/delete_server.sql
index b9cdbae..c9abd56 100644
--- a/schema/spacewalk/oracle/procs/delete_server.sql
+++ b/schema/spacewalk/oracle/procs/delete_server.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--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
@@ -158,7 +158,6 @@ begin
delete from rhnProxyInfo where server_id = server_id_in;
delete from rhnRam where server_id = server_id_in;
delete from rhnRegToken where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
delete from rhnSatelliteInfo where server_id = server_id_in;
-- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
delete from rhnServerAction where server_id = server_id_in;
diff --git a/schema/spacewalk/oracle/procs/procs.deps
b/schema/spacewalk/oracle/procs/procs.deps
index b2f3ee8..ae75ee2 100644
--- a/schema/spacewalk/oracle/procs/procs.deps
+++ b/schema/spacewalk/oracle/procs/procs.deps
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--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
@@ -35,7 +35,6 @@ delete_server :: rhn_channel.pks rhn_config.pks \
rhnActionPackageRemovalFailure rhnCpu \
rhnDevice \
rhnProxyInfo rhnRam rhnRegToken \
- rhnSatelliteChannelFamily \
rhnSatelliteInfo rhnServerAction \
rhnServerAction rhnServerActionPackageResult \
rhnServerActionScriptResult rhnServerChannel \
diff --git a/schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql
b/schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql
deleted file mode 100644
index 50cc3bd..0000000
--- a/schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
---
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-create or replace trigger
-rhn_sat_cf_mod_trig
-before insert or update on rhnSatelliteChannelFamily
-for each row
-begin
- :new.modified := sysdate;
-end;
-/
-show errors
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb
b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index 306af77..f483af5 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -506,7 +506,6 @@ update pg_settings set setting = 'rhn_channel,' || setting
where name = 'search_
for ignore in channel_family_is_satellite(channel_family_id_val) loop
delete from rhnSatelliteInfo where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
end loop;
for ignore in channel_family_is_proxy(channel_family_id_val) loop
diff --git a/schema/spacewalk/postgres/procs/delete_server.sql
b/schema/spacewalk/postgres/procs/delete_server.sql
index 9c1b5c7..2c01408 100644
--- a/schema/spacewalk/postgres/procs/delete_server.sql
+++ b/schema/spacewalk/postgres/procs/delete_server.sql
@@ -158,7 +158,6 @@ begin
delete from rhnProxyInfo where server_id = server_id_in;
delete from rhnRam where server_id = server_id_in;
delete from rhnRegToken where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
delete from rhnSatelliteInfo where server_id = server_id_in;
-- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
delete from rhnServerAction where server_id = server_id_in;
diff --git a/schema/spacewalk/postgres/procs/procs.deps
b/schema/spacewalk/postgres/procs/procs.deps
index 9bd6db4..84aeead 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--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
@@ -35,7 +35,6 @@ delete_server :: rhn_channel.pks rhn_config.pks \
rhnActionPackageRemovalFailure rhnCpu \
rhnDevice \
rhnProxyInfo rhnRam rhnRegToken \
- rhnSatelliteChannelFamily \
rhnSatelliteInfo rhnServerAction \
rhnServerAction rhnServerActionPackageResult \
rhnServerActionScriptResult rhnServerChannel \
diff --git a/schema/spacewalk/postgres/triggers/rhnSatelliteChannelFamily.sql
b/schema/spacewalk/postgres/triggers/rhnSatelliteChannelFamily.sql
deleted file mode 100644
index 2da1541..0000000
--- a/schema/spacewalk/postgres/triggers/rhnSatelliteChannelFamily.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- oracle equivalent source sha1 248736eb9b98094c630afcc108f9ad63382d20a6
--- retrieved from
./1241102873/cdc6d42049bf86fbc9f1d3a5c54275eeacbd641d/schema/spacewalk/oracle/triggers/rhnSatelliteChannelFamily.sql
-create or replace function rhn_sat_cf_mod_trig_fun() returns trigger as
-$$
-begin
- new.modified := current_timestamp;
-
- return new;
-end;
-$$ language plpgsql;
-
-create trigger
-rhn_sat_cf_mod_trig
-before insert or update on rhnSatelliteChannelFamily
-for each row
-execute procedure rhn_sat_cf_mod_trig_fun();
-
-
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql
index b9cdbae..c9abd56 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--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
@@ -158,7 +158,6 @@ begin
delete from rhnProxyInfo where server_id = server_id_in;
delete from rhnRam where server_id = server_id_in;
delete from rhnRegToken where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
delete from rhnSatelliteInfo where server_id = server_id_in;
-- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
delete from rhnServerAction where server_id = server_id_in;
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
index 6df3c55..b0a8b10 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/065-rhn_channel-body.sql
@@ -538,7 +538,6 @@ IS
for ignore in channel_family_is_satellite(channel_family_id_val) loop
delete from rhnSatelliteInfo where server_id = server_id_in;
- delete from rhnSatelliteChannelFamily where server_id = server_id_in;
end loop;
for ignore in channel_family_is_proxy(channel_family_id_val) loop
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql
deleted file mode 100644
index ef204c1..0000000
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/247-rhnSatelliteChannelFamily-indexes.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE INDEX rhn_sat_cf_cfid_idx
- ON rhnSatelliteChannelFamily (channel_family_id)
- TABLESPACE [[2m_tbs]];
-drop index rhn_sat_cf_cfid_sid_idx;