LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Integrating upstream r2113: Various Oracle specific corrections. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@681 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-01-13 07:49:02 +00:00
parent 4212763cc0
commit da4084cf66
6 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/sql/ccm-cms/default/upgrade/6.5.2-6.5.3/cms_task_url_generators_upgrade.sql
View File

@ -1,5 +1,5 @@
alter table cms_task_url_generators alter table cms_task_url_generators
add column content_type INTEGER; add content_type INTEGER;
alter table cms_task_url_generators alter table cms_task_url_generators
add constraint cms_tas_url_gen_con_ty_f_lz1y5 foreign key (content_type) add constraint cms_tas_url_gen_con_ty_f_lz1y5 foreign key (content_type)

1
ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.0-6.5.1.sql
View File

@ -23,7 +23,6 @@ PROMPT Red Hat Enterprise CMS 6.5.0 -> 6.5.1 Upgrade Script (Oracle)
@@ ../oracle-se/upgrade/6.5.0-6.5.1/drop-xml-index.sql @@ ../oracle-se/upgrade/6.5.0-6.5.1/drop-xml-index.sql
begin begin
ctx_ddl.drop_section_group('autogroup');
ctx_ddl.create_section_group('pathgroup', 'PATH_SECTION_GROUP'); ctx_ddl.create_section_group('pathgroup', 'PATH_SECTION_GROUP');
end; end;

6
ccm-core/sql/ccm-core/oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
View File

@ -26,13 +26,13 @@ CREATE TABLE cat_category_localizations (
category_id integer NOT NULL category_id integer NOT NULL
); );
ALTER TABLE ONLY cat_category_localizations ALTER TABLE cat_category_localizations
ADD CONSTRAINT cat_cate_localizati_id_p_ancqs PRIMARY KEY (id); ADD CONSTRAINT cat_cate_localizati_id_p_ancqs PRIMARY KEY (id);
ALTER TABLE ONLY cat_category_localizations ALTER TABLE cat_category_localizations
ADD CONSTRAINT cat_cat_localiz_cat_id_f_ykbad FOREIGN KEY (category_id) REFERENCES cat_categories(category_id); ADD CONSTRAINT cat_cat_localiz_cat_id_f_ykbad FOREIGN KEY (category_id) REFERENCES cat_categories(category_id);
ALTER TABLE ONLY cat_category_localizations ALTER TABLE cat_category_localizations
ADD CONSTRAINT cat_cate_localizati_id_f__leq0 FOREIGN KEY (id) REFERENCES acs_objects(object_id); ADD CONSTRAINT cat_cate_localizati_id_f__leq0 FOREIGN KEY (id) REFERENCES acs_objects(object_id);

16
ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql
View File

@ -20,11 +20,11 @@
PROMPT APLAWS ccm-forum 6.5.0 -> 6.5.1 Upgrade Script (Oracle) PROMPT APLAWS ccm-forum 6.5.0 -> 6.5.1 Upgrade Script (Oracle)
@@ ./oracle-se/6.5.0-6.5.1/add_privileges.sql @@ oracle-se/6.5.0-6.5.1/add_privileges.sql
@@ ./oracle-se/6.5.0-6.5.1/add_groups.sql @@ oracle-se/6.5.0-6.5.1/add_groups.sql
@@ ./oracle-se/6.5.0-6.5.1/add_thread_subscriber.sql @@ oracle-se/6.5.0-6.5.1/add_thread_subscriber.sql
@@ ./oracle-se/6.5.0-6.5.1/add_file_attachments.sql @@ oracle-se/6.5.0-6.5.1/add_file_attachments.sql
@@ ./oracle-se/6.5.0-6.5.1/add_forum_introduction.sql @@ oracle-se/6.5.0-6.5.1/add_forum_introduction.sql
@@ ./oracle-se/6.5.0-6.5.1/add_image_uploads.sql @@ oracle-se/6.5.0-6.5.1/add_image_uploads.sql
@@ ./oracle-se/6.5.0-6.5.1/add_forum_no_category_posts.sql @@ oracle-se/6.5.0-6.5.1/add_forum_no_category_posts.sql
@@ ./oracle-se/6.5.0-6.5.1/add_anonymous_option.sql @@ oracle-se/6.5.0-6.5.1/add_anonymous_option.sql

26
ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateContainerGroups.java
View File

@ -86,13 +86,27 @@ public class CreateContainerGroups extends Program {
if (workspaceGroup != null) { if (workspaceGroup != null) {
GroupCollection supergroups = workspaceGroup.getSupergroups(); GroupCollection supergroups = workspaceGroup.getSupergroups();
supergroups.addEqualsFilter(Group.ID, parentGroup.getID()); supergroups.addEqualsFilter(Group.ID, parentGroup.getID());
if (supergroups.size() == 0) {
s_log.info("moving group for " + workspace.getTitle()); boolean isEmpty = false;
System.out.println("moving group for " + workspace.getTitle()); try {
parentGroup.addSubgroup(workspaceGroup); supergroups.isEmpty();
} catch (com.redhat.persistence.metadata.MetadataException e) {
isEmpty = true;
}
if (isEmpty) { //XXX Exception thrown relating to this logic!
// com.redhat.persistence.metadata.MetadataException:
// com/arsdigita/kernel/Group.pdl: line 27, column 23:
// Query for: com.arsdigita.kernel.Group.name failed to
// return rows
s_log.info("moving group for " + workspace.getTitle());
System.out.println("moving group for " + workspace.getTitle());
parentGroup.addSubgroup(workspaceGroup);
} else { } else {
s_log.info("group for " + workspace.getTitle() + " is already child of workspace type group"); s_log.info("group for " + workspace.getTitle()
System.out.println("group for " + workspace.getTitle() + " is already child of workspace type group"); +" is already child of workspace type group");
System.out.println("group for " + workspace.getTitle()
+" is already child of workspace type group");
} }
} else { } else {
s_log.info("can't find group for " + workspace.getTitle()); s_log.info("can't find group for " + workspace.getTitle());

2
ccm-ldn-terms/sql/ccm-ldn-terms/oracle-se/upgrade/6.5.1-6.5.2/change-unique_id-to-varchar.sql
View File

@ -2,6 +2,6 @@ alter table trm_terms add (unique_id_string varchar(128) default 'UNKNOWN' not n
alter table trm_terms rename column unique_id to unique_id_old; alter table trm_terms rename column unique_id to unique_id_old;
alter table trm_terms rename column unique_id_string to unique_id; alter table trm_terms rename column unique_id_string to unique_id;
update trm_terms set unique_id = unique_id_old; update trm_terms set unique_id = unique_id_old;
alter table trm_terms drop constraint trm_ter_domai_uniqu_id_u_6sito; alter table trm_terms drop constraint trm_ter_domai_uniqu_id_u_6sito cascade drop index;
alter table trm_terms add constraint trm_ter_domai_uniqu_id_u_6sito unique(domain, unique_id); alter table trm_terms add constraint trm_ter_domai_uniqu_id_u_6sito unique(domain, unique_id);
alter table trm_terms drop column unique_id_old; alter table trm_terms drop column unique_id_old;