From 0e7398576d37daff811a530f85336db1779dd273 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 14 Oct 2014 14:58:37 +0000 Subject: [PATCH] ACE-2030: Clean up patches on unsupported upgrade paths to 5.0 88058: ACE-2030: Start process of retiring patches leading up to 4.0a 88061: ACE-2030: Remove unused SQL scripts for newly-retired patches 88062: ACE-2030: Change class names for all generic patches. 88064: ACE-2030: Remove unused patch implementation classes and fixes to get upgrade working again. 88067: ACE-2030: Clean up unused code and SQL for PatchDAO git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AlfrescoPostCreate-JBPM-FK-indexes.sql | 13 - .../AlfrescoCreate-SubscriptionTables.sql | 12 - .../AlfrescoPostCreate-JBPM-FK-indexes.sql | 12 - .../AlfrescoCreate-SubscriptionTables.sql | 12 - .../alfresco/dbscripts/db-schema-context.xml | 6 - ...rchar-field-sizes-quadruple-increasing.sql | 21 - .../AclChangeSet-Tracking.sql | 36 -- .../Node-Locale.sql | 30 - .../NodeAssoc-Ordering.sql | 68 --- .../AclChangeSet-Tracking.sql | 38 -- .../Node-Locale.sql | 32 -- .../NodeAssoc-Ordering.sql | 70 --- .../patch-common-SqlMap.xml | 223 -------- .../messages/patch-service.properties | 15 +- .../alfresco/patch/patch-services-context.xml | 492 ---------------- .../patch/retired-patches-context.xml | 273 ++++++++- .../impl/ActivitiesTemplatesUpdatePatch.java | 91 --- .../patch/impl/ClearOldImapMessgesPatch.java | 137 ----- .../impl/ClearOldImapTemplatesPatch2.java | 152 ----- .../patch/impl/CopiedFromAspectPatch.java | 532 ------------------ .../patch/impl/FixAclInheritancePatch.java | 394 ------------- .../admin/patch/impl/FixUserQNamesPatch.java | 180 ------ .../impl/MigrateAttrDropOldTablesPatch.java | 52 -- .../MultiTFixAdminExistingTenantsPatch.java | 137 ----- .../impl/SitesSpacePermissionsPatch.java | 159 ------ .../alfresco/repo/domain/patch/PatchDAO.java | 31 - .../domain/patch/ibatis/PatchDAOImpl.java | 78 --- 27 files changed, 273 insertions(+), 3023 deletions(-) delete mode 100644 config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.Dialect/varchar-field-sizes-quadruple-increasing.sql delete mode 100644 config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql delete mode 100644 config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/Node-Locale.sql delete mode 100644 config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/NodeAssoc-Ordering.sql delete mode 100644 config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql delete mode 100644 config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/Node-Locale.sql delete mode 100644 config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/NodeAssoc-Ordering.sql delete mode 100644 source/java/org/alfresco/repo/admin/patch/impl/ActivitiesTemplatesUpdatePatch.java delete mode 100644 source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapMessgesPatch.java delete mode 100644 source/java/org/alfresco/repo/admin/patch/impl/ClearOldImapTemplatesPatch2.java delete mode 100644 source/java/org/alfresco/repo/admin/patch/impl/CopiedFromAspectPatch.java delete mode 100644 source/java/org/alfresco/repo/admin/patch/impl/FixAclInheritancePatch.java delete mode 100644 source/java/org/alfresco/repo/admin/patch/impl/FixUserQNamesPatch.java delete mode 100644 source/java/org/alfresco/repo/admin/patch/impl/MigrateAttrDropOldTablesPatch.java delete mode 100644 source/java/org/alfresco/repo/admin/patch/impl/MultiTFixAdminExistingTenantsPatch.java delete mode 100644 source/java/org/alfresco/repo/admin/patch/impl/SitesSpacePermissionsPatch.java diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.Dialect/AlfrescoPostCreate-JBPM-FK-indexes.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.Dialect/AlfrescoPostCreate-JBPM-FK-indexes.sql index c33e74115a..c559403afd 100644 --- a/config/alfresco/dbscripts/create/org.hibernate.dialect.Dialect/AlfrescoPostCreate-JBPM-FK-indexes.sql +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.Dialect/AlfrescoPostCreate-JBPM-FK-indexes.sql @@ -94,16 +94,3 @@ CREATE INDEX FK_VARINST_TKVARMP ON JBPM_VARIABLEINSTANCE (TOKENVARIABLEMAP_); -- CREATE INDEX FK_VARINST_TK ON JBPM_VARIABLEINSTANCE (TOKEN_); --(optional) CREATE INDEX FK_BYTEINST_ARRAY ON JBPM_VARIABLEINSTANCE (BYTEARRAYVALUE_); --(optional) CREATE INDEX FK_VAR_TSKINST ON JBPM_VARIABLEINSTANCE (TASKINSTANCE_); --(optional) - - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.4-JBPM-FK-indexes'; -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-V3.4-JBPM-FK-indexes', 'Manually executed script upgrade to add FK indexes for JBPM', - 0, 4305, -1, 4306, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql index 4f937c7ce4..0d95cc6bfc 100644 --- a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql @@ -15,15 +15,3 @@ CREATE TABLE alf_subscriptions CONSTRAINT fk_alf_sub_user FOREIGN KEY (user_node_id) REFERENCES alf_node(id) ON DELETE CASCADE, CONSTRAINT fk_alf_sub_node FOREIGN KEY (node_id) REFERENCES alf_node(id) ON DELETE CASCADE ) ENGINE=InnoDB; - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-SubscriptionTables'; -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-V4.0-SubscriptionTables', 'Manually executed script upgrade V4.0: Subscription Tables', - 0, 5010, -1, 5011, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoPostCreate-JBPM-FK-indexes.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoPostCreate-JBPM-FK-indexes.sql index 3df4d6fd47..68f8345313 100644 --- a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoPostCreate-JBPM-FK-indexes.sql +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoPostCreate-JBPM-FK-indexes.sql @@ -8,15 +8,3 @@ -- -- do nothing for mysql - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.4-JBPM-FK-indexes'; -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-V3.4-JBPM-FK-indexes', 'Manually executed script upgrade to add FK indexes for JBPM', - 0, 4305, -1, 4306, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql index 51adfd9209..43e5e949fb 100644 --- a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql @@ -16,15 +16,3 @@ CREATE TABLE alf_subscriptions CONSTRAINT fk_alf_sub_node FOREIGN KEY (node_id) REFERENCES alf_node(id) ON DELETE CASCADE ); CREATE INDEX fk_alf_sub_node ON alf_subscriptions (node_id); - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-SubscriptionTables'; -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-V4.0-SubscriptionTables', 'Manually executed script upgrade V4.0: Subscription Tables', - 0, 5010, -1, 5011, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); diff --git a/config/alfresco/dbscripts/db-schema-context.xml b/config/alfresco/dbscripts/db-schema-context.xml index 68f770b93c..224f8b9563 100644 --- a/config/alfresco/dbscripts/db-schema-context.xml +++ b/config/alfresco/dbscripts/db-schema-context.xml @@ -46,11 +46,6 @@ - - - - - @@ -94,7 +89,6 @@ - diff --git a/config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.Dialect/varchar-field-sizes-quadruple-increasing.sql b/config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.Dialect/varchar-field-sizes-quadruple-increasing.sql deleted file mode 100644 index 29bd0ec2e6..0000000000 --- a/config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.Dialect/varchar-field-sizes-quadruple-increasing.sql +++ /dev/null @@ -1,21 +0,0 @@ --- --- Title: Increasing 'VARCHAR' field sizes quadruply for DB2 dialect --- Database: Generic --- Since: V3.4 --- Author: Dmitry Velichkevich --- --- Please contact support@alfresco.com if you need assistance with the upgrade. --- --- ALF-4300: DB2: Review schema (eg. VARCHAR columns) with respect to multi-byte support (when using DB2 / UTF-8) - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.4-VarcharFieldSizesQuadrupleIncreasing'; -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-V3.4-VarcharFieldSizesQuadrupleIncreasing', 'Increasing VARCHAR field sizes quadruply for DB2 dialect V3.4', - 0, 4303, -1, 4304, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed' -); diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql deleted file mode 100644 index 7da3bc6583..0000000000 --- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql +++ /dev/null @@ -1,36 +0,0 @@ --- --- Title: Update ACL Change Set for Change Tracking --- Database: MySQL --- Since: V4.0 Schema 5008 --- Author: Derek Hulley --- --- Please contact support@alfresco.com if you need assistance with the upgrade. --- - --- Rename redundant 'version' to indexed 'commit_time_ms' -ALTER TABLE alf_acl_change_set - CHANGE COLUMN version commit_time_ms BIGINT(20) NULL; - --- Fill with data ---FOREACH alf_acl_change_set.id system.upgrade.alf_acl_change_set.batchsize -UPDATE alf_acl_change_set - SET - commit_time_ms = ${NOW} + id - WHERE - id >= ${LOWERBOUND} AND id <= ${UPPERBOUND} -; - --- Add index on new data -CREATE INDEX idx_alf_acs_ctms ON alf_acl_change_set (commit_time_ms); - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-AclChangeSet'; -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-V4.0-AclChangeSet', 'Manually executed script upgrade V4.0: Update ACL Change Set for Change Tracking', - 0, 5007, -1, 5008, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/Node-Locale.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/Node-Locale.sql deleted file mode 100644 index b222e08e8a..0000000000 --- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/Node-Locale.sql +++ /dev/null @@ -1,30 +0,0 @@ --- --- Title: Add 'locale_id' column to 'alf_node' --- Database: MySQL --- Since: V4.0 Schema 5010 --- Author: Derek Hulley --- --- Please contact support@alfresco.com if you need assistance with the upgrade. --- - ---ASSIGN:def_locale_id=id -SELECT id FROM alf_locale WHERE locale_str = '.default'; - --- Add the column, using a default to fill -ALTER TABLE alf_node - ADD COLUMN locale_id INT8 NOT NULL DEFAULT ${def_locale_id} AFTER type_qname_id, - ADD KEY fk_alf_node_loc (locale_id), - ADD CONSTRAINT fk_alf_node_loc FOREIGN KEY (locale_id) REFERENCES alf_locale (id) -; - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-Node-Locale'; -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-V4.0-Node-Locale', 'Manually executed script upgrade V4.0: Add locale_id column to alf_node', - 0, 5009, -1, 5010, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/NodeAssoc-Ordering.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/NodeAssoc-Ordering.sql deleted file mode 100644 index d37596e552..0000000000 --- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/NodeAssoc-Ordering.sql +++ /dev/null @@ -1,68 +0,0 @@ --- --- Title: Add 'assoc_index' column to 'alf_node_assoc' --- Database: MySQL --- Since: V4.0 Schema 5008 --- Author: Derek Hulley --- --- Please contact support@alfresco.com if you need assistance with the upgrade. --- - --- Cut the original table to just the data -ALTER TABLE alf_node_assoc - DROP FOREIGN KEY fk_alf_nass_snode, - DROP FOREIGN KEY fk_alf_nass_tnode, - DROP FOREIGN KEY fk_alf_nass_tqn, - DROP INDEX source_node_id, - DROP INDEX fk_alf_nass_snode, - DROP INDEX fk_alf_nass_tnode, - DROP INDEX fk_alf_nass_tqn; -ALTER TABLE alf_node_assoc - RENAME TO t_alf_node_assoc; - --- So now it's just raw data --- Reconstruct the table -CREATE TABLE alf_node_assoc -( - id BIGINT NOT NULL AUTO_INCREMENT, - version BIGINT NOT NULL, - source_node_id BIGINT NOT NULL, - target_node_id BIGINT NOT NULL, - type_qname_id BIGINT NOT NULL, - assoc_index BIGINT NOT NULL, - PRIMARY KEY (id), - UNIQUE KEY source_node_id (source_node_id, target_node_id, type_qname_id), - KEY fk_alf_nass_snode (source_node_id, type_qname_id, assoc_index), - KEY fk_alf_nass_tnode (target_node_id, type_qname_id), - KEY fk_alf_nass_tqn (type_qname_id), - CONSTRAINT fk_alf_nass_snode FOREIGN KEY (source_node_id) REFERENCES alf_node (id), - CONSTRAINT fk_alf_nass_tnode FOREIGN KEY (target_node_id) REFERENCES alf_node (id), - CONSTRAINT fk_alf_nass_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id) -) ENGINE=InnoDB; - --- Copy the data over ---FOREACH t_alf_node_assoc.id system.upgrade.alf_node_assoc.batchsize -INSERT INTO alf_node_assoc - (id, version, source_node_id, target_node_id, type_qname_id, assoc_index) - ( - SELECT - id, 1, source_node_id, target_node_id, type_qname_id, 1 - FROM - t_alf_node_assoc - WHERE - id >= ${LOWERBOUND} AND id <= ${UPPERBOUND} - ); - --- Drop old data -DROP TABLE t_alf_node_assoc; - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-NodeAssoc-Ordering'; -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-V4.0-NodeAssoc-Ordering', 'Manually executed script upgrade V4.0: Add assoc_index column to alf_node_assoc', - 0, 5008, -1, 5009, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql deleted file mode 100644 index f55aedb476..0000000000 --- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql +++ /dev/null @@ -1,38 +0,0 @@ --- --- Title: Update ACL Change Set for Change Tracking --- Database: PostgreSQL --- Since: V4.0 Schema 5008 --- Author: Derek Hulley --- --- Please contact support@alfresco.com if you need assistance with the upgrade. --- - --- Rename redundant 'version' to indexed 'commit_time_ms' -ALTER TABLE alf_acl_change_set - RENAME "version" TO commit_time_ms; -ALTER TABLE alf_acl_change_set - ALTER COLUMN commit_time_ms DROP NOT NULL; - --- Fill with data ---FOREACH alf_acl_change_set.id system.upgrade.alf_acl_change_set.batchsize -UPDATE alf_acl_change_set - SET - commit_time_ms = ${NOW} + id - WHERE - id >= ${LOWERBOUND} AND id <= ${UPPERBOUND} -; - --- Add index on new data -CREATE INDEX idx_alf_acs_ctms ON alf_acl_change_set (commit_time_ms); - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-AclChangeSet'; -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-V4.0-AclChangeSet', 'Manually executed script upgrade V4.0: Update ACL Change Set for Change Tracking', - 0, 5007, -1, 5008, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/Node-Locale.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/Node-Locale.sql deleted file mode 100644 index a617442cd1..0000000000 --- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/Node-Locale.sql +++ /dev/null @@ -1,32 +0,0 @@ --- --- Title: Add 'locale_id' column to 'alf_node' --- Database: PostgreSQL --- Since: V4.0 Schema 5010 --- Author: Derek Hulley --- --- Please contact support@alfresco.com if you need assistance with the upgrade. --- - ---ASSIGN:def_locale_id=id -SELECT id FROM alf_locale WHERE locale_str = '.default'; - --- Add the column, using a default to fill -ALTER TABLE alf_node - ADD COLUMN locale_id INT8 NOT NULL DEFAULT ${def_locale_id} -; -ALTER TABLE alf_node - ADD CONSTRAINT fk_alf_node_loc FOREIGN KEY (locale_id) REFERENCES alf_locale (id) -; -CREATE INDEX fk_alf_node_loc ON alf_node (locale_id); - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-Node-Locale'; -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-V4.0-Node-Locale', 'Manually executed script upgrade V4.0: Add locale_id column to alf_node', - 0, 5009, -1, 5010, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/NodeAssoc-Ordering.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/NodeAssoc-Ordering.sql deleted file mode 100644 index a533ebde41..0000000000 --- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/NodeAssoc-Ordering.sql +++ /dev/null @@ -1,70 +0,0 @@ --- --- Title: Add 'assoc_index' column to 'alf_node_assoc' --- Database: PostgreSQL --- Since: V4.0 Schema 5008 --- Author: Derek Hulley --- --- Please contact support@alfresco.com if you need assistance with the upgrade. --- - --- Cut the original table to just the data -DROP INDEX source_node_id; --(optional) -DROP INDEX alf_node_assoc_source_node_id_key; --(optional) -DROP INDEX fk_alf_nass_snode; -DROP INDEX fk_alf_nass_tnode; -DROP INDEX fk_alf_nass_tqn; -ALTER TABLE alf_node_assoc - DROP CONSTRAINT fk_alf_nass_snode; -ALTER TABLE alf_node_assoc - DROP CONSTRAINT fk_alf_nass_tnode; -ALTER TABLE alf_node_assoc - DROP CONSTRAINT fk_alf_nass_tqn; -ALTER TABLE alf_node_assoc RENAME TO t_alf_node_assoc; - --- So now it's just raw data --- Reconstruct the table (leave the sequence as is) -CREATE TABLE alf_node_assoc -( - id INT8 NOT NULL, - version INT8 NOT NULL, - source_node_id INT8 NOT NULL, - target_node_id INT8 NOT NULL, - type_qname_id INT8 NOT NULL, - assoc_index INT8 NOT NULL, - PRIMARY KEY (id), - CONSTRAINT fk_alf_nass_snode FOREIGN KEY (source_node_id) REFERENCES alf_node (id), - CONSTRAINT fk_alf_nass_tnode FOREIGN KEY (target_node_id) REFERENCES alf_node (id), - CONSTRAINT fk_alf_nass_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id) -); -CREATE UNIQUE INDEX source_node_id ON alf_node_assoc (source_node_id, target_node_id, type_qname_id); -CREATE INDEX fk_alf_nass_snode ON alf_node_assoc (source_node_id, type_qname_id, assoc_index); -CREATE INDEX fk_alf_nass_tnode ON alf_node_assoc (target_node_id, type_qname_id); -CREATE INDEX fk_alf_nass_tqn ON alf_node_assoc (type_qname_id); - --- Copy the data over ---FOREACH t_alf_node_assoc.id system.upgrade.alf_node_assoc.batchsize -INSERT INTO alf_node_assoc - (id, version, source_node_id, target_node_id, type_qname_id, assoc_index) - ( - SELECT - id, 1, source_node_id, target_node_id, type_qname_id, 1 - FROM - t_alf_node_assoc - WHERE - id >= ${LOWERBOUND} AND id <= ${UPPERBOUND} - ); - --- Drop old data -DROP TABLE t_alf_node_assoc; - --- --- Record script finish --- -DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.0-NodeAssoc-Ordering'; -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-V4.0-NodeAssoc-Ordering', 'Manually executed script upgrade V4.0: Add assoc_index column to alf_node_assoc', - 0, 5008, -1, 5009, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' - ); \ No newline at end of file diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml index 28bda761f7..40d9ba6f59 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml @@ -8,68 +8,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -84,25 +27,11 @@ - - - - - - - - - - - - - - @@ -161,138 +90,6 @@ np.string_value like #{namePattern} - - - - - - - - - -