From 96761a1c29ffdb3135642a2e6d5ca43de4c18eae Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 23 Aug 2010 16:12:27 +0000 Subject: [PATCH] Fixed ALF-4431: Upgrade fails to create UsageDelta tables - Moved creation of alf_usage_delta in AlfresocCreate-UsageTables.sql - Ensured that alternative SQL scripts are respected when upgrading from 2.1 or 2.2.1 - Only applies for 2.2.2-2.2.x - All DB create scripts affected and need checking git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/bootstrap-context.xml | 2 ++ .../AlfrescoCreate-RepoTables.sql | 11 ------- .../AlfrescoCreate-UsageTables.sql | 31 ++++++++++++++++++ .../AlfrescoCreate-RepoTables.sql | 12 ------- .../AlfrescoCreate-UsageTables.sql | 32 +++++++++++++++++++ .../alfresco/patch/patch-services-context.xml | 17 ++++++++++ 6 files changed, 82 insertions(+), 23 deletions(-) create mode 100644 config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql create mode 100644 config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml index 0e40a6109b..44a37c5dfa 100644 --- a/config/alfresco/bootstrap-context.xml +++ b/config/alfresco/bootstrap-context.xml @@ -81,6 +81,7 @@ classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-AuditTables.sql classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-AvmTables.sql classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-ActivityTables.sql + classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-UsageTables.sql @@ -109,6 +110,7 @@ + diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql index 4442b181e1..c711410ec1 100644 --- a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql @@ -441,14 +441,3 @@ CREATE TABLE alf_node_properties CONSTRAINT fk_alf_nprop_n FOREIGN KEY (node_id) REFERENCES alf_node (id), CONSTRAINT fk_alf_nprop_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id) ) ENGINE=InnoDB; - -CREATE TABLE alf_usage_delta -( - id BIGINT NOT NULL AUTO_INCREMENT, - version BIGINT NOT NULL, - node_id BIGINT NOT NULL, - delta_size BIGINT NOT NULL, - PRIMARY KEY (id), - KEY fk_alf_usaged_n (node_id), - CONSTRAINT fk_alf_usaged_n FOREIGN KEY (node_id) REFERENCES alf_node (id) -) ENGINE=InnoDB; diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql new file mode 100644 index 0000000000..3ec28b1b26 --- /dev/null +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql @@ -0,0 +1,31 @@ +-- +-- Title: User usage tables +-- Database: MySQL InnoDB +-- Since: V3.4 Schema 4110 +-- Author: Derek Hulley +-- +-- Please contact support@alfresco.com if you need assistance with the upgrade. +-- + +CREATE TABLE alf_usage_delta +( + id BIGINT NOT NULL AUTO_INCREMENT, + version BIGINT NOT NULL, + node_id BIGINT NOT NULL, + delta_size BIGINT NOT NULL, + PRIMARY KEY (id), + KEY fk_alf_usaged_n (node_id), + CONSTRAINT fk_alf_usaged_n FOREIGN KEY (node_id) REFERENCES alf_node (id) +) ENGINE=InnoDB; + +-- +-- Record script finish +-- +DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.4-UsageTables'; +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-UsageTables', 'Manually executed script upgrade V3.4: Usage Tables', + 0, 113, -1, 114, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' + ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql index 619aa40188..1644322aee 100644 --- a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql @@ -464,15 +464,3 @@ CREATE TABLE alf_node_properties CREATE INDEX fk_alf_nprop_n ON alf_node_properties (node_id); CREATE INDEX fk_alf_nprop_qn ON alf_node_properties (qname_id); CREATE INDEX fk_alf_nprop_loc ON alf_node_properties (locale_id); - -CREATE TABLE alf_usage_delta -( - id INT8 NOT NULL, - version INT8 NOT NULL, - node_id INT8 NOT NULL, - delta_size INT8 NOT NULL, - PRIMARY KEY (id), - CONSTRAINT fk_alf_usaged_n FOREIGN KEY (node_id) REFERENCES alf_node (id) -); -CREATE INDEX fk_alf_usaged_n ON alf_usage_delta (node_id); -CREATE SEQUENCE alf_usage_delta_seq START WITH 1 INCREMENT BY 1; diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql new file mode 100644 index 0000000000..4ecf5ecf2a --- /dev/null +++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql @@ -0,0 +1,32 @@ +-- +-- Title: User usage tables +-- Database: PostgreSQL +-- Since: V3.4 Schema 4110 +-- Author: Derek Hulley +-- +-- Please contact support@alfresco.com if you need assistance with the upgrade. +-- + +CREATE TABLE alf_usage_delta +( + id INT8 NOT NULL, + version INT8 NOT NULL, + node_id INT8 NOT NULL, + delta_size INT8 NOT NULL, + PRIMARY KEY (id), + CONSTRAINT fk_alf_usaged_n FOREIGN KEY (node_id) REFERENCES alf_node (id) +); +CREATE INDEX fk_alf_usaged_n ON alf_usage_delta (node_id); +CREATE SEQUENCE alf_usage_delta_seq START WITH 1 INCREMENT BY 1; + +-- +-- Record script finish +-- +DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.4-UsageTables'; +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-UsageTables', 'Manually executed script upgrade V3.4: Usage Tables', + 0, 113, -1, 114, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed' + ); \ No newline at end of file diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml index 46b3ed9f11..75f5ee3712 100644 --- a/config/alfresco/patch/patch-services-context.xml +++ b/config/alfresco/patch/patch-services-context.xml @@ -847,6 +847,23 @@ + + patch.db-V3.4-UsageTables + patch.schemaUpgradeScript.description + 0 + 113 + 114 + + classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-UsageTables.sql + + + + + + + + + patch.deploymentMigration patch.deploymentMigration.description