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

@@ -81,6 +81,7 @@
              <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-AuditTables.sql</value>
              <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-AvmTables.sql</value>
              <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-ActivityTables.sql</value>
+             <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-UsageTables.sql</value>
           </list>
        </property>
        <property name="postCreateScriptUrls">
@@ -109,6 +110,7 @@
              <ref bean="patch.db-V3.2-Child-Assoc-QName-CRC" />
              <ref bean="patch.db-V3.3-modify-index-permission_id" />
              <ref bean="patch.db-V3.2-AddFKIndexes" />
+             <ref bean="patch.db-V3.4-UsageTables" />
           </list>
        </property>
        <property name="postUpdateScriptPatches">

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;

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

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;

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

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

@@ -847,6 +847,23 @@
         </property>
     </bean>
     
+   <bean id="patch.db-V3.4-UsageTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V3.4-UsageTables</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>113</value></property>
+        <property name="targetSchema"><value>114</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-UsageTables.sql</value>
+        </property>
+        <property name="alternatives" >
+            <list>
+                <ref bean="patch.db-V2.2-Upgrade-From-2.1" />
+                <ref bean="patch.db-V2.2-Upgrade-From-2.2SP1" />
+            </list>
+        </property>
+    </bean>
+    
     <bean id="patch.deploymentMigration" class="org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch" parent="basePatch" >
         <property name="id"><value>patch.deploymentMigration</value></property>
         <property name="description"><value>patch.deploymentMigration.description</value></property>