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

config/alfresco/bootstrap-context.xml

@@ -35,8 +35,8 @@
        </property>
        <property name="postCreateScriptUrls">
           <list>
-             <value>classpath:alfresco/dbscripts/create/2.1/${db.script.dialect}/AlfrescoPostCreate-2.1-FKIndexes.sql</value>
-             <value>classpath:alfresco/dbscripts/create/2.2/${db.script.dialect}/AlfrescoPostCreate-2.2-Constraints.sql</value>
+             <value>classpath:alfresco/dbscripts/create/2.2/${db.script.dialect}/AlfrescoPostCreate-2.2-MappedFKIndexes.sql</value>
+             <value>classpath:alfresco/dbscripts/create/2.2/${db.script.dialect}/AlfrescoPostCreate-2.2-Extra.sql</value>
           </list>
        </property>
        <property name="validateUpdateScriptPatches">
@@ -49,14 +49,16 @@
              <ref bean="patch.schemaUpdateScript-V1.4-2" />
              <ref bean="patch.db-V2.1-NotNullColumns" />
              <ref bean="patch.db-V2.2-ACL" />
+             <ref bean="patch.db-V2.2-QNames-0-CreateMissingTables" />
+             <ref bean="patch.db-V2.2-QNames-1-DropIndexesAndConstraints" />
+             <ref bean="patch.db-V2.2-QNames-2-MoveQNames" />
+             <ref bean="patch.db-V2.2-QNames-3-PropTypes" />
           </list>
        </property>
        <property name="postUpdateScriptPatches">
           <list>
+             <ref bean="patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints" />
              <ref bean="patch.db-V1.4-TxnCommitTimeIndex" />
-             <ref bean="patch.db-V2.1-FKIndexes" />
-             <ref bean="patch.db-V2.1-ExplicitIndexes" />
-             <ref bean="patch.db-V1.4-PerfIndexes02" />
              <ref bean="patch.db-V2.1-JBPMData" />
              <ref bean="patch.db-V2.1-VersionColumns2" />
              <ref bean="patch.db-V2.1-JBPMProcessKey" />

config/alfresco/dbscripts/create/2.1/org.hibernate.dialect.Dialect/AlfrescoPostCreate-2.1-FKIndexes.sql

@@ -1,70 +0,0 @@
---
--- Title:      Post-Create Foreign Key indexes
--- Database:   Generic
--- Since:      V2.0 Schema 63
--- Author:     Derek Hulley
---
--- Please contact support@alfresco.com if you need assistance with the upgrade.
---
-
--- JBPM
---   JBPM tables have explicit indexes where required.  Adding FK indexes here
---   leads to duplication, and on MySQL, this is exactly what happens.
-
--- Repository
-CREATE INDEX FKFFF41F9960601995 ON alf_access_control_entry (permission_id);
-CREATE INDEX FKFFF41F99B25A50BF ON alf_access_control_entry (authority_id);
-CREATE INDEX FKFFF41F99B9553F6C ON alf_access_control_entry (acl_id);
-CREATE INDEX FK8A749A657B7FDE43 ON alf_auth_ext_keys (id);
-CREATE INDEX FKFFC5468E74173FF4 ON alf_child_assoc (child_node_id);
-CREATE INDEX FKFFC5468E8E50E582 ON alf_child_assoc (parent_node_id);
-CREATE INDEX FK60EFB626B9553F6C ON alf_node (acl_id);
-CREATE INDEX FK60EFB626D24ADD25 ON alf_node (protocol, identifier);
-CREATE INDEX FK7D4CF8EC7F2C8017 ON alf_node_properties (node_id);
-CREATE INDEX FK7D4CF8EC40E780DC ON alf_node_properties (attribute_value);
-CREATE INDEX FKD654E027F2C8017  ON alf_node_aspects (node_id);
-CREATE INDEX FKE1A550BCB69C43F3 ON alf_node_assoc (source_node_id);
-CREATE INDEX FKE1A550BCA8FC7769 ON alf_node_assoc (target_node_id);
-CREATE INDEX FK71C2002B7F2C8017 ON alf_node_status (node_id);
-CREATE INDEX FKBD4FF53D22DBA5BA ON alf_store (root_node_id);
-
---
--- Transaction tables
---
-CREATE INDEX FK71C2002B9E57C13D ON alf_node_status (transaction_id);
-CREATE INDEX FKB8761A3A9AE340B7 ON alf_transaction (server_id);
-
---
--- Audit tables
---
-CREATE INDEX FKEAD1817484342E39 ON alf_audit_fact (audit_date_id);
-CREATE INDEX FKEAD18174A0F9B8D9 ON alf_audit_fact (audit_source_id);
-CREATE INDEX FKEAD18174F524CFD7 ON alf_audit_fact (audit_conf_id);
-
---
--- Attribute tables
---
-CREATE INDEX fk_attr_n_acl      ON alf_attributes (acl_id);
---CREATE INDEX FK64D0B9CF69B9F16A ON alf_global_attributes (attribute);  This is auto-indexed
-CREATE INDEX FKC7D52FB0ACD8822C ON alf_list_attribute_entries (list_id);
-CREATE INDEX FKC7D52FB02C5AB86C ON alf_list_attribute_entries (attribute_id);
-CREATE INDEX FK335CAE262C5AB86C ON alf_map_attribute_entries (attribute_id);
-CREATE INDEX FK335CAE26AEAC208C ON alf_map_attribute_entries (map_id);
-
--- AVM
-CREATE INDEX fk_avm_asp_node    ON avm_aspects (node_id);
-CREATE INDEX FKD3FD9F95EDCD4A96 ON avm_aspects_new (id);
-CREATE INDEX fk_avm_ce_child    ON avm_child_entries (child_id);
-CREATE INDEX fk_avm_ce_parent   ON avm_child_entries (parent_id);
-CREATE INDEX fk_avm_hl_desc     ON avm_history_links (descendent);
-CREATE INDEX fk_avm_hl_ancestor ON avm_history_links (ancestor);
-CREATE INDEX fk_avm_ml_from     ON avm_merge_links (mfrom);
-CREATE INDEX fk_avm_ml_to       ON avm_merge_links (mto);
-CREATE INDEX FK44A37C8A6BD529F3 ON avm_node_properties_new (node_id);
-CREATE INDEX fk_avm_np_node     ON avm_node_properties (node_id);
-CREATE INDEX fk_avm_n_acl       ON avm_nodes (acl_id);
-CREATE INDEX fk_avm_n_store     ON avm_nodes (store_new_id);
-CREATE INDEX fk_avm_sp_store    ON avm_store_properties (avm_store_id);
-CREATE INDEX fk_avm_s_root      ON avm_stores (current_root_id);
-CREATE INDEX fk_avm_vr_store    ON avm_version_roots (avm_store_id);
-CREATE INDEX fk_avm_vr_root     ON avm_version_roots (root_id);

config/alfresco/dbscripts/create/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoPostCreate-2.1-FKIndexes.sql

@@ -1,10 +0,0 @@
---
--- Title:      Post-Create Foreign Key indexes
--- Database:   MySQL
--- Since:      V2.0 Schema 63
--- Author:     Derek Hulley
---
--- Please contact support@alfresco.com if you need assistance with the upgrade.
---
-
--- The MySQL dialects apply the FK indexes by default

config/alfresco/dbscripts/create/2.2/org.hibernate.dialect.Dialect/AlfrescoPostCreate-2.2-Extra.sql

@@ -1,20 +1,28 @@
 --
 -- Title:      Post-Create Constraints
 -- Database:   Generic
--- Since:      V2.2 Schema 82
+-- Since:      V2.2 Schema 86
 -- Author:     Derek Hulley
 --
+-- Certain Hibernate mappings don't allow constraints to be declared and are therefore
+-- explicitly required.  All other constraints are automatically added by the
+-- Hibernate-generated script.
+--
 -- Please contact support@alfresco.com if you need assistance with the upgrade.
 --
 
-ALTER TABLE alf_node_aspects ADD CONSTRAINT fk_alf_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+--
+-- Explicit indexes and constraints not declared in the mappings
+--
+
 CREATE INDEX fk_alf_na_qn ON alf_node_aspects (qname_id);
+ALTER TABLE alf_node_aspects ADD CONSTRAINT fk_alf_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
 
-ALTER TABLE alf_node_properties ADD CONSTRAINT fk_alf_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
 CREATE INDEX fk_alf_np_qn ON alf_node_properties (qname_id);
+ALTER TABLE alf_node_properties ADD CONSTRAINT fk_alf_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
 
-ALTER TABLE avm_aspects_new ADD CONSTRAINT fk_avm_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
 CREATE INDEX fk_avm_na_qn ON avm_aspects_new (qname_id);
+ALTER TABLE avm_aspects_new ADD CONSTRAINT fk_avm_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
 
-ALTER TABLE avm_node_properties_new ADD CONSTRAINT fk_avm_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
 CREATE INDEX fk_avm_np_qn ON avm_node_properties_new (qname_id);
+ALTER TABLE avm_node_properties_new ADD CONSTRAINT fk_avm_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);

config/alfresco/dbscripts/create/2.2/org.hibernate.dialect.Dialect/AlfrescoPostCreate-2.2-MappedFKIndexes.sql

@@ -0,0 +1,86 @@
+--
+-- Title:      Post-Create Indexes
+-- Database:   Generic
+-- Since:      V2.2 Schema 86
+-- Author:     Derek Hulley
+--
+-- Hibernate only generates indexes on foreign key columns for MySQL.
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+CREATE INDEX fk_alf_acl_entr ON alf_access_control_entry (acl_id);
+CREATE INDEX fk_alf_ace_perm ON alf_access_control_entry (permission_id);
+CREATE INDEX fk_alf_ace_auth ON alf_access_control_entry (authority_id);
+
+CREATE INDEX fk_alf_attr_acl ON alf_attributes (acl_id);
+
+CREATE INDEX fk_alf_adtf_src ON alf_audit_fact (audit_source_id);
+CREATE INDEX fk_alf_adtf_date ON alf_audit_fact (audit_date_id);
+CREATE INDEX fk_alf_adtf_conf ON alf_audit_fact (audit_conf_id);
+
+CREATE INDEX fk_alf_auth_ext ON alf_auth_ext_keys (id);
+
+CREATE INDEX fk_alf_ca_pnode ON alf_child_assoc (parent_node_id);
+CREATE INDEX fk_alf_ca_tqn ON alf_child_assoc (type_qname_id);
+CREATE INDEX fk_alf_ca_qn_ns ON alf_child_assoc (qname_ns_id);
+CREATE INDEX fk_alf_ca_cnode ON alf_child_assoc (child_node_id);
+
+CREATE INDEX fk_alf_gatt_att ON alf_global_attributes (attribute);
+
+CREATE INDEX fk_alf_lent_att ON alf_list_attribute_entries (attribute_id);
+
+CREATE INDEX fk_alf_lent_latt ON alf_list_attribute_entries (list_id);
+
+CREATE INDEX fk_alf_matt_matt ON alf_map_attribute_entries (map_id);
+CREATE INDEX fk_alf_matt_att ON alf_map_attribute_entries (attribute_id);
+
+CREATE INDEX fk_alf_n_acl ON alf_node (acl_id);
+CREATE INDEX fk_alf_n_tqname ON alf_node (type_qname_id);
+CREATE INDEX fk_alf_n_store ON alf_node (protocol, identifier);
+
+CREATE INDEX fk_alf_n_asp ON alf_node_aspects (node_id);
+CREATE INDEX fk_alf_na_snode ON alf_node_assoc (source_node_id);
+
+CREATE INDEX fk_alf_na_tqn ON alf_node_assoc (type_qname_id);
+CREATE INDEX fk_alf_na_tnode ON alf_node_assoc (target_node_id);
+
+CREATE INDEX fk_alf_n_prop ON alf_node_properties (node_id);
+CREATE INDEX fk_alf_np_attr ON alf_node_properties (attribute_value);
+
+CREATE INDEX fk_alf_ns_node ON alf_node_status (node_id);
+CREATE INDEX fk_alf_ns_trans ON alf_node_status (transaction_id);
+
+CREATE INDEX fk_alf_qname_ns ON alf_qname (ns_id);
+
+CREATE INDEX fk_alf_store_rn ON alf_store (root_node_id);
+
+CREATE INDEX fk_alf_txn_svr ON alf_transaction (server_id);
+
+CREATE INDEX fk_avm_asp_node ON avm_aspects (node_id);
+CREATE INDEX fk_avm_asp_n ON avm_aspects_new (id);
+
+CREATE INDEX fk_avm_ce_child ON avm_child_entries (child_id);
+CREATE INDEX fk_avm_ce_parent ON avm_child_entries (parent_id);
+
+CREATE INDEX fk_avm_hl_desc ON avm_history_links (descendent);
+CREATE INDEX fk_avm_hl_ancestor ON avm_history_links (ancestor);
+
+CREATE INDEX fk_avm_ml_to ON avm_merge_links (mto);
+CREATE INDEX fk_avm_ml_from ON avm_merge_links (mfrom);
+
+CREATE INDEX fk_avm_np_node ON avm_node_properties (node_id);
+CREATE INDEX fk_avm_np_n ON avm_node_properties_new (node_id);
+
+CREATE INDEX fk_avm_n_acl ON avm_nodes (acl_id);
+CREATE INDEX fk_avm_n_store ON avm_nodes (store_new_id);
+
+CREATE INDEX fk_avm_sp_qname ON avm_store_properties (qname_id);
+CREATE INDEX fk_avm_sp_store ON avm_store_properties (avm_store_id);
+
+CREATE INDEX fk_avm_s_root ON avm_stores (current_root_id);
+
+CREATE INDEX fk_avm_vlne_vr ON avm_version_layered_node_entry (version_root_id);
+
+CREATE INDEX fk_avm_vr_root ON avm_version_roots (root_id);
+CREATE INDEX fk_avm_vr_store ON avm_version_roots (avm_store_id);

config/alfresco/dbscripts/create/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoPostCreate-2.2-Indexes.sql

@@ -0,0 +1,29 @@
+--
+-- Title:      Post-Create Indexes
+-- Database:   MySQL
+-- Since:      V2.2 Schema 84
+-- Author:     Derek Hulley
+--
+-- Hibernate only generates indexes on foreign key columns for MySQL.
+-- There are also certain relationships that can not be declared in Hibernate but
+-- still need to be maintained and need indexes.
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+--
+-- Explicit indexes not declared in the mappings
+--
+
+CREATE INDEX fk_alf_na_qn ON alf_node_aspects (qname_id);
+
+CREATE INDEX fk_alf_np_qn ON alf_node_properties (qname_id);
+
+CREATE INDEX fk_avm_na_qn ON avm_aspects_new (qname_id);
+
+CREATE INDEX fk_avm_np_qn ON avm_node_properties_new (qname_id);
+
+--
+-- Foreign Key indexes
+-- These are auto-generated for MySQL
+--

config/alfresco/dbscripts/create/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoPostCreate-2.2-MappedFKIndexes.sql

@@ -0,0 +1,10 @@
+--
+-- Title:      Post-Create Indexes
+-- Database:   MySQL
+-- Since:      V2.2 Schema 86
+-- Author:     Derek Hulley
+--
+-- Hibernate only generates indexes on foreign key columns for MySQL.
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--

config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-PerfIndexes02.sql

@@ -1,20 +0,0 @@
---
--- Some explicit indexes to improve performance for various use-cases (Generic Schema 1.4)
---
-
--- Association QNames
-CREATE INDEX idx_ca_type_qname ON alf_child_assoc (type_qname);
-CREATE INDEX idx_ca_qname ON alf_child_assoc (qname);
-CREATE INDEX idx_na_type_qname ON alf_node_assoc (type_qname);
-
---
--- Record script finish
---
-delete from alf_applied_patch where id = 'patch.db-V1.4-PerfIndexes02';
-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-V1.4-PerfIndexes02', 'Executed script AlfrescoSchemaUpdate-1.4-PerfIndexes02.sql',
-    0, 75, -1, 76, null, 'UNKOWN', 1, 1, 'Script completed'
-  );

config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-TxnCommitTimeIndex.sql

@@ -2,7 +2,6 @@
 -- Explicit index for alf_transaction.commit_time_ms (Generic Schema 1.4)
 --
 
-CREATE INDEX idx_commit_time_ms ON alf_transaction (commit_time_ms);
 UPDATE alf_transaction SET commit_time_ms = id WHERE commit_time_ms IS NULL;
 
 --

config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-1.4-PerfIndexes02.sql

@@ -1,20 +0,0 @@
---
--- Some explicit indexes to improve performance for various use-cases (PostgreSQL 1.4)
---
-
--- Association QNames
-CREATE INDEX idx_ca_type_qname ON alf_child_assoc (type_qname);
-CREATE INDEX idx_ca_qname ON alf_child_assoc (qname);
-CREATE INDEX idx_na_type_qname ON alf_node_assoc (type_qname);
-
---
--- Record script finish
---
-delete from alf_applied_patch where id = 'patch.db-V1.4-PerfIndexes02';
-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-V1.4-PerfIndexes02', 'Executed script AlfrescoSchemaUpdate-1.4-PerfIndexes02.sql',
-    0, 75, -1, 76, null, 'UNKOWN', TRUE, TRUE, 'Script completed'
-  );

config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-1.4-TxnCommitTimeIndex.sql

@@ -2,7 +2,6 @@
 -- Explicit index for alf_transaction.commit_time_ms (PostgreSQL 1.4)
 --
 
-CREATE INDEX idx_commit_time_ms ON alf_transaction (commit_time_ms);
 UPDATE alf_transaction SET commit_time_ms = id WHERE commit_time_ms IS NULL;
 
 --

config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-ExplicitIndexes.sql

@@ -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'
-  );

config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql

@@ -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'
-  );

config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql

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

config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql

@@ -1,26 +0,0 @@
---
--- Title:      Ensure that all Foreign Key indexes are present
--- Database:   MySQL InnoDB
--- Since:      V2.1 Schema 64
--- Author:     Derek Hulley
---
--- Please contact support@alfresco.com if you need assistance with the upgrade.
---
--- The MySQL InnoDB Dialect has special support for foreign keys.
-
--- Remove pointless duplicated FK indexes
-ALTER TABLE alf_global_attributes   DROP INDEX FK64D0B9CF69B9F16A;(optional)
-ALTER TABLE alf_node                DROP INDEX FK60EFB62696FBEE85;(optional)
-ALTER TABLE alf_child_assoc         DROP INDEX FKFFC5468E96FBEE85;(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'
-  );

config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-ExplicitIndexes.sql

@@ -1,113 +0,0 @@
---
--- Title:      Ensure that all expicit indexes are present
--- Database:   PostgreSQL
--- 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', TRUE, TRUE, 'Script completed'
-  );

config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql

@@ -1,115 +0,0 @@
---
--- Title:      Ensure that all Foreign Key indexes are present
--- Database:   PostgreSQL
--- 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', TRUE, TRUE, 'Script completed'
-  );

config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql

@@ -10,10 +10,22 @@
 -- from the AVM nodes.
 -- PostgreSQL requires TRUE for boolean values.
 
-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

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.2-ACL.sql

@@ -24,9 +24,9 @@ ALTER TABLE alf_access_control_list
    ADD COLUMN is_versioned BOOLEAN NOT NULL DEFAULT FALSE,
    ADD COLUMN requires_version BOOLEAN NOT NULL DEFAULT FALSE,
    ADD COLUMN acl_change_set BIGINT,
-   ADD COLUMN inherits_from BIGINT,
-   ADD INDEX FK_ACL_CH_SET (acl_change_set),
-   ADD CONSTRAINT FOREIGN KEY FK_ACL_CH_SET (acl_change_set) REFERENCES alf_acl_change_set (id);
+   ADD COLUMN inherits_from BIGINT;
+CREATE INDEX fk_alf_acl_acs ON alf_access_control_list (acl_change_set);
+ALTER TABLE alf_access_control_list ADD CONSTRAINT fk_alf_acl_acs FOREIGN KEY (acl_change_set) REFERENCES alf_acl_change_set (id);
 
 UPDATE alf_access_control_list acl
    set acl_id = (acl.id);
@@ -42,13 +42,12 @@ CREATE TABLE alf_acl_member (
    ace_id BIGINT NOT NULL,
    pos INT NOT NULL,
    primary key (id),
-   unique(acl_id, ace_id, pos),
-   index FK_ACL_ID (acl_id),
-   CONSTRAINT FOREIGN KEY FK_ACL_ID (acl_id) REFERENCES alf_access_control_list (id),
-   index FK_ACE_ID (ace_id),
-   CONSTRAINT FOREIGN KEY FK_ACE_ID (ace_id) REFERENCES alf_access_control_entry (id)
+   unique(acl_id, ace_id, pos)
 ) type=InnoDB;
-
+CREATE INDEX fk_alf_aclm_acl ON alf_acl_member (acl_id);
+ALTER TABLE alf_acl_member ADD CONSTRAINT fk_alf_aclm_acl FOREIGN KEY (acl_id) REFERENCES alf_access_control_list (id);
+CREATE INDEX fk_alf_aclm_ace ON alf_acl_member (ace_id);
+ALTER TABLE alf_acl_member ADD CONSTRAINT fk_alf_aclm_ace FOREIGN KEY (ace_id) REFERENCES alf_access_control_entry (id);
 
 
 ALTER TABLE alf_access_control_entry DROP INDEX acl_id;
@@ -63,8 +62,7 @@ ALTER TABLE alf_access_control_entry
 DROP TABLE alf_auth_ext_keys;
 
 -- remove authority constraint
-ALTER TABLE alf_access_control_entry
-   DROP FOREIGN KEY FKFFF41F99B25A50BF;
+ALTER TABLE alf_access_control_entry DROP INDEX FKFFF41F99B25A50BF, DROP FOREIGN KEY FKFFF41F99B25A50BF;
 
 -- restructure authority
 ALTER TABLE alf_authority
@@ -72,7 +70,7 @@ ALTER TABLE alf_authority
    ADD COLUMN id BIGINT NOT NULL AUTO_INCREMENT,
    CHANGE recipient authority VARCHAR(100),
    ADD primary key (id),
-   ADD CONSTRAINT UNIQUE INDEX U_AUTH (authority);
+   ADD UNIQUE (authority);
 
 -- migrate data - fix up FK refs to authority
 UPDATE alf_access_control_entry ace
@@ -101,23 +99,28 @@ CREATE TABLE alf_authority_alias (
    auth_id BIGINT NOT NULL,
    alias_id BIGINT NOT NULL,
    primary key (id),
-   INDEX FK_ALIAS_TO_AUTH (alias_id),
-   CONSTRAINT FOREIGN KEY FK_ALIAS_TO_AUTH (alias_id) REFERENCES alf_authority (id),
-   INDEX FK_AUTH_TO_AUTH (auth_id),
-   CONSTRAINT FOREIGN KEY FK_AUTH_TO_AUTH (auth_id) REFERENCES alf_authority (id),
-   CONSTRAINT UNIQUE INDEX U_AUTH_TO_ALIAS (auth_id, alias_id)
+   UNIQUE (auth_id, alias_id)
 )  type=InnoDB;
+CREATE INDEX fk_alf_autha_ali ON alf_authority_alias (alias_id);
+ALTER TABLE alf_authority_alias ADD CONSTRAINT fk_alf_autha_ali FOREIGN KEY (alias_id) REFERENCES alf_authority (id);
+CREATE INDEX fk_alf_autha_aut ON alf_authority_alias (auth_id);
+ALTER TABLE alf_authority_alias ADD CONSTRAINT fk_alf_autha_aut FOREIGN KEY (auth_id) REFERENCES alf_authority (id);
 
 
 -- Tidy up unused cols on ace table and add the FK contstraint back
 -- finish take out of ACL_ID
+ALTER TABLE alf_access_control_entry DROP INDEX FKFFF41F99B9553F6C, DROP FOREIGN KEY FKFFF41F99B9553F6C;
+ALTER TABLE alf_access_control_entry DROP INDEX FKFFF41F9960601995, DROP FOREIGN KEY FKFFF41F9960601995;
+ALTER TABLE alf_access_control_entry DROP COLUMN acl_id, DROP COLUMN authority_id;
 ALTER TABLE alf_access_control_entry
-   DROP FOREIGN KEY FKFFF41F99B9553F6C,
-   DROP COLUMN acl_id,
-   DROP COLUMN authority_id,
-   CHANGE auth_id authority_id BIGINT NOT NULL,
-   ADD INDEX  FK_ACL_TO_AUTH (authority_id),
-   ADD CONSTRAINT FOREIGN KEY FK_ACL_TO_AUTH (authority_id) REFERENCES alf_authority (id);
+   CHANGE auth_id authority_id BIGINT NOT NULL;
+CREATE INDEX fk_alf_ace_auth ON alf_access_control_entry (authority_id);
+ALTER TABLE alf_access_control_entry ADD CONSTRAINT fk_alf_ace_auth FOREIGN KEY (authority_id) REFERENCES alf_authority (id);
+CREATE INDEX fk_alf_ace_perm ON alf_access_control_entry (permission_id);
+ALTER TABLE alf_access_control_entry ADD CONSTRAINT fk_alf_ace_perm FOREIGN KEY (permission_id) REFERENCES alf_permission (id);
+CREATE INDEX fk_alf_ace_ctx ON alf_access_control_entry (context_id);
+ALTER TABLE alf_access_control_entry ADD CONSTRAINT fk_alf_ace_ctx FOREIGN KEY (context_id) REFERENCES alf_ace_context (id);
+   
 
 
 -- Update members to point to the first use of an access control entry

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-0-create-missing-tables.sql

@@ -0,0 +1,83 @@
+--
+-- Title:      Create missing 2.1 tables
+-- Database:   MySQL
+-- Since:      V2.2 Schema 86
+-- Author:     Derek Hulley
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+-- Upgrade paths that bypass V2.1 will need to have a some tables added in order
+-- to simplify subsequent upgrade scripts.
+--
+
+    create table avm_aspects (
+        id bigint not null auto_increment,
+        node_id bigint,
+        qname varchar(200),
+        primary key (id)
+    ) type=InnoDB;                                    -- (optional)
+
+    create table avm_aspects_new (
+        id bigint not null,
+        name varchar(200) not null,
+        primary key (id, name)
+    ) type=InnoDB;                                    -- (optional)
+
+    create table avm_node_properties (
+        id bigint not null auto_increment,
+        node_id bigint,
+        qname varchar(200),
+        actual_type varchar(15) not null,
+        multi_valued bit not null,
+        persisted_type varchar(15) not null,
+        boolean_value bit,
+        long_value bigint,
+        float_value float,
+        double_value double precision,
+        string_value text,
+        serializable_value blob,
+        primary key (id)
+    ) type=InnoDB;                                    -- (optional)
+
+    create table avm_node_properties_new (
+        node_id bigint not null,
+        actual_type varchar(15) not null,
+        multi_valued bit not null,
+        persisted_type varchar(15) not null,
+        boolean_value bit,
+        long_value bigint,
+        float_value float,
+        double_value double precision,
+        string_value text,
+        serializable_value blob,
+        qname varchar(200) not null,
+        primary key (node_id, qname)
+    ) type=InnoDB;                                    -- (optional)
+
+    create table avm_store_properties (
+        id bigint not null auto_increment,
+        avm_store_id bigint,
+        qname varchar(200),
+        actual_type varchar(15) not null,
+        multi_valued bit not null,
+        persisted_type varchar(15) not null,
+        boolean_value bit,
+        long_value bigint,
+        float_value float,
+        double_value double precision,
+        string_value text,
+        serializable_value blob,
+        primary key (id)
+    ) type=InnoDB;                                    -- (optional)
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-QNames-0-CreateMissingTables';
+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.2-QNames-0-CreateMissingTables', 'Manually executed script upgrade V2.2: Created missing tables',
+    0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed'
+  );

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-1-drop-indexes-and-constraints.sql

@@ -0,0 +1,149 @@
+--
+-- Title:      Remote all pre-2.2 indexes and constraints
+-- Database:   MySQL
+-- Since:      V2.2 Schema 86
+-- Author:     Derek Hulley
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+ALTER TABLE alf_access_control_entry DROP INDEX fk_alf_ace_ctx, DROP FOREIGN KEY fk_alf_ace_ctx;
+
+ALTER TABLE alf_access_control_entry DROP INDEX fk_alf_ace_perm, DROP FOREIGN KEY fk_alf_ace_perm;
+
+ALTER TABLE alf_access_control_entry DROP INDEX fk_alf_ace_auth, DROP FOREIGN KEY fk_alf_ace_auth;
+
+ALTER TABLE alf_access_control_list DROP INDEX fk_alf_acl_acs, DROP FOREIGN KEY fk_alf_acl_acs;
+
+ALTER TABLE alf_acl_member DROP INDEX fk_alf_aclm_acl, DROP FOREIGN KEY fk_alf_aclm_acl;
+
+ALTER TABLE alf_acl_member DROP INDEX fk_alf_aclm_ace, DROP FOREIGN KEY fk_alf_aclm_ace;
+
+ALTER TABLE alf_attributes DROP INDEX fk_attributes_n_acl, DROP FOREIGN KEY fk_attributes_n_acl;  -- (optional)
+
+ALTER TABLE alf_audit_date DROP INDEX adt_woy_idx;
+
+ALTER TABLE alf_audit_date DROP INDEX adt_date_idx;
+
+ALTER TABLE alf_audit_date DROP INDEX adt_y_idx;
+
+ALTER TABLE alf_audit_date DROP INDEX adt_q_idx;
+
+ALTER TABLE alf_audit_date DROP INDEX adt_m_idx;
+
+ALTER TABLE alf_audit_date DROP INDEX adt_dow_idx;
+
+ALTER TABLE alf_audit_date DROP INDEX adt_doy_idx;
+
+ALTER TABLE alf_audit_date DROP INDEX adt_dom_idx;
+
+ALTER TABLE alf_audit_date DROP INDEX adt_hy_idx;
+
+ALTER TABLE alf_audit_date DROP INDEX adt_wom_idx;
+
+ALTER TABLE alf_audit_fact DROP INDEX adt_user_idx;
+
+ALTER TABLE alf_audit_fact DROP INDEX adt_store_idx;
+
+ALTER TABLE alf_audit_fact DROP INDEX FKEAD18174A0F9B8D9, DROP FOREIGN KEY FKEAD18174A0F9B8D9;
+
+ALTER TABLE alf_audit_fact DROP INDEX FKEAD1817484342E39, DROP FOREIGN KEY FKEAD1817484342E39;
+
+ALTER TABLE alf_audit_fact DROP INDEX FKEAD18174F524CFD7, DROP FOREIGN KEY FKEAD18174F524CFD7;
+
+ALTER TABLE alf_audit_source DROP INDEX app_source_app_idx;
+
+ALTER TABLE alf_audit_source DROP INDEX app_source_ser_idx;
+
+ALTER TABLE alf_audit_source DROP INDEX app_source_met_idx;
+
+ALTER TABLE alf_child_assoc DROP INDEX FKFFC5468E8E50E582, DROP FOREIGN KEY FKFFC5468E8E50E582;
+
+ALTER TABLE alf_child_assoc DROP INDEX FKFFC5468E74173FF4, DROP FOREIGN KEY FKFFC5468E74173FF4;
+
+ALTER TABLE alf_global_attributes DROP FOREIGN KEY FK64D0B9CF69B9F16A; -- (optional)
+ALTER TABLE alf_global_attributes DROP INDEX FK64D0B9CF69B9F16A; --(optional)
+
+ALTER TABLE alf_list_attribute_entries DROP INDEX FKC7D52FB02C5AB86C, DROP FOREIGN KEY FKC7D52FB02C5AB86C; -- (optional)
+
+ALTER TABLE alf_list_attribute_entries DROP INDEX FKC7D52FB0ACD8822C, DROP FOREIGN KEY FKC7D52FB0ACD8822C; -- (optional)
+
+ALTER TABLE alf_map_attribute_entries DROP INDEX FK335CAE26AEAC208C, DROP FOREIGN KEY FK335CAE26AEAC208C; -- (optional)
+
+ALTER TABLE alf_map_attribute_entries DROP INDEX FK335CAE262C5AB86C, DROP FOREIGN KEY FK335CAE262C5AB86C; -- (optional)
+
+ALTER TABLE alf_node DROP INDEX FK60EFB626B9553F6C, DROP FOREIGN KEY FK60EFB626B9553F6C;
+
+ALTER TABLE alf_node DROP INDEX FK60EFB626D24ADD25, DROP FOREIGN KEY FK60EFB626D24ADD25;
+
+ALTER TABLE alf_node_aspects DROP INDEX FKD654E027F2C8017, DROP FOREIGN KEY FKD654E027F2C8017;
+
+ALTER TABLE alf_node_assoc DROP INDEX FKE1A550BCB69C43F3, DROP FOREIGN KEY FKE1A550BCB69C43F3;
+
+ALTER TABLE alf_node_assoc DROP INDEX FKE1A550BCA8FC7769, DROP FOREIGN KEY FKE1A550BCA8FC7769;
+
+ALTER TABLE alf_node_properties DROP INDEX FK7D4CF8EC7F2C8017, DROP FOREIGN KEY FK7D4CF8EC7F2C8017;
+
+ALTER TABLE alf_node_properties DROP INDEX FK7D4CF8EC40E780DC, DROP FOREIGN KEY FK7D4CF8EC40E780DC; -- (optional)
+
+ALTER TABLE alf_node_status DROP INDEX FK71C2002B7F2C8017, DROP FOREIGN KEY FK71C2002B7F2C8017;
+
+ALTER TABLE alf_node_status DROP INDEX FK71C2002B9E57C13D, DROP FOREIGN KEY FK71C2002B9E57C13D;
+
+ALTER TABLE alf_store DROP INDEX FKBD4FF53D22DBA5BA, DROP FOREIGN KEY FKBD4FF53D22DBA5BA;
+
+ALTER TABLE alf_transaction DROP INDEX idx_commit_time_ms; -- (optional)
+
+ALTER TABLE alf_transaction DROP INDEX FKB8761A3A9AE340B7, DROP FOREIGN KEY FKB8761A3A9AE340B7;
+
+ALTER TABLE avm_aspects DROP INDEX fk_avm_asp_node, DROP FOREIGN KEY fk_avm_asp_node;
+
+ALTER TABLE avm_aspects_new DROP INDEX FKD3FD9F95EDCD4A96, DROP FOREIGN KEY FKD3FD9F95EDCD4A96; -- (optional)
+
+ALTER TABLE avm_child_entries DROP INDEX fk_avm_ce_child, DROP FOREIGN KEY fk_avm_ce_child;
+
+ALTER TABLE avm_child_entries DROP INDEX fk_avm_ce_parent, DROP FOREIGN KEY fk_avm_ce_parent;
+
+ALTER TABLE avm_history_links DROP INDEX fk_avm_hl_desc, DROP FOREIGN KEY fk_avm_hl_desc;
+
+ALTER TABLE avm_history_links DROP INDEX fk_avm_hl_ancestor, DROP FOREIGN KEY fk_avm_hl_ancestor;
+
+ALTER TABLE avm_merge_links DROP INDEX fk_avm_ml_to, DROP FOREIGN KEY fk_avm_ml_to;
+
+ALTER TABLE avm_merge_links DROP INDEX fk_avm_ml_from, DROP FOREIGN KEY fk_avm_ml_from;
+
+ALTER TABLE avm_node_properties DROP INDEX idx_avm_np_name;
+
+ALTER TABLE avm_node_properties DROP INDEX fk_avm_np_node, DROP FOREIGN KEY fk_avm_np_node;
+
+ALTER TABLE avm_node_properties_new DROP INDEX FK44A37C8A6BD529F3, DROP FOREIGN KEY FK44A37C8A6BD529F3; -- (optional)
+
+ALTER TABLE avm_nodes DROP INDEX fk_avm_n_acl, DROP FOREIGN KEY fk_avm_n_acl;
+
+ALTER TABLE avm_nodes DROP INDEX fk_avm_n_store, DROP FOREIGN KEY fk_avm_n_store;
+
+ALTER TABLE avm_store_properties DROP INDEX idx_avm_sp_name;
+
+ALTER TABLE avm_store_properties DROP INDEX fk_avm_sp_store, DROP FOREIGN KEY fk_avm_sp_store;
+
+ALTER TABLE avm_stores DROP INDEX fk_avm_s_root, DROP FOREIGN KEY fk_avm_s_root;
+
+ALTER TABLE avm_version_layered_node_entry DROP INDEX FK182E672DEB9D70C, DROP FOREIGN KEY FK182E672DEB9D70C; -- (optional)
+
+ALTER TABLE avm_version_roots DROP INDEX idx_avm_vr_version;
+
+ALTER TABLE avm_version_roots DROP INDEX fk_avm_vr_root, DROP FOREIGN KEY fk_avm_vr_root;
+
+ALTER TABLE avm_version_roots DROP INDEX fk_avm_vr_store, DROP FOREIGN KEY fk_avm_vr_store;
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-QNames-1-DropIndexesAndConstraints';
+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.2-QNames-1-DropIndexesAndConstraints', 'Manually executed script upgrade V2.2: Remove pre-2.2 indexes and constraints',
+    0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed'
+  );

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-2-move-qnames.sql

@@ -1,4 +1,16 @@
--- Create static namespace and qname tables
+--
+-- Title:      Move static QNames and Namsespaces into a separate table
+-- Database:   MySQL
+-- Since:      V2.2 Schema 86
+-- Author:     Derek Hulley
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+-- This script replaces the various static QName and Namespace entries
+-- with a more efficient FK relationship to the static values.
+--
+
+-- Create static namespace and qname tables
 CREATE TABLE alf_namespace
 (
    id BIGINT NOT NULL AUTO_INCREMENT,
@@ -18,9 +30,9 @@ CREATE TABLE alf_qname
    UNIQUE (ns_id, local_name)
 ) ENGINE=InnoDB;
 
-create index fk_alf_qname_ns on alf_qname (ns_id);
-ALTER TABLE alf_qname
-   add constraint fk_alf_qname_ns foreign key (ns_id) references alf_namespace (id);
+-- Create temporary indexes and constraints
+CREATE INDEX t_fk_alf_qn_ns on alf_qname (ns_id);
+ALTER TABLE alf_qname ADD CONSTRAINT t_fk_alf_qn_ns FOREIGN KEY (ns_id) REFERENCES alf_namespace (id);
 
 -- Create temporary table for dynamic (child) QNames
 CREATE TABLE t_qnames_dyn
@@ -28,8 +40,8 @@ CREATE TABLE t_qnames_dyn
    qname varchar(255) NOT NULL,
    namespace varchar(255)
 ) ENGINE=InnoDB;
-ALTER TABLE t_qnames_dyn ADD INDEX TQND_IDX_QN (qname);
-ALTER TABLE t_qnames_dyn ADD INDEX TQND_IDX_NS (namespace);
+CREATE INDEX tidx_qnd_qn ON t_qnames_dyn (qname);
+CREATE INDEX tidx_qnd_ns ON t_qnames_dyn (namespace);
 
 -- Populate the table with the child association paths
 INSERT INTO t_qnames_dyn (qname)
@@ -60,9 +72,9 @@ CREATE TABLE t_qnames
    namespace varchar(255),
    localname varchar(255)
 ) ENGINE=InnoDB;
-ALTER TABLE t_qnames ADD INDEX TQN_IDX_QN (qname);
-ALTER TABLE t_qnames ADD INDEX TQN_IDX_NS (namespace);
-ALTER TABLE t_qnames ADD INDEX TQN_IDX_LN (localname);
+CREATE INDEX tidx_tqn_qn ON t_qnames (qname);
+CREATE INDEX tidx_tqn_ns ON t_qnames (namespace);
+CREATE INDEX tidx_tqn_ln ON t_qnames (localname);
 
 -- Populate the table with all known static QNames
 INSERT INTO t_qnames (qname)
@@ -144,13 +156,11 @@ UPDATE alf_node n set n.type_qname_id =
 );
 ALTER TABLE alf_node DROP COLUMN type_qname;
 ALTER TABLE alf_node MODIFY COLUMN type_qname_id BIGINT NOT NULL AFTER uuid;
-ALTER TABLE alf_node ADD CONSTRAINT fk_alf_n_tqname FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id);
-CREATE INDEX fk_alf_n_tqname ON alf_node (type_qname_id);
 
 --
 -- DATA REPLACEMENT: alf_node_aspects.qname
 --
--- ALTER TABLE alf_node_aspects DROP PRIMARY KEY;(optional)
+ALTER TABLE alf_node_aspects DROP PRIMARY KEY; -- (optional)
 ALTER TABLE alf_node_aspects ADD COLUMN qname_id BIGINT NULL AFTER node_id;
 UPDATE alf_node_aspects na set na.qname_id =
 (
@@ -161,8 +171,6 @@ UPDATE alf_node_aspects na set na.qname_id =
 );
 ALTER TABLE alf_node_aspects DROP COLUMN qname;
 ALTER TABLE alf_node_aspects MODIFY COLUMN qname_id BIGINT NOT NULL AFTER node_id;
-ALTER TABLE alf_node_aspects ADD CONSTRAINT fk_alf_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
-CREATE INDEX fk_alf_na_qn ON alf_node_aspects (qname_id);
 ALTER TABLE alf_node_aspects ADD PRIMARY KEY (node_id, qname_id);
 
 --
@@ -179,8 +187,6 @@ UPDATE alf_node_properties np set np.qname_id =
 );
 ALTER TABLE alf_node_properties DROP COLUMN qname;
 ALTER TABLE alf_node_properties MODIFY COLUMN qname_id BIGINT NOT NULL AFTER node_id;
-ALTER TABLE alf_node_properties ADD CONSTRAINT fk_alf_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
-CREATE INDEX fk_alf_np_qn ON alf_node_properties (qname_id);
 ALTER TABLE alf_node_properties ADD PRIMARY KEY (node_id, qname_id);
 
 --
@@ -197,10 +203,13 @@ UPDATE avm_aspects_new na set na.qname_id =
 );
 ALTER TABLE avm_aspects_new DROP COLUMN name;
 ALTER TABLE avm_aspects_new MODIFY COLUMN qname_id BIGINT NOT NULL AFTER id;
-ALTER TABLE avm_aspects_new ADD CONSTRAINT fk_avm_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
-CREATE INDEX fk_avm_na_qn ON avm_aspects_new (qname_id);
 ALTER TABLE avm_aspects_new ADD PRIMARY KEY (id, qname_id);
 
+--
+-- DATA REPLACEMENT: avm_node_properties.qname
+--
+-- This table is deprecated and made empty so there is no need to alter it
+
 --
 -- DATA REPLACEMENT: avm_node_properties_new.qname
 --
@@ -215,8 +224,6 @@ UPDATE avm_node_properties_new np set np.qname_id =
 );
 ALTER TABLE avm_node_properties_new DROP COLUMN qname;
 ALTER TABLE avm_node_properties_new MODIFY COLUMN qname_id BIGINT NOT NULL AFTER node_id;
-ALTER TABLE avm_node_properties_new ADD CONSTRAINT fk_avm_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
-CREATE INDEX fk_avm_np_qn ON avm_node_properties_new (qname_id);
 ALTER TABLE avm_node_properties_new ADD PRIMARY KEY (node_id, qname_id);
 
 --
@@ -232,8 +239,6 @@ UPDATE avm_store_properties np set np.qname_id =
 );
 ALTER TABLE avm_store_properties DROP COLUMN qname;
 ALTER TABLE avm_store_properties MODIFY COLUMN qname_id BIGINT NOT NULL AFTER avm_store_id;
-ALTER TABLE avm_store_properties ADD CONSTRAINT fk_avm_sp_qname FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
-CREATE INDEX fk_avm_sp_qname ON avm_store_properties (qname_id);
 
 --
 -- DATA REPLACEMENT: alf_child_assoc.type_qname
@@ -248,8 +253,6 @@ UPDATE alf_child_assoc ca set ca.type_qname_id =
 );
 ALTER TABLE alf_child_assoc DROP COLUMN type_qname;
 ALTER TABLE alf_child_assoc MODIFY COLUMN type_qname_id BIGINT NOT NULL AFTER child_node_id;
-ALTER TABLE alf_child_assoc ADD CONSTRAINT fk_alf_ca_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id);
-CREATE INDEX fk_alf_ca_tqn ON alf_child_assoc (type_qname_id);
 
 --
 -- DATA REPLACEMENT: alf_child_assoc.qname
@@ -263,12 +266,39 @@ UPDATE alf_child_assoc ca set ca.qname_ns_id =
    WHERE SUBSTR(SUBSTRING_INDEX(qname, '}', 1), 2) = ns.uri
 );
 ALTER TABLE alf_child_assoc MODIFY COLUMN qname_ns_id BIGINT NOT NULL AFTER type_qname_id;
-ALTER TABLE alf_child_assoc ADD CONSTRAINT fk_alf_ca_qn_ns FOREIGN KEY (qname_ns_id) REFERENCES alf_namespace (id);
-CREATE INDEX fk_alf_ca_qn_ns ON alf_child_assoc (qname_ns_id);
 -- LocalName
 ALTER TABLE alf_child_assoc ADD COLUMN qname_localname VARCHAR(200) NULL AFTER qname_ns_id;
-UPDATE alf_child_assoc ca set ca.qname_localname = SUBSTRING_INDEX(qname, '}', -1);
+UPDATE alf_child_assoc ca SET ca.qname_localname = SUBSTRING_INDEX(qname, '}', -1);
 ALTER TABLE alf_child_assoc MODIFY COLUMN qname_localname VARCHAR(200) NOT NULL AFTER qname_ns_id;
-CREATE INDEX idx_alf_ca_qn_ln ON alf_child_assoc (qname_localname);
 -- Drop old column
 ALTER TABLE alf_child_assoc DROP COLUMN qname;
+
+--
+-- DATA REPLACEMENT: alf_node_assoc.type_qname
+--
+ALTER TABLE alf_node_assoc ADD COLUMN type_qname_id BIGINT NULL AFTER target_node_id;
+UPDATE alf_node_assoc na set na.type_qname_id =
+(
+   SELECT q.id
+   FROM alf_qname q
+   JOIN alf_namespace ns ON (q.ns_id = ns.id)
+   WHERE CONCAT('{', ns.uri, '}', q.local_name) = na.type_qname
+);
+ALTER TABLE alf_node_assoc DROP COLUMN type_qname;
+ALTER TABLE alf_node_assoc MODIFY COLUMN type_qname_id BIGINT NOT NULL AFTER target_node_id;
+
+-- Drop the temporary indexes and constraints
+ALTER TABLE alf_qname DROP INDEX t_fk_alf_qn_ns;
+ALTER TABLE alf_qname DROP FOREIGN KEY t_fk_alf_qn_ns;
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-QNames-2-MoveQNames';
+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.2-QNames-2-MoveQNames', 'Manually executed script upgrade V2.2: Moved static QNames and Namespaces',
+    0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed'
+  );

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-3-proptypes.sql

@@ -0,0 +1,102 @@
+--
+-- Title:      Replace property type descriptors with numerical equivalents
+-- Database:   MySQL
+-- Since:      V2.2 Schema 86
+-- Author:     Derek Hulley
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+-- Create temporary mapping for property types
+CREATE TABLE t_prop_types
+(
+   type_name VARCHAR(15) NOT NULL,
+   type_id INTEGER NOT NULL,
+   PRIMARY KEY (type_name)
+);
+INSERT INTO t_prop_types values ('NULL', 0);
+INSERT INTO t_prop_types values ('BOOLEAN', 1);
+INSERT INTO t_prop_types values ('INTEGER', 2);
+INSERT INTO t_prop_types values ('LONG', 3);
+INSERT INTO t_prop_types values ('FLOAT', 4);
+INSERT INTO t_prop_types values ('DOUBLE', 5);
+INSERT INTO t_prop_types values ('STRING', 6);
+INSERT INTO t_prop_types values ('DATE', 7);
+INSERT INTO t_prop_types values ('DB_ATTRIBUTE', 8);
+INSERT INTO t_prop_types values ('SERIALIZABLE', 9);
+INSERT INTO t_prop_types values ('MLTEXT', 10);
+INSERT INTO t_prop_types values ('CONTENT', 11);
+INSERT INTO t_prop_types values ('NODEREF', 12);
+INSERT INTO t_prop_types values ('CHILD_ASSOC_REF', 13);
+INSERT INTO t_prop_types values ('ASSOC_REF', 14);
+INSERT INTO t_prop_types values ('QNAME', 15);
+INSERT INTO t_prop_types values ('PATH', 16);
+INSERT INTO t_prop_types values ('LOCALE', 17);
+INSERT INTO t_prop_types values ('VERSION_NUMBER', 18);
+
+-- Modify the alf_node_properties table
+ALTER TABLE alf_node_properties ADD COLUMN actual_type_n INTEGER NULL AFTER qname_id;
+ALTER TABLE alf_node_properties ADD COLUMN persisted_type_n INTEGER NULL AFTER actual_type_n;
+
+UPDATE alf_node_properties p SET p.actual_type_n = (SELECT t.type_id FROM t_prop_types t WHERE t.type_name = p.actual_type);
+UPDATE alf_node_properties p SET p.persisted_type_n = (SELECT t.type_id FROM t_prop_types t WHERE t.type_name = p.persisted_type);
+
+ALTER TABLE alf_node_properties DROP COLUMN actual_type;
+ALTER TABLE alf_node_properties DROP COLUMN persisted_type;
+
+ALTER TABLE alf_node_properties MODIFY COLUMN actual_type_n INTEGER NOT NULL AFTER qname_id;
+ALTER TABLE alf_node_properties MODIFY COLUMN persisted_type_n INTEGER NOT NULL AFTER actual_type_n;
+
+-- Modify the avm_node_properties_new table
+ALTER TABLE avm_node_properties_new ADD COLUMN actual_type_n INTEGER NULL AFTER qname_id;
+ALTER TABLE avm_node_properties_new ADD COLUMN persisted_type_n INTEGER NULL AFTER actual_type_n;
+
+UPDATE avm_node_properties_new p SET p.actual_type_n = (SELECT t.type_id FROM t_prop_types t WHERE t.type_name = p.actual_type);
+UPDATE avm_node_properties_new p SET p.persisted_type_n = (SELECT t.type_id FROM t_prop_types t WHERE t.type_name = p.persisted_type);
+
+ALTER TABLE avm_node_properties_new DROP COLUMN actual_type;
+ALTER TABLE avm_node_properties_new DROP COLUMN persisted_type;
+
+ALTER TABLE avm_node_properties_new MODIFY COLUMN actual_type_n INTEGER NOT NULL AFTER qname_id;
+ALTER TABLE avm_node_properties_new MODIFY COLUMN persisted_type_n INTEGER NOT NULL AFTER actual_type_n;
+
+-- Modify the avm_store_properties table
+ALTER TABLE avm_store_properties ADD COLUMN actual_type_n INTEGER NULL AFTER qname_id;
+ALTER TABLE avm_store_properties ADD COLUMN persisted_type_n INTEGER NULL AFTER actual_type_n;
+
+UPDATE avm_store_properties p SET p.actual_type_n = (SELECT t.type_id FROM t_prop_types t WHERE t.type_name = p.actual_type);
+UPDATE avm_store_properties p SET p.persisted_type_n = (SELECT t.type_id FROM t_prop_types t WHERE t.type_name = p.persisted_type);
+
+ALTER TABLE avm_store_properties DROP COLUMN actual_type;
+ALTER TABLE avm_store_properties DROP COLUMN persisted_type;
+
+ALTER TABLE avm_store_properties MODIFY COLUMN actual_type_n INTEGER NOT NULL AFTER qname_id;
+ALTER TABLE avm_store_properties MODIFY COLUMN persisted_type_n INTEGER NOT NULL AFTER actual_type_n;
+
+-- Modify the avm_node_properties table
+ALTER TABLE avm_node_properties ADD COLUMN actual_type_n INTEGER NULL AFTER qname;
+ALTER TABLE avm_node_properties ADD COLUMN persisted_type_n INTEGER NULL AFTER actual_type_n;
+
+UPDATE avm_node_properties p SET p.actual_type_n = (SELECT t.type_id FROM t_prop_types t WHERE t.type_name = p.actual_type);
+UPDATE avm_node_properties p SET p.persisted_type_n = (SELECT t.type_id FROM t_prop_types t WHERE t.type_name = p.persisted_type);
+
+ALTER TABLE avm_node_properties DROP COLUMN actual_type;
+ALTER TABLE avm_node_properties DROP COLUMN persisted_type;
+
+ALTER TABLE avm_node_properties MODIFY COLUMN actual_type_n INTEGER NOT NULL AFTER qname;
+ALTER TABLE avm_node_properties MODIFY COLUMN persisted_type_n INTEGER NOT NULL AFTER actual_type_n;
+
+-- Remove temporary table
+DROP TABLE t_prop_types;
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-QNames-3-PropTypes';
+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.2-QNames-3-PropTypes', 'Manually executed script upgrade V2.2: Changed PropertyValue types',
+    0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed'
+  );

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-4-extra-indexes-and-constraints.sql

@@ -0,0 +1,74 @@
+--
+-- Title:      Create additional indexes and constraints
+-- Database:   MySQL
+-- Since:      V2.2 Schema 86
+-- Author:     Derek Hulley
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+CREATE INDEX idx_alf_adtd_woy ON alf_audit_date (week_of_year);
+
+CREATE INDEX idx_alf_adtd_q ON alf_audit_date (quarter);
+
+CREATE INDEX idx_alf_adtd_wom ON alf_audit_date (week_of_month);
+
+CREATE INDEX idx_alf_adtd_dom ON alf_audit_date (day_of_month);
+
+CREATE INDEX idx_alf_adtd_doy ON alf_audit_date (day_of_year);
+
+CREATE INDEX idx_alf_adtd_dow ON alf_audit_date (day_of_week);
+
+CREATE INDEX idx_alf_adtd_m ON alf_audit_date (month);
+
+CREATE INDEX idx_alf_adtd_hy ON alf_audit_date (halfYear);
+
+CREATE INDEX idx_alf_adtd_y ON alf_audit_date (year);
+
+CREATE INDEX idx_alf_adtd_dat ON alf_audit_date (date_only);
+
+CREATE INDEX idx_alf_adtf_ref ON alf_audit_fact (store_protocol, store_id, node_uuid);
+
+CREATE INDEX idx_alf_adtf_usr ON alf_audit_fact (user_id);
+
+CREATE INDEX idx_alf_adts_met ON alf_audit_source (method);
+
+CREATE INDEX idx_alf_adts_ser ON alf_audit_source (service);
+
+CREATE INDEX idx_alf_adts_app ON alf_audit_source (application);
+
+CREATE INDEX idx_alf_ca_qn_ln ON alf_child_assoc (qname_localname);
+
+CREATE INDEX idx_alf_txn_ctms ON alf_transaction (commit_time_ms);
+
+CREATE INDEX idx_avm_np_name ON avm_node_properties (qname);
+
+CREATE INDEX idx_avm_vr_version ON avm_version_roots (version_id);
+
+--
+-- Explicit indexes and constraints not declared in the mappings
+--
+
+CREATE INDEX fk_alf_na_qn ON alf_node_aspects (qname_id);
+ALTER TABLE alf_node_aspects ADD CONSTRAINT fk_alf_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+
+CREATE INDEX fk_alf_np_qn ON alf_node_properties (qname_id);
+ALTER TABLE alf_node_properties ADD CONSTRAINT fk_alf_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+
+CREATE INDEX fk_avm_na_qn ON avm_aspects_new (qname_id);
+ALTER TABLE avm_aspects_new ADD CONSTRAINT fk_avm_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+
+CREATE INDEX fk_avm_np_qn ON avm_node_properties_new (qname_id);
+ALTER TABLE avm_node_properties_new ADD CONSTRAINT fk_avm_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints';
+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.2-QNames-4-ExtraIndexesAndConstraints', 'Manually executed script upgrade V2.2: Created additional indexes and constraints',
+    0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed'
+  );

config/alfresco/patch/patch-services-context.xml

@@ -871,28 +871,6 @@
         </property>
     </bean>
     
-    <bean id="patch.db-V2.1-FKIndexes" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.1-FKIndexes</value></property>
-        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>63</value></property>
-        <property name="targetSchema"><value>64</value></property>
-        <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/upgrade/2.1/${db.script.dialect}/AlfrescoSchemaUpdate-2.1-FKIndexes.sql</value>
-        </property>
-    </bean>
-    
-    <bean id="patch.db-V2.1-ExplicitIndexes" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.1-ExplicitIndexes</value></property>
-        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>63</value></property>
-        <property name="targetSchema"><value>64</value></property>
-        <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/upgrade/2.1/${db.script.dialect}/AlfrescoSchemaUpdate-2.1-ExplicitIndexes.sql</value>
-        </property>
-    </bean>
-    
     <bean id="patch.db-V2.1-VersionColumns2" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V2.1-VersionColumns2</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
@@ -1102,22 +1080,6 @@
             </list>
         </property>
     </bean>
-    <bean id="patch.db-V1.4-PerfIndexes02" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V1.4-PerfIndexes02</value></property>
-        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>110</value></property>
-        <property name="targetSchema"><value>111</value></property>
-        <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/upgrade/1.4/${db.script.dialect}/AlfrescoSchemaUpdate-1.4-PerfIndexes02.sql</value>
-        </property>
-        <!-- dependent on upgrade script 1.4-2 having being run -->
-        <property name="dependsOn" >
-            <list>
-                <ref bean="patch.schemaUpdateScript-V1.4-2" />
-            </list>
-        </property>
-    </bean>
     
     <bean id="patch.avmFormPropertyIdentifier" class="org.alfresco.repo.admin.patch.impl.AVMFormsPropertyTokenisationPatch" parent="basePatch" >
         <property name="id"><value>patch.avmFormPropertyIdentifier</value></property>
@@ -1252,7 +1214,6 @@
             </list>
         </property>
     </bean>
-    
     <bean id="patch.db-V2.2-ACL" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V2.2-ACL</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
@@ -1303,4 +1264,80 @@
         </property>
     </bean>
     
+    <bean id="patch.db-V2.2-QNames-0-CreateMissingTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-QNames-0-CreateMissingTables</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>85</value></property>
+        <property name="targetSchema"><value>86</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-0-create-missing-tables.sql</value>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.2-ACL" />
+            </list>
+        </property>
+    </bean>
+    <bean id="patch.db-V2.2-QNames-1-DropIndexesAndConstraints" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-QNames-1-DropIndexesAndConstraints</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>85</value></property>
+        <property name="targetSchema"><value>86</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-1-drop-indexes-and-constraints.sql</value>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.2-QNames-0-CreateMissingTables" />
+            </list>
+        </property>
+    </bean>
+    <bean id="patch.db-V2.2-QNames-2-MoveQNames" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-QNames-2-MoveQNames</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>85</value></property>
+        <property name="targetSchema"><value>86</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-2-move-qnames.sql</value>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.2-QNames-1-DropIndexesAndConstraints" />
+            </list>
+        </property>
+    </bean>
+    <bean id="patch.db-V2.2-QNames-3-PropTypes" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-QNames-3-PropTypes</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>85</value></property>
+        <property name="targetSchema"><value>86</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-3-proptypes.sql</value>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.2-QNames-2-MoveQNames" />
+            </list>
+        </property>
+    </bean>
+    <bean id="patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>85</value></property>
+        <property name="targetSchema"><value>86</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-4-extra-indexes-and-constraints.sql</value>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.2-QNames-3-PropTypes" />
+            </list>
+        </property>
+    </bean>
+
 </beans>

config/alfresco/version.properties

@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=120
+version.schema=121

source/java/org/alfresco/repo/audit/hibernate/Audit.hbm.xml

@@ -24,13 +24,13 @@
         
         <!-- Fact properties -->
         
-        <property name="userId" column="user_id" type="string" length="255" not-null="true" index="adt_user_idx"/>
+        <property name="userId" column="user_id" type="string" length="255" not-null="true" index="idx_alf_adtf_usr"/>
         <property name="date" column="timestamp" type="timestamp" not-null="true"/>
         <property name="transactionId" column="transaction_id" type="string" length="56" not-null="true"/>
         <property name="sessionId" column="session_id" type="string" length="56" not-null="false"/>
-        <property name="storeProtocol" column="store_protocol" type="string" length="50" not-null="false" index="adt_store_idx"/>
-        <property name="storeId" column="store_id" type="string" length="100" not-null="false" index="adt_store_idx"/>
-        <property name="nodeUUID" column="node_uuid" type="string" length="36" not-null="false" index="adt_store_idx"/>
+        <property name="storeProtocol" column="store_protocol" type="string" length="50" not-null="false" index="idx_alf_adtf_ref"/>
+        <property name="storeId" column="store_id" type="string" length="100" not-null="false" index="idx_alf_adtf_ref"/>
+        <property name="nodeUUID" column="node_uuid" type="string" length="36" not-null="false" index="idx_alf_adtf_ref"/>
         <property name="path" column="path" type="string" length="512" not-null="false"/>
         <property name="filtered" column="filtered" type="boolean" not-null="true"/>
         <property name="returnValue" column="return_val" type="string" length="1024" not-null="false"/>
@@ -67,16 +67,16 @@
         
         <!-- Date is used as the key for look up -->
        
-        <property name="date" column="date_only" type="date"                    index="adt_date_idx" not-null="true"/>
-        <property name="dayOfYear" column="day_of_year" type="integer"     index="adt_doy_idx"  not-null="true"/>
-        <property name="dayOfMonth" column="day_of_month" type="integer"   index="adt_dom_idx"  not-null="true"/>
-        <property name="dayOfWeek" column="day_of_week" type="integer"     index="adt_dow_idx"  not-null="true"/>
-        <property name="weekOfYear" column="week_of_year" type="integer"   index="adt_woy_idx"  not-null="true"/>
-        <property name="weekOfMonth" column="week_of_month" type="integer" index="adt_wom_idx"  not-null="true"/>
-        <property name="month" column="month" type="integer"               index="adt_m_idx"    not-null="true"/>
-        <property name="quarter" column="quarter" type="integer"           index="adt_q_idx"    not-null="true"/>
-        <property name="halfYear" column="halfYear" type="integer"         index="adt_hy_idx"   not-null="true"/>
-        <property name="year" column="year" type="integer"                 index="adt_y_idx"    not-null="true"/>        
+        <property name="date" column="date_only" type="date"               index="idx_alf_adtd_dat" not-null="true"/>
+        <property name="dayOfYear" column="day_of_year" type="integer"     index="idx_alf_adtd_doy" not-null="true"/>
+        <property name="dayOfMonth" column="day_of_month" type="integer"   index="idx_alf_adtd_dom" not-null="true"/>
+        <property name="dayOfWeek" column="day_of_week" type="integer"     index="idx_alf_adtd_dow" not-null="true"/>
+        <property name="weekOfYear" column="week_of_year" type="integer"   index="idx_alf_adtd_woy" not-null="true"/>
+        <property name="weekOfMonth" column="week_of_month" type="integer" index="idx_alf_adtd_wom" not-null="true"/>
+        <property name="month" column="month" type="integer"               index="idx_alf_adtd_m"   not-null="true"/>
+        <property name="quarter" column="quarter" type="integer"           index="idx_alf_adtd_q"   not-null="true"/>
+        <property name="halfYear" column="halfYear" type="integer"         index="idx_alf_adtd_hy"  not-null="true"/>
+        <property name="year" column="year" type="integer"                 index="idx_alf_adtd_y"   not-null="true"/>        
         
     </class>
     
@@ -109,9 +109,9 @@
         <!-- The app_source_idx index is used to find the app source -->
         <!-- The look up is always the tripple, the service and method or just the method may be null -->
         
-        <property name="application" column="application" type="string" length="255" not-null="true" index="app_source_app_idx"/>
-        <property name="service" column="service" type="string" length="255" not-null="false" index="app_source_ser_idx"/>
-        <property name="method" column="method" type="string" length="255" not-null="false" index="app_source_met_idx"/>
+        <property name="application" column="application" type="string" length="255" not-null="true" index="idx_alf_adts_app"/>
+        <property name="service" column="service" type="string" length="255" not-null="false" index="idx_alf_adts_ser"/>
+        <property name="method" column="method" type="string" length="255" not-null="false" index="idx_alf_adts_met"/>
         
     </class>
     

source/java/org/alfresco/repo/domain/hibernate/Permission.hbm.xml

@@ -92,13 +92,21 @@
         <natural-id mutable="true">
             <many-to-one name="accessControlList"
                 class="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl"
-                column="acl_id" lazy="no-proxy" fetch="select"
-                optimistic-lock="true" not-null="true"/>
+                column="acl_id"
+                foreign-key="fk_alf_aclm_acl"
+                lazy="no-proxy"
+                fetch="select"
+                optimistic-lock="true"
+                not-null="true"/>
             
             <many-to-one name="accessControlEntry"
                 class="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl"
-                column="ace_id" lazy="no-proxy" fetch="select"
-                optimistic-lock="true" not-null="true"/>
+                column="ace_id"
+                foreign-key="fk_alf_aclm_ace"
+                lazy="no-proxy"
+                fetch="select"
+                optimistic-lock="true"
+                not-null="true"/>
             
             <property name="position" column="pos" type="int"/>
         </natural-id>
@@ -230,13 +238,21 @@
         <natural-id mutable="true">
             <many-to-one name="authority"
                 class="org.alfresco.repo.domain.hibernate.DbAuthorityImpl"
-                column="auth_id" lazy="no-proxy" fetch="select"
-                optimistic-lock="true" not-null="true"/>
+                column="auth_id"
+                foreign-key="fk_alf_autha_aut"
+                lazy="no-proxy"
+                fetch="select"
+                optimistic-lock="true"
+                not-null="true"/>
             
             <many-to-one name="alias"
                 class="org.alfresco.repo.domain.hibernate.DbAuthorityImpl"
-                column="alias_id" lazy="no-proxy" fetch="select"
-                optimistic-lock="true" not-null="true"/>
+                column="alias_id"
+                foreign-key="fk_alf_autha_ali"
+                lazy="no-proxy"
+                fetch="select"
+                optimistic-lock="true"
+                not-null="true"/>
         </natural-id>
         
         <version column="version" name="version" type="long"/>

source/java/org/alfresco/repo/domain/hibernate/Transaction.hbm.xml

@@ -33,7 +33,7 @@
             not-null="false"
             cascade="none" />
       <property name="changeTxnId" column="change_txn_id" type="string" length="56" not-null="true" />
-      <property name="commitTimeMs" column="commit_time_ms" type="long" not-null="false" index="idx_commit_time_ms" />
+      <property name="commitTimeMs" column="commit_time_ms" type="long" not-null="false" index="idx_alf_txn_ctms" />
    </class>
 
    <class

source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java

@@ -654,7 +654,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
         }
         
         InputStream scriptInputStream = new FileInputStream(scriptFile);
-        BufferedReader reader = new BufferedReader(new InputStreamReader(scriptInputStream, "UTF8"));
+        BufferedReader reader = new BufferedReader(new InputStreamReader(scriptInputStream, "UTF-8"));
         try
         {
             int line = 0;
@@ -695,11 +695,21 @@ public class SchemaBootstrap extends AbstractLifecycleBean
                     execute = true;
                     optional = false;
                 }
-                else if (sql.endsWith(";(optional)"))
+                else if (sql.endsWith("(optional)") || sql.endsWith("(OPTIONAL)"))
                 {
-                    sql = sql.substring(0, sql.length() - 11);
-                    execute = true;
-                    optional = true;
+                    // Get the end of statement
+                    int endIndex = sql.lastIndexOf(';');
+                    if (endIndex > 0)
+                    {
+                        sql = sql.substring(0, endIndex);
+                        execute = true;
+                        optional = true;
+                    }
+                    else
+                    {
+                        // Ends with "(optional)" but there is no semi-colon.
+                        // Just take it at face value and probably fail.
+                    }
                 }
                 // append to the statement being built up
                 sb.append(" ").append(sql);