mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should go together by tomorrow AM (for me) I'll dig back in. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
@@ -1,5 +1,5 @@
|
||||
-- ------------------------------------------------------
|
||||
-- Alfresco Schema conversion V1.3 to V1.4 Part 1
|
||||
-- Alfresco Schema conversion V1.3 to V1.4 Part 1 (MySQL)
|
||||
--
|
||||
-- Adds the columns required to enforce the duplicate name detection
|
||||
--
|
||||
@@ -25,6 +25,11 @@ DROP TABLE IF EXISTS T_permission;
|
||||
DROP TABLE IF EXISTS T_store;
|
||||
DROP TABLE IF EXISTS T_version_count;
|
||||
|
||||
--
|
||||
-- Upgrades to 1.3 of MyIsam tables could have missed the applied_patch table InnoDB
|
||||
--
|
||||
ALTER TABLE applied_patch ENGINE = InnoDB;
|
||||
|
||||
--
|
||||
-- Unique name constraint
|
||||
--
|
||||
@@ -47,20 +52,70 @@ ALTER TABLE node_assoc
|
||||
--
|
||||
-- Rename tables to give 'alf_' prefix
|
||||
--
|
||||
ALTER TABLE access_control_entry RENAME TO alf_access_control_entry;
|
||||
ALTER TABLE access_control_list RENAME TO alf_access_control_list;
|
||||
ALTER TABLE applied_patch RENAME TO alf_applied_patch;
|
||||
ALTER TABLE auth_ext_keys RENAME TO alf_auth_ext_keys;
|
||||
ALTER TABLE authority RENAME TO alf_authority;
|
||||
ALTER TABLE child_assoc RENAME TO alf_child_assoc;
|
||||
ALTER TABLE node RENAME TO alf_node;
|
||||
ALTER TABLE node_aspects RENAME TO alf_node_aspects;
|
||||
ALTER TABLE node_assoc RENAME TO alf_node_assoc;
|
||||
ALTER TABLE node_properties RENAME TO alf_node_properties;
|
||||
ALTER TABLE node_status RENAME TO alf_node_status;
|
||||
ALTER TABLE permission RENAME TO alf_permission;
|
||||
ALTER TABLE store RENAME TO alf_store;
|
||||
ALTER TABLE version_count RENAME TO alf_version_count;
|
||||
ALTER TABLE access_control_entry RENAME TO alf_access_control_entry;
|
||||
ALTER TABLE access_control_list RENAME TO alf_access_control_list;
|
||||
ALTER TABLE applied_patch RENAME TO alf_applied_patch;
|
||||
ALTER TABLE auth_ext_keys RENAME TO alf_auth_ext_keys;
|
||||
ALTER TABLE authority RENAME TO alf_authority;
|
||||
ALTER TABLE child_assoc RENAME TO alf_child_assoc;
|
||||
ALTER TABLE node RENAME TO alf_node;
|
||||
ALTER TABLE node_aspects RENAME TO alf_node_aspects;
|
||||
ALTER TABLE node_assoc RENAME TO alf_node_assoc;
|
||||
ALTER TABLE node_properties RENAME TO alf_node_properties;
|
||||
ALTER TABLE node_status RENAME TO alf_node_status;
|
||||
ALTER TABLE permission RENAME TO alf_permission;
|
||||
ALTER TABLE store RENAME TO alf_store;
|
||||
ALTER TABLE version_count RENAME TO alf_version_count;
|
||||
|
||||
--
|
||||
-- The table renames will cause Hibernate to rehash the FK constraint names.
|
||||
-- For MySQL, Hibernate will generate scripts to add the appropriate constraints
|
||||
-- and indexes.
|
||||
--
|
||||
ALTER TABLE alf_access_control_entry
|
||||
DROP FOREIGN KEY FKF064DF7560601995,
|
||||
DROP INDEX FKF064DF7560601995,
|
||||
DROP FOREIGN KEY FKF064DF75B25A50BF,
|
||||
DROP INDEX FKF064DF75B25A50BF,
|
||||
DROP FOREIGN KEY FKF064DF75B9553F6C,
|
||||
DROP INDEX FKF064DF75B9553F6C;
|
||||
ALTER TABLE alf_auth_ext_keys
|
||||
DROP FOREIGN KEY FK31D3BA097B7FDE43,
|
||||
DROP INDEX FK31D3BA097B7FDE43;
|
||||
ALTER TABLE alf_child_assoc
|
||||
DROP FOREIGN KEY FKC6EFFF3274173FF4,
|
||||
DROP INDEX FKC6EFFF3274173FF4,
|
||||
DROP FOREIGN KEY FKC6EFFF328E50E582,
|
||||
DROP INDEX FKC6EFFF328E50E582;(optional)
|
||||
ALTER TABLE alf_child_assoc
|
||||
DROP FOREIGN KEY FKFFC5468E74173FF4,
|
||||
DROP INDEX FKFFC5468E74173FF4,
|
||||
DROP FOREIGN KEY FKFFC5468E8E50E582,
|
||||
DROP INDEX FKFFC5468E8E50E582;(optional)
|
||||
ALTER TABLE alf_node
|
||||
DROP FOREIGN KEY FK33AE02B9553F6C,
|
||||
DROP INDEX FK33AE02B9553F6C;
|
||||
ALTER TABLE alf_node
|
||||
DROP FOREIGN KEY FK33AE02D24ADD25,
|
||||
DROP INDEX FK33AE02D24ADD25;
|
||||
ALTER TABLE alf_node_properties
|
||||
DROP FOREIGN KEY FKC962BF907F2C8017,
|
||||
DROP INDEX FKC962BF907F2C8017;
|
||||
ALTER TABLE alf_node_aspects
|
||||
DROP FOREIGN KEY FK2B91A9DE7F2C8017,
|
||||
DROP INDEX FK2B91A9DE7F2C8017;
|
||||
ALTER TABLE alf_node_assoc
|
||||
DROP FOREIGN KEY FK5BAEF398B69C43F3,
|
||||
DROP INDEX FK5BAEF398B69C43F3;
|
||||
ALTER TABLE alf_node_assoc
|
||||
DROP FOREIGN KEY FK5BAEF398A8FC7769,
|
||||
DROP INDEX FK5BAEF398A8FC7769;
|
||||
ALTER TABLE alf_node_status
|
||||
DROP FOREIGN KEY FK38ECB8CF7F2C8017,
|
||||
DROP INDEX FK38ECB8CF7F2C8017;
|
||||
ALTER TABLE alf_store
|
||||
DROP FOREIGN KEY FK68AF8E122DBA5BA,
|
||||
DROP INDEX FK68AF8E122DBA5BA;
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
-- ------------------------------------------------------
|
||||
-- Alfresco Schema conversion V1.3 to V1.4 Part 2
|
||||
-- Alfresco Schema conversion V1.3 to V1.4 Part 2 (MySQL)
|
||||
--
|
||||
-- Adds the alf_transaction and alf_server tables to keep track of the sources
|
||||
-- of transactions.
|
||||
@@ -25,7 +25,6 @@ CREATE TABLE alf_transaction (
|
||||
change_txn_id varchar(56) NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
KEY FKB8761A3A9AE340B7 (server_id),
|
||||
KEY IDX_CHANGE_TXN (change_txn_id),
|
||||
CONSTRAINT FKB8761A3A9AE340B7 FOREIGN KEY (server_id) REFERENCES alf_server (id)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
insert into alf_transaction
|
||||
@@ -44,7 +43,11 @@ UPDATE alf_node_status ns SET ns.transaction_id =
|
||||
);
|
||||
ALTER TABLE alf_node_status
|
||||
DROP COLUMN change_txn_id,
|
||||
ADD CONSTRAINT FK71C2002B9E57C13D FOREIGN KEY (transaction_id) REFERENCES alf_transaction (id);
|
||||
ADD CONSTRAINT FK71C2002B9E57C13D FOREIGN KEY (transaction_id) REFERENCES alf_transaction (id),
|
||||
ADD INDEX FK71C2002B9E57C13D (transaction_id);
|
||||
ALTER TABLE alf_node_status
|
||||
DROP COLUMN deleted
|
||||
;(optional)
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
-- ------------------------------------------------------
|
||||
-- Alfresco Schema conversion V1.3 to V1.4 Part 1 (Oracle)
|
||||
--
|
||||
-- Adds the columns required to enforce the duplicate name detection
|
||||
--
|
||||
-- Author: Derek Hulley
|
||||
-- ------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Unique name constraint
|
||||
--
|
||||
|
||||
-- Apply new schema changes to child assoc table
|
||||
ALTER TABLE child_assoc ADD
|
||||
(
|
||||
child_node_name VARCHAR2(50 CHAR) DEFAULT 'V1.4 upgrade' NOT NULL,
|
||||
child_node_name_crc NUMBER(19,0) DEFAULT -1 NOT NULL
|
||||
);
|
||||
|
||||
UPDATE child_assoc
|
||||
SET child_node_name_crc = id * -1;
|
||||
|
||||
CREATE UNIQUE INDEX IDX_CHILD_NAMECRC ON child_assoc (parent_node_id, type_qname, child_node_name, child_node_name_crc);
|
||||
|
||||
-- Apply unique index for node associations
|
||||
CREATE UNIQUE INDEX IDX_ASSOC ON node_assoc (source_node_id, type_qname, target_node_id);
|
||||
|
||||
--
|
||||
-- Rename tables to give 'alf_' prefix
|
||||
--
|
||||
ALTER TABLE access_control_entry RENAME TO alf_access_control_entry;
|
||||
ALTER TABLE access_control_list RENAME TO alf_access_control_list;
|
||||
ALTER TABLE applied_patch RENAME TO alf_applied_patch;
|
||||
ALTER TABLE auth_ext_keys RENAME TO alf_auth_ext_keys;
|
||||
ALTER TABLE authority RENAME TO alf_authority;
|
||||
ALTER TABLE child_assoc RENAME TO alf_child_assoc;
|
||||
ALTER TABLE node RENAME TO alf_node;
|
||||
ALTER TABLE node_aspects RENAME TO alf_node_aspects;
|
||||
ALTER TABLE node_assoc RENAME TO alf_node_assoc;
|
||||
ALTER TABLE node_properties RENAME TO alf_node_properties;
|
||||
ALTER TABLE node_status RENAME TO alf_node_status;
|
||||
ALTER TABLE permission RENAME TO alf_permission;
|
||||
ALTER TABLE store RENAME TO alf_store;
|
||||
ALTER TABLE version_count RENAME TO alf_version_count;
|
||||
|
||||
--
|
||||
-- The table renames will cause Hibernate to rehash the FK constraint names
|
||||
--
|
||||
ALTER TABLE alf_access_control_entry RENAME CONSTRAINT FKF064DF7560601995 TO FKFFF41F9960601995;
|
||||
ALTER TABLE alf_access_control_entry RENAME CONSTRAINT FKF064DF75B25A50BF TO FKFFF41F99B25A50BF;
|
||||
ALTER TABLE alf_access_control_entry RENAME CONSTRAINT FKF064DF75B9553F6C TO FKFFF41F99B9553F6C;
|
||||
ALTER TABLE alf_auth_ext_keys RENAME CONSTRAINT FK31D3BA097B7FDE43 TO FK8A749A657B7FDE43;
|
||||
ALTER TABLE alf_child_assoc RENAME CONSTRAINT FKC6EFFF3274173FF4 TO FKFFC5468E74173FF4;
|
||||
ALTER TABLE alf_child_assoc RENAME CONSTRAINT FKC6EFFF328E50E582 TO FKFFC5468E8E50E582;
|
||||
ALTER TABLE alf_node RENAME CONSTRAINT FK33AE02B9553F6C TO FK60EFB626B9553F6C;
|
||||
ALTER TABLE alf_node RENAME CONSTRAINT FK33AE02D24ADD25 TO FK60EFB626D24ADD25;
|
||||
ALTER TABLE alf_node_properties RENAME CONSTRAINT FKC962BF907F2C8017 TO FK7D4CF8EC7F2C8017;
|
||||
ALTER TABLE alf_node_aspects RENAME CONSTRAINT FK2B91A9DE7F2C8017 TO FKD654E027F2C8017;
|
||||
ALTER TABLE alf_node_assoc RENAME CONSTRAINT FK5BAEF398B69C43F3 TO FKE1A550BCB69C43F3;
|
||||
ALTER TABLE alf_node_assoc RENAME CONSTRAINT FK5BAEF398A8FC7769 TO FKE1A550BCA8FC7769;
|
||||
ALTER TABLE alf_node_status RENAME CONSTRAINT FK38ECB8CF7F2C8017 TO FK71C2002B7F2C8017;
|
||||
ALTER TABLE alf_store RENAME CONSTRAINT FK68AF8E122DBA5BA TO FKBD4FF53D22DBA5BA;
|
||||
|
||||
--
|
||||
-- Rename the indexes to keep in synch with the new table names. For Oracle, Hibernate doesn't create or add these
|
||||
--
|
||||
ALTER INDEX FKF064DF7560601995 RENAME TO FKFFF41F9960601995;
|
||||
ALTER INDEX FKF064DF75B25A50BF RENAME TO FKFFF41F99B25A50BF;
|
||||
ALTER INDEX FKF064DF75B9553F6C RENAME TO FKFFF41F99B9553F6C;
|
||||
ALTER INDEX FK31D3BA097B7FDE43 RENAME TO FK8A749A657B7FDE43;
|
||||
ALTER INDEX FKC6EFFF3274173FF4 RENAME TO FKFFC5468E74173FF4;
|
||||
ALTER INDEX FKC6EFFF328E50E582 RENAME TO FKFFC5468E8E50E582;
|
||||
ALTER INDEX FK33AE02B9553F6C RENAME TO FK60EFB626B9553F6C;
|
||||
ALTER INDEX FK33AE02D24ADD25 RENAME TO FK60EFB626D24ADD25;
|
||||
ALTER INDEX FKC962BF907F2C8017 RENAME TO FK7D4CF8EC7F2C8017;
|
||||
ALTER INDEX FK2B91A9DE7F2C8017 RENAME TO FKD654E027F2C8017;
|
||||
ALTER INDEX FK5BAEF398B69C43F3 RENAME TO FKE1A550BCB69C43F3;
|
||||
ALTER INDEX FK5BAEF398A8FC7769 RENAME TO FKE1A550BCA8FC7769;
|
||||
ALTER INDEX FK38ECB8CF7F2C8017 RENAME TO FK71C2002B7F2C8017;
|
||||
ALTER INDEX FK68AF8E122DBA5BA RENAME TO FKBD4FF53D22DBA5BA;
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
--
|
||||
delete from alf_applied_patch where id = 'patch.schemaUpdateScript-V1.4-1';
|
||||
insert into alf_applied_patch
|
||||
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
|
||||
values
|
||||
(
|
||||
'patch.schemaUpdateScript-V1.4-1', 'Manually execute script upgrade V1.4 part 1',
|
||||
0, 19, -1, 20, sysdate, 'UNKOWN', 1, 1, 'Script completed'
|
||||
);
|
||||
@@ -0,0 +1,69 @@
|
||||
-- ------------------------------------------------------
|
||||
-- Alfresco Schema conversion V1.3 to V1.4 Part 2 (Oracle)
|
||||
--
|
||||
-- Adds the alf_transaction and alf_server tables to keep track of the sources
|
||||
-- of transactions.
|
||||
--
|
||||
-- Author: Derek Hulley
|
||||
-- ------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Create server and transaction tables
|
||||
--
|
||||
|
||||
create table alf_server
|
||||
(
|
||||
id number(19,0) not null,
|
||||
ip_address varchar2(15 char) not null,
|
||||
primary key (id),
|
||||
unique (ip_address)
|
||||
);
|
||||
insert into alf_server (id, ip_address) values (0, '0.0.0.0');
|
||||
|
||||
create table alf_transaction
|
||||
(
|
||||
id number(19,0) not null,
|
||||
server_id number(19,0),
|
||||
change_txn_id varchar2(56 char) not null,
|
||||
primary key (id)
|
||||
);
|
||||
alter table alf_transaction add constraint FKB8761A3A9AE340B7 foreign key (server_id) references alf_server;
|
||||
create index FKB8761A3A9AE340B7 on alf_transaction (server_id);
|
||||
|
||||
insert into alf_transaction
|
||||
(
|
||||
id, server_id, change_txn_id
|
||||
)
|
||||
select
|
||||
hibernate_sequence.nextval,
|
||||
(select max(id) from alf_server),
|
||||
change_txn_id
|
||||
from alf_node_status;
|
||||
|
||||
-- Alter node status
|
||||
alter table alf_node_status add
|
||||
(
|
||||
transaction_id number(19,0) DEFAULT 0 NOT NULL
|
||||
);
|
||||
-- Update FK column
|
||||
update alf_node_status ns SET ns.transaction_id =
|
||||
(
|
||||
select t.id from alf_transaction t
|
||||
where t.change_txn_id = ns.change_txn_id and rownum = 1
|
||||
);
|
||||
alter table alf_node_status DROP COLUMN change_txn_id;
|
||||
alter table alf_node_status ADD CONSTRAINT FK71C2002B9E57C13D FOREIGN KEY (transaction_id) REFERENCES alf_transaction (id);
|
||||
create index FK71C2002B9E57C13D on alf_node_status (transaction_id);
|
||||
alter table alf_node_status DROP COLUMN deleted;(optional)
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
--
|
||||
delete from alf_applied_patch where id = 'patch.schemaUpdateScript-V1.4-2';
|
||||
insert into alf_applied_patch
|
||||
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
|
||||
values
|
||||
(
|
||||
'patch.schemaUpdateScript-V1.4-2', 'Manually execute script upgrade V1.4 part 2',
|
||||
0, 20, -1, 21, sysdate, 'UNKOWN', 1, 1, 'Script completed'
|
||||
);
|
||||
Reference in New Issue
Block a user