Merged V2.2 to HEAD

7629: QName Refactor Merge 6 of 9
   7630: QName Refactor Merge 7 of 9
   7631: QName Refactor Merge 8 of 9
   7632: QName Refactor Merge 9 of 9


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8438 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-06 19:11:36 +00:00
parent 00e81c0d66
commit d389ff1936
30 changed files with 805 additions and 746 deletions

View File

@@ -1,113 +0,0 @@
--
-- Title: Ensure that all expicit indexes are present
-- Database: Generic
-- Since: V2.1 Schema 64
-- Author: Derek Hulley
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- During an upgrade, explicit indexes are not added. This script ensures that
-- all explicit indexes that would be available after a clean boot are also
-- available for an upgrade.
-- JBPM
SELECT COUNT(*) FROM JBPM_ACTION;
CREATE INDEX IDX_ACTION_EVENT ON JBPM_ACTION (EVENT_);(optional)
CREATE INDEX IDX_ACTION_ACTNDL ON JBPM_ACTION (ACTIONDELEGATION_);(optional)
CREATE INDEX IDX_ACTION_PROCDF ON JBPM_ACTION (PROCESSDEFINITION_);(optional)
SELECT COUNT(*) FROM JBPM_COMMENT;
CREATE INDEX IDX_COMMENT_TOKEN ON JBPM_COMMENT (TOKEN_);(optional)
CREATE INDEX IDX_COMMENT_TSK ON JBPM_COMMENT (TASKINSTANCE_);(optional)
SELECT COUNT(*) FROM JBPM_DELEGATION;
CREATE INDEX IDX_DELEG_PRCD ON JBPM_DELEGATION (PROCESSDEFINITION_);(optional)
SELECT COUNT(*) FROM JBPM_JOB;
CREATE INDEX IDX_JOB_TSKINST ON JBPM_JOB (TASKINSTANCE_);(optional)
CREATE INDEX IDX_JOB_PRINST ON JBPM_JOB (PROCESSINSTANCE_);(optional)
CREATE INDEX IDX_JOB_TOKEN ON JBPM_JOB (TOKEN_);(optional)
SELECT COUNT(*) FROM JBPM_MODULEDEFINITION;
CREATE INDEX IDX_MODDEF_PROCDF ON JBPM_MODULEDEFINITION (PROCESSDEFINITION_);(optional)
SELECT COUNT(*) FROM JBPM_MODULEINSTANCE;
CREATE INDEX IDX_MODINST_PRINST ON JBPM_MODULEINSTANCE (PROCESSINSTANCE_);(optional)
SELECT COUNT(*) FROM JBPM_NODE;
CREATE INDEX IDX_PSTATE_SBPRCDEF ON JBPM_NODE (SUBPROCESSDEFINITION_);(optional)
CREATE INDEX IDX_NODE_SUPRSTATE ON JBPM_NODE (SUPERSTATE_);(optional)
CREATE INDEX IDX_NODE_PROCDEF ON JBPM_NODE (PROCESSDEFINITION_);(optional)
CREATE INDEX IDX_NODE_ACTION ON JBPM_NODE (ACTION_);(optional)
SELECT COUNT(*) FROM JBPM_POOLEDACTOR;
CREATE INDEX IDX_PLDACTR_ACTID ON JBPM_POOLEDACTOR (ACTORID_);(optional)
CREATE INDEX IDX_TSKINST_SWLANE ON JBPM_POOLEDACTOR (SWIMLANEINSTANCE_);(optional)
SELECT COUNT(*) FROM JBPM_PROCESSDEFINITION;
CREATE INDEX IDX_PROCDEF_STRTST ON JBPM_PROCESSDEFINITION (STARTSTATE_);(optional)
SELECT COUNT(*) FROM JBPM_PROCESSINSTANCE;
CREATE INDEX IDX_PROCIN_ROOTTK ON JBPM_PROCESSINSTANCE (ROOTTOKEN_);(optional)
CREATE INDEX IDX_PROCIN_SPROCTK ON JBPM_PROCESSINSTANCE (SUPERPROCESSTOKEN_);(optional)
CREATE INDEX IDX_PROCIN_PROCDEF ON JBPM_PROCESSINSTANCE (PROCESSDEFINITION_);(optional)
SELECT COUNT(*) FROM JBPM_RUNTIMEACTION;
CREATE INDEX IDX_RTACTN_PRCINST ON JBPM_RUNTIMEACTION (PROCESSINSTANCE_);(optional)
CREATE INDEX IDX_RTACTN_ACTION ON JBPM_RUNTIMEACTION (ACTION_);(optional)
SELECT COUNT(*) FROM JBPM_SWIMLANEINSTANCE;
CREATE INDEX IDX_SWIMLINST_SL ON JBPM_SWIMLANEINSTANCE (SWIMLANE_);(optional)
SELECT COUNT(*) FROM JBPM_TASK;
CREATE INDEX IDX_TASK_TSKNODE ON JBPM_TASK (TASKNODE_);(optional)
CREATE INDEX IDX_TASK_PROCDEF ON JBPM_TASK (PROCESSDEFINITION_);(optional)
CREATE INDEX IDX_TASK_TASKMGTDF ON JBPM_TASK (TASKMGMTDEFINITION_);(optional)
SELECT COUNT(*) FROM JBPM_TASKINSTANCE;
CREATE INDEX IDX_TASKINST_TOKN ON JBPM_TASKINSTANCE (TOKEN_);(optional)
CREATE INDEX IDX_TASKINST_TSK ON JBPM_TASKINSTANCE (TASK_, PROCINST_);(optional)
CREATE INDEX IDX_TSKINST_TMINST ON JBPM_TASKINSTANCE (TASKMGMTINSTANCE_);(optional)
CREATE INDEX IDX_TSKINST_SLINST ON JBPM_TASKINSTANCE (SWIMLANINSTANCE_);(optional)
CREATE INDEX IDX_TASK_ACTORID ON JBPM_TASKINSTANCE (ACTORID_);(optional)
SELECT COUNT(*) FROM JBPM_TOKEN;
CREATE INDEX IDX_TOKEN_PROCIN ON JBPM_TOKEN (PROCESSINSTANCE_);(optional)
CREATE INDEX IDX_TOKEN_SUBPI ON JBPM_TOKEN (SUBPROCESSINSTANCE_);(optional)
CREATE INDEX IDX_TOKEN_NODE ON JBPM_TOKEN (NODE_);(optional)
CREATE INDEX IDX_TOKEN_PARENT ON JBPM_TOKEN (PARENT_);(optional)
SELECT COUNT(*) FROM JBPM_TOKENVARIABLEMAP;
CREATE INDEX IDX_TKVARMAP_CTXT ON JBPM_TOKENVARIABLEMAP (CONTEXTINSTANCE_);(optional)
CREATE INDEX IDX_TKVVARMP_TOKEN ON JBPM_TOKENVARIABLEMAP (TOKEN_);(optional)
SELECT COUNT(*) FROM JBPM_TRANSITION;
CREATE INDEX IDX_TRANSIT_TO ON JBPM_TRANSITION (TO_);(optional)
CREATE INDEX IDX_TRANSIT_FROM ON JBPM_TRANSITION (FROM_);(optional)
CREATE INDEX IDX_TRANS_PROCDEF ON JBPM_TRANSITION (PROCESSDEFINITION_);(optional)
SELECT COUNT(*) FROM JBPM_VARIABLEINSTANCE;
CREATE INDEX IDX_VARINST_TKVARMP ON JBPM_VARIABLEINSTANCE (TOKENVARIABLEMAP_);(optional)
CREATE INDEX IDX_VARINST_PRCINS ON JBPM_VARIABLEINSTANCE (PROCESSINSTANCE_);(optional)
CREATE INDEX IDX_VARINST_TK ON JBPM_VARIABLEINSTANCE (TOKEN_);(optional)
SELECT COUNT(*) FROM alf_audit_date;
CREATE INDEX adt_q_idx ON alf_audit_date (quarter);(optional)
CREATE INDEX adt_dow_idx ON alf_audit_date (day_of_week);(optional)
CREATE INDEX adt_date_idx ON alf_audit_date (date_only);(optional)
CREATE INDEX adt_y_idx ON alf_audit_date (year);(optional)
CREATE INDEX adt_hy_idx ON alf_audit_date (halfYear);(optional)
CREATE INDEX adt_wom_idx ON alf_audit_date (week_of_month);(optional)
CREATE INDEX adt_dom_idx ON alf_audit_date (day_of_month);(optional)
CREATE INDEX adt_m_idx ON alf_audit_date (month);(optional)
CREATE INDEX adt_doy_idx ON alf_audit_date (day_of_year);(optional)
CREATE INDEX adt_woy_idx ON alf_audit_date (week_of_year);(optional)
SELECT COUNT(*) FROM alf_audit_fact;
CREATE INDEX adt_user_idx ON alf_audit_fact (user_id);(optional)
CREATE INDEX adt_store_idx ON alf_audit_fact (store_protocol, store_id, node_uuid);(optional)
SELECT COUNT(*) FROM alf_audit_source;
CREATE INDEX app_source_met_idx ON alf_audit_source (method);(optional)
CREATE INDEX app_source_app_idx ON alf_audit_source (application);(optional)
CREATE INDEX app_source_ser_idx ON alf_audit_source (service);(optional)
SELECT COUNT(*) FROM avm_node_properties;
CREATE INDEX idx_avm_np_name ON avm_node_properties (qname);(optional)
SELECT COUNT(*) FROM avm_store_properties;
CREATE INDEX idx_avm_sp_name ON avm_store_properties (qname);(optional)
SELECT COUNT(*) FROM avm_version_roots;
CREATE INDEX idx_avm_vr_version ON avm_version_roots (version_id);(optional)
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.1-ExplicitIndexes';
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.db-V2.1-ExplicitIndexes', 'Manually executed script upgrade V2.1: Ensure existence of V2.1 Explicit indexes',
0, 63, -1, 64, null, 'UNKOWN', 1, 1, 'Script completed'
);

View File

@@ -1,115 +0,0 @@
--
-- Title: Ensure that all Foreign Key indexes are present
-- Database: Generic
-- Since: V2.1 Schema 64
-- Author: Derek Hulley
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- All dialects, with the exception of MySQL, will not have FK-related indexes
-- automatically generated by Hibernate. Quite a few indexes here will be present
-- in the database already, but the list depends on the particular upgrade path
-- taken. In order to reduce the number of scripts that need to be run to cater for
-- these diverse scenarios, this script just attempts to create each and every
-- index that would be created for a new install. The statements are optional, apart
-- from the control statements to check for the presence of the required tables.
-- JBPM
-- JBPM tables have explicit indexes where required. Adding FK indexes here
-- leads to duplication, and on MySQL, this is exactly what happens.
-- Repository
SELECT COUNT(*) FROM alf_access_control_entry;
CREATE INDEX FKFFF41F9960601995 ON alf_access_control_entry (permission_id);(optional)
CREATE INDEX FKFFF41F99B25A50BF ON alf_access_control_entry (authority_id);(optional)
CREATE INDEX FKFFF41F99B9553F6C ON alf_access_control_entry (acl_id);(optional)
SELECT COUNT(*) FROM alf_auth_ext_keys;
CREATE INDEX FK8A749A657B7FDE43 ON alf_auth_ext_keys (id);(optional)
SELECT COUNT(*) FROM alf_child_assoc;
CREATE INDEX FKFFC5468E74173FF4 ON alf_child_assoc (child_node_id);(optional)
CREATE INDEX FKFFC5468E8E50E582 ON alf_child_assoc (parent_node_id);(optional)
SELECT COUNT(*) FROM alf_node;
CREATE INDEX FK60EFB626B9553F6C ON alf_node (acl_id);(optional)
CREATE INDEX FK60EFB626D24ADD25 ON alf_node (protocol, identifier);(optional)
SELECT COUNT(*) FROM alf_node_properties;
CREATE INDEX FK7D4CF8EC7F2C8017 ON alf_node_properties (node_id);(optional)
CREATE INDEX FK7D4CF8EC40E780DC ON alf_node_properties (attribute_value);(optional)
SELECT COUNT(*) FROM alf_node_aspects;
CREATE INDEX FKD654E027F2C8017 ON alf_node_aspects (node_id);(optional)
SELECT COUNT(*) FROM alf_node_assoc;
CREATE INDEX FKE1A550BCB69C43F3 ON alf_node_assoc (source_node_id);(optional)
CREATE INDEX FKE1A550BCA8FC7769 ON alf_node_assoc (target_node_id);(optional)
SELECT COUNT(*) FROM alf_node_status;
CREATE INDEX FK71C2002B7F2C8017 ON alf_node_status (node_id);(optional)
SELECT COUNT(*) FROM alf_store;
CREATE INDEX FKBD4FF53D22DBA5BA ON alf_store (root_node_id);(optional)
--
-- Transaction tables
--
CREATE INDEX FK71C2002B9E57C13D ON alf_node_status (transaction_id);(optional)
SELECT COUNT(*) FROM alf_transaction;
CREATE INDEX FKB8761A3A9AE340B7 ON alf_transaction (server_id);(optional)
--
-- Audit tables
--
SELECT COUNT(*) FROM alf_audit_fact;
CREATE INDEX FKEAD1817484342E39 ON alf_audit_fact (audit_date_id);(optional)
CREATE INDEX FKEAD18174A0F9B8D9 ON alf_audit_fact (audit_source_id);(optional)
CREATE INDEX FKEAD18174F524CFD7 ON alf_audit_fact (audit_conf_id);(optional)
--
-- Attribute tables
--
SELECT COUNT(*) FROM alf_attributes;
CREATE INDEX fk_attr_n_acl ON alf_attributes (acl_id);(optional)
SELECT COUNT(*) FROM alf_global_attributes;
CREATE INDEX FK64D0B9CF69B9F16A ON alf_global_attributes (attribute);(optional)
SELECT COUNT(*) FROM alf_list_attribute_entries;
CREATE INDEX FKC7D52FB0ACD8822C ON alf_list_attribute_entries (list_id);(optional)
CREATE INDEX FKC7D52FB02C5AB86C ON alf_list_attribute_entries (attribute_id);(optional)
SELECT COUNT(*) FROM alf_map_attribute_entries;
CREATE INDEX FK335CAE262C5AB86C ON alf_map_attribute_entries (attribute_id);(optional)
CREATE INDEX FK335CAE26AEAC208C ON alf_map_attribute_entries (map_id);(optional)
-- AVM
SELECT COUNT(*) FROM avm_aspects;
CREATE INDEX fk_avm_asp_node ON avm_aspects (node_id);(optional)
SELECT COUNT(*) FROM avm_aspects_new;
CREATE INDEX FKD3FD9F95EDCD4A96 ON avm_aspects_new (id);(optional)
SELECT COUNT(*) FROM avm_child_entries;
CREATE INDEX fk_avm_ce_child ON avm_child_entries (child_id);(optional)
CREATE INDEX fk_avm_ce_parent ON avm_child_entries (parent_id);(optional)
SELECT COUNT(*) FROM avm_history_links;
CREATE INDEX fk_avm_hl_desc ON avm_history_links (descendent);(optional)
CREATE INDEX fk_avm_hl_ancestor ON avm_history_links (ancestor);(optional)
SELECT COUNT(*) FROM avm_merge_links;
CREATE INDEX fk_avm_ml_from ON avm_merge_links (mfrom);(optional)
CREATE INDEX fk_avm_ml_to ON avm_merge_links (mto);(optional)
SELECT COUNT(*) FROM avm_node_properties_new;
CREATE INDEX FK44A37C8A6BD529F3 ON avm_node_properties_new (node_id);(optional)
CREATE INDEX fk_avm_np_node ON avm_node_properties (node_id);(optional)
SELECT COUNT(*) FROM avm_nodes;
CREATE INDEX fk_avm_n_acl ON avm_nodes (acl_id);(optional)
CREATE INDEX fk_avm_n_store ON avm_nodes (store_new_id);(optional)
SELECT COUNT(*) FROM avm_store_properties;
CREATE INDEX fk_avm_sp_store ON avm_store_properties (avm_store_id);(optional)
SELECT COUNT(*) FROM avm_stores;
CREATE INDEX fk_avm_s_root ON avm_stores (current_root_id);(optional)
SELECT COUNT(*) FROM avm_version_roots;
CREATE INDEX fk_avm_vr_store ON avm_version_roots (avm_store_id);(optional)
CREATE INDEX fk_avm_vr_root ON avm_version_roots (root_id);(optional)
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.1-FKIndexes';
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.db-V2.1-FKIndexes', 'Manually executed script upgrade V2.1: Ensure existence of V2.1 FK indexes',
0, 63, -1, 64, null, 'UNKOWN', 1, 1, 'Script completed'
);

View File

@@ -9,10 +9,22 @@
-- This removes the wcmwf:submitted aspect along with the wcmwf:workflowInstanceId property
-- from the AVM nodes
DELETE FROM avm_aspects WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}submitted';
DELETE FROM avm_aspects_new WHERE name = '{http://www.alfresco.org/model/wcmworkflow/1.0}submitted';
DELETE FROM avm_node_properties WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}workflowInstanceId';
DELETE FROM avm_node_properties_new WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}workflowInstanceId';
DELETE FROM avm_aspects
WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}submitted';
DELETE FROM avm_aspects_new WHERE EXISTS
(
SELECT q.id FROM alf_qname q
JOIN alf_namespace n ON (q.ns_id = n.id)
WHERE n.uri = 'http://www.alfresco.org/model/wcmworkflow/1.0' and q.local_name = 'submitted' AND q.id = avm_aspects_new.qname_id
);
DELETE FROM avm_node_properties
WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}workflowInstanceId';
DELETE FROM avm_node_properties_new WHERE EXISTS
(
SELECT q.id FROM alf_qname q
JOIN alf_namespace n ON (q.ns_id = n.id)
WHERE n.uri = 'http://www.alfresco.org/model/wcmworkflow/1.0' and q.local_name = 'workflowInstanceId' AND q.id = avm_node_properties_new.qname_id
);
--
-- Record script finish