inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

Browse Source 
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
2006-11-08 05:17:40 +00:00
parent 2c20af6d2b
commit b2f9df29d1
140 changed files with 20060 additions and 16456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-1.4-1.sql
View File

@@ -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

9
config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-1.4-2.sql
View File

@@ -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