backend/server/importlib/importLib.py
| 1
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
| 12 +--
schema/spacewalk/common/views/views.deps
| 1
schema/spacewalk/oracle/triggers/rhnDistChannelMap.sql
| 25 ++++++++
schema/spacewalk/postgres/triggers/rhnDistChannelMap.sql
| 31 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnDistChannelMap-trigger.sql.oracle
| 10 +++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnDistChannelMap-trigger.sql.postgresql
| 17 +++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnOrgDistChannelMap-trigger.sql.oracle
| 10 ---
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnOrgDistChannelMap-trigger.sql.postgresql
| 17 -----
9 files changed, 91 insertions(+), 33 deletions(-)
New commits:
commit 594781171402e28f85cdcb9fe7e838e35288a505
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 31 12:18:02 2012 +0100
Use braces for accessing composite types in PG
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 5b48954..d3a48c0 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
@@ -838,14 +838,14 @@ ORDER BY UPPER(PN.name)
<mode name="system_upgradable_package_list_no_errata_info">
<query params="sid">
SELECT n.name,
- NVL(sp.evr.epoch, ' ') as from_epoch,
- NVL(sp.evr.version, ' ') as from_version,
- NVL(sp.evr.release, ' ') as from_release,
+ NVL((sp.evr).epoch, ' ') as from_epoch,
+ NVL((sp.evr).version, ' ') as from_version,
+ NVL((sp.evr).release, ' ') as from_release,
spa.label as from_arch,
spa.label as arch,
- NVL(up.evr.epoch, ' ') as to_epoch,
- NVL(up.evr.version, ' ') as to_version,
- NVL(up.evr.release, ' ') as to_release,
+ NVL((up.evr).epoch, ' ') as to_epoch,
+ NVL((up.evr).version, ' ') as to_version,
+ NVL((up.evr).release, ' ') as to_release,
up.arch_label as to_arch,
up.id as to_package_id
FROM
commit 48f00c99cfdcd5665b53e123dcf119804e4bc7cc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Oct 31 14:43:15 2012 +0100
add org_id to DistChannelMap backend class
diff --git a/backend/server/importlib/importLib.py
b/backend/server/importlib/importLib.py
index 15172fe..f4ff0e2 100644
--- a/backend/server/importlib/importLib.py
+++ b/backend/server/importlib/importLib.py
@@ -162,6 +162,7 @@ class DistChannelMap(Information):
'release' : StringType,
'channel_arch' : StringType,
'channel' : StringType,
+ 'org_id' : IntType,
}
class ReleaseChannelMap(Information):
commit f23e3f449ff80330cb3c19e574e6a67926f34d75
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Oct 31 11:18:01 2012 +0100
define rhnOrgDistChannelMap view dependency
diff --git a/schema/spacewalk/common/views/views.deps
b/schema/spacewalk/common/views/views.deps
index 24b97b2..1c4d2c5 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -51,6 +51,7 @@ rhnEntitledServers :: rhnServerGroup rhnServerGroupType \
rhnHWDevice :: rhnDevice
rhnOrgChannelTreeView :: rhnChannel rhnChannelFamilyMembers \
rhnOrgChannelFamilyPermissions
+rhnOrgDistChannelMap :: rhnDistChannelMap
rhnOrgErrata :: rhnChannelErrata rhnAvailableChannels
rhnPackageUpgradeArchCompat :: rhnPackageArch
rhnServerErrataTypeView :: rhnErrata rhnServerNeededErrataCache
commit b53ce2e9b6338270e2d61aa3314c585ccf6f6fdb
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Oct 31 11:17:39 2012 +0100
create rhnDistChannelMap triggers in the schema
not only as upgrade scripts
diff --git a/schema/spacewalk/oracle/triggers/rhnDistChannelMap.sql
b/schema/spacewalk/oracle/triggers/rhnDistChannelMap.sql
new file mode 100644
index 0000000..e8c1b6c
--- /dev/null
+++ b/schema/spacewalk/oracle/triggers/rhnDistChannelMap.sql
@@ -0,0 +1,25 @@
+--
+-- Copyright (c) 2008--2012 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_dist_channel_map_mod_trig
+before insert or update on rhnDistChannelMap
+for each row
+begin
+ if :new.id is null then
+ select rhn_dcm_id_seq.nextval into :new.id from dual;
+ end if;
+end;
+/
+show errors
diff --git a/schema/spacewalk/postgres/triggers/rhnDistChannelMap.sql
b/schema/spacewalk/postgres/triggers/rhnDistChannelMap.sql
new file mode 100644
index 0000000..155cd40
--- /dev/null
+++ b/schema/spacewalk/postgres/triggers/rhnDistChannelMap.sql
@@ -0,0 +1,31 @@
+-- oracle equivalent source sha1 ed850986dbbb185d146774b2a15c510343f1eef5
+--
+-- Copyright (c) 2008--2012 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 function rhn_dist_channel_map_mod_trig_fun() returns trigger as
+$$
+begin
+ if new.id is null then
+ new.id := nextval('rhn_rhn_dcm_id_seq');
+ end if;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_dist_channel_map_mod_trig
+before insert or update on rhnDistChannelMap
+for each row
+execute procedure rhn_dist_channel_map_mod_trig_fun();
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnDistChannelMap-trigger.sql.oracle
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnDistChannelMap-trigger.sql.oracle
new file mode 100644
index 0000000..dd3e140
--- /dev/null
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnDistChannelMap-trigger.sql.oracle
@@ -0,0 +1,10 @@
+create or replace trigger rhn_dist_channel_map_mod_trig
+before insert or update on rhnDistChannelMap
+for each row
+begin
+ if :new.id is null then
+ select rhn_dcm_id_seq.nextval into :new.id from dual;
+ end if;
+end;
+/
+show errors
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnDistChannelMap-trigger.sql.postgresql
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnDistChannelMap-trigger.sql.postgresql
new file mode 100644
index 0000000..fd93f7f
--- /dev/null
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnDistChannelMap-trigger.sql.postgresql
@@ -0,0 +1,17 @@
+-- oracle equivalent source sha1 52c0d465e922c0e887b6728e493e593c532e6398
+
+create or replace function rhn_dist_channel_map_mod_trig_fun() returns trigger as
+$$
+begin
+ if new.id is null then
+ new.id := nextval('rhn_rhn_dcm_id_seq');
+ end if;
+ return new;
+end;
+$$ language plpgsql;
+
+create trigger
+rhn_dist_channel_map_mod_trig
+before insert or update on rhnDistChannelMap
+for each row
+execute procedure rhn_dist_channel_map_mod_trig_fun();
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnOrgDistChannelMap-trigger.sql.oracle
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnOrgDistChannelMap-trigger.sql.oracle
deleted file mode 100644
index dd3e140..0000000
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnOrgDistChannelMap-trigger.sql.oracle
+++ /dev/null
@@ -1,10 +0,0 @@
-create or replace trigger rhn_dist_channel_map_mod_trig
-before insert or update on rhnDistChannelMap
-for each row
-begin
- if :new.id is null then
- select rhn_dcm_id_seq.nextval into :new.id from dual;
- end if;
-end;
-/
-show errors
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnOrgDistChannelMap-trigger.sql.postgresql
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnOrgDistChannelMap-trigger.sql.postgresql
deleted file mode 100644
index fd93f7f..0000000
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/148-rhnOrgDistChannelMap-trigger.sql.postgresql
+++ /dev/null
@@ -1,17 +0,0 @@
--- oracle equivalent source sha1 52c0d465e922c0e887b6728e493e593c532e6398
-
-create or replace function rhn_dist_channel_map_mod_trig_fun() returns trigger as
-$$
-begin
- if new.id is null then
- new.id := nextval('rhn_rhn_dcm_id_seq');
- end if;
- return new;
-end;
-$$ language plpgsql;
-
-create trigger
-rhn_dist_channel_map_mod_trig
-before insert or update on rhnDistChannelMap
-for each row
-execute procedure rhn_dist_channel_map_mod_trig_fun();