SAIL-372: Fix Activities DAO fallout - upgrades require table creation to be separated out and patched in

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20846 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/bootstrap-context.xml

@@ -74,6 +74,7 @@
              <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-PropertyValueTables.sql</value>
              <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>
           </list>
        </property>
        <property name="postCreateScriptUrls">
@@ -113,7 +114,7 @@
              <ref bean="patch.db-V2.1-JBPMProcessKey" />
              <ref bean="patch.db-V2.1-RemoveWcmSubmittedAspect" />
              <ref bean="patch.db-V2.1-AuditPathIndex" />
-             <ref bean="patch.db-V3.0-0-CreateActivitiesExtras" />
+             <ref bean="patch.db-V3.0-ActivityTables" />
              <ref bean="patch.db-V3.1-Allow-IPv6" />
              <ref bean="patch.db-V3.2-Remove-AVM-Issuer" />
              <ref bean="patch.db-V3.2-Modify-AVM-MimeType" />

config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-ActivityTables.sql

@@ -0,0 +1,70 @@
+--
+-- Title:      Activity tables
+-- Database:   MySQL InnoDB
+-- Since:      V3.0 Schema 126
+-- Author:     janv
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+CREATE TABLE alf_activity_feed
+(
+    id BIGINT NOT NULL AUTO_INCREMENT,
+    post_id BIGINT,
+    post_date DATETIME NOT NULL,
+    activity_summary TEXT,
+    feed_user_id VARCHAR(255),
+    activity_type VARCHAR(255) NOT NULL,
+    activity_format VARCHAR(10),
+    site_network VARCHAR(255),
+    app_tool VARCHAR(36),
+    post_user_id VARCHAR(255) NOT NULL,
+    feed_date DATETIME NOT NULL,
+    PRIMARY KEY (id),
+    KEY feed_postdate_idx (post_date),
+    KEY feed_postuserid_idx (post_user_id),
+    KEY feed_feeduserid_idx (feed_user_id),
+    KEY feed_sitenetwork_idx (site_network),
+    KEY feed_activityformat_idx (activity_format)
+) ENGINE=InnoDB;
+
+CREATE TABLE alf_activity_feed_control
+(
+    id BIGINT NOT NULL AUTO_INCREMENT,
+    feed_user_id VARCHAR(255) NOT NULL,
+    site_network VARCHAR(255),
+    app_tool VARCHAR(36),
+    last_modified DATETIME NOT NULL,
+    PRIMARY KEY (id),
+    KEY feedctrl_feeduserid_idx (feed_user_id)
+) ENGINE=InnoDB;
+
+CREATE TABLE alf_activity_post
+(
+    sequence_id BIGINT NOT NULL AUTO_INCREMENT,
+    post_date DATETIME NOT NULL,
+    status VARCHAR(10) NOT NULL,
+    activity_data TEXT NOT NULL,
+    post_user_id VARCHAR(255) NOT NULL,
+    job_task_node INTEGER NOT NULL,
+    site_network VARCHAR(255),
+    app_tool VARCHAR(36),
+    activity_type VARCHAR(255) NOT NULL,
+    last_modified DATETIME NOT NULL,
+    PRIMARY KEY (sequence_id),
+    KEY post_jobtasknode_idx (job_task_node),
+    KEY post_status_idx (status)
+) ENGINE=InnoDB;
+
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.0-ActivityTables';
+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.0-ActivityTables', 'Manually executed script upgrade V3.0: Activity Tables',
+    0, 125, -1, 126, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
+  );

config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql

@@ -153,55 +153,6 @@ CREATE TABLE alf_authority_alias
     CONSTRAINT fk_alf_autha_ali FOREIGN KEY (alias_id) REFERENCES alf_authority (id)
 ) ENGINE=InnoDB;
 
-CREATE TABLE alf_activity_feed
-(
-    id BIGINT NOT NULL AUTO_INCREMENT,
-    post_id BIGINT,
-    post_date DATETIME NOT NULL,
-    activity_summary TEXT,
-    feed_user_id VARCHAR(255),
-    activity_type VARCHAR(255) NOT NULL,
-    activity_format VARCHAR(10),
-    site_network VARCHAR(255),
-    app_tool VARCHAR(36),
-    post_user_id VARCHAR(255) NOT NULL,
-    feed_date DATETIME NOT NULL,
-    PRIMARY KEY (id),
-    KEY feed_postdate_idx (post_date),
-    KEY feed_postuserid_idx (post_user_id),
-    KEY feed_feeduserid_idx (feed_user_id),
-    KEY feed_sitenetwork_idx (site_network),
-    KEY feed_activityformat_idx (activity_format)
-) ENGINE=InnoDB;
-
-CREATE TABLE alf_activity_feed_control
-(
-    id BIGINT NOT NULL AUTO_INCREMENT,
-    feed_user_id VARCHAR(255) NOT NULL,
-    site_network VARCHAR(255),
-    app_tool VARCHAR(36),
-    last_modified DATETIME NOT NULL,
-    PRIMARY KEY (id),
-    KEY feedctrl_feeduserid_idx (feed_user_id)
-) ENGINE=InnoDB;
-
-CREATE TABLE alf_activity_post
-(
-    sequence_id BIGINT NOT NULL AUTO_INCREMENT,
-    post_date DATETIME NOT NULL,
-    status VARCHAR(10) NOT NULL,
-    activity_data TEXT NOT NULL,
-    post_user_id VARCHAR(255) NOT NULL,
-    job_task_node INTEGER NOT NULL,
-    site_network VARCHAR(255),
-    app_tool VARCHAR(36),
-    activity_type VARCHAR(255) NOT NULL,
-    last_modified DATETIME NOT NULL,
-    PRIMARY KEY (sequence_id),
-    KEY post_jobtasknode_idx (job_task_node),
-    KEY post_status_idx (status)
-) ENGINE=InnoDB;
-
 CREATE TABLE alf_audit_config
 (
     id BIGINT NOT NULL AUTO_INCREMENT,

config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-ActivityTables.sql

@@ -0,0 +1,73 @@
+--
+-- Title:      Activity tables
+-- Database:   PostgreSQL
+-- Since:      V3.0 Schema 126
+-- Author:     janv
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+CREATE TABLE alf_activity_feed
+(
+    id INT8 NOT NULL,
+    post_id INT8,
+    post_date TIMESTAMP NOT NULL,
+    activity_summary VARCHAR(1024),
+    feed_user_id VARCHAR(255),
+    activity_type VARCHAR(255) NOT NULL,
+    activity_format VARCHAR(10),
+    site_network VARCHAR(255),
+    app_tool VARCHAR(36),
+    post_user_id VARCHAR(255) NOT NULL,
+    feed_date TIMESTAMP NOT NULL,
+    PRIMARY KEY (id)
+);
+CREATE INDEX feed_postdate_idx ON alf_activity_feed (post_date);
+CREATE INDEX feed_postuserid_idx ON alf_activity_feed (post_user_id);
+CREATE INDEX feed_feeduserid_idx ON alf_activity_feed (feed_user_id);
+CREATE INDEX feed_sitenetwork_idx ON alf_activity_feed (site_network);
+CREATE INDEX feed_activityformat_idx ON alf_activity_feed (activity_format);
+CREATE SEQUENCE alf_activity_feed_seq START WITH 1 INCREMENT BY 1;
+
+CREATE TABLE alf_activity_feed_control
+(
+    id INT8 NOT NULL,
+    feed_user_id VARCHAR(255) NOT NULL,
+    site_network VARCHAR(255),
+    app_tool VARCHAR(36),
+    last_modified TIMESTAMP NOT NULL,
+    PRIMARY KEY (id)    
+);
+CREATE INDEX feedctrl_feeduserid_idx ON alf_activity_feed_control (feed_user_id);
+CREATE SEQUENCE alf_activity_feed_control_seq START WITH 1 INCREMENT BY 1;
+
+CREATE TABLE alf_activity_post
+(
+    sequence_id INT8 NOT NULL,
+    post_date TIMESTAMP NOT NULL,
+    status VARCHAR(10) NOT NULL,
+    activity_data VARCHAR(1024) NOT NULL,
+    post_user_id VARCHAR(255) NOT NULL,
+    job_task_node INT4 NOT NULL,
+    site_network VARCHAR(255),
+    app_tool VARCHAR(36),
+    activity_type VARCHAR(255) NOT NULL,
+    last_modified TIMESTAMP NOT NULL,
+    PRIMARY KEY (sequence_id)
+);
+CREATE INDEX post_jobtasknode_idx ON alf_activity_post (job_task_node);
+CREATE INDEX post_status_idx ON alf_activity_post (status);
+CREATE SEQUENCE alf_activity_post_seq START WITH 1 INCREMENT BY 1;
+
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.0-ActivityTables';
+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.0-ActivityTables', 'Manually executed script upgrade V3.0: Activity Tables',
+    0, 125, -1, 126, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
+  );

config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql

@@ -164,58 +164,6 @@ CREATE INDEX fk_alf_autha_ali ON alf_authority_alias (alias_id);
 CREATE INDEX fk_alf_autha_aut ON alf_authority_alias (auth_id);
 CREATE SEQUENCE alf_authority_alias_seq START WITH 1 INCREMENT BY 1;
 
-CREATE TABLE alf_activity_feed
-(
-    id INT8 NOT NULL,
-    post_id INT8,
-    post_date TIMESTAMP NOT NULL,
-    activity_summary VARCHAR(1024),
-    feed_user_id VARCHAR(255),
-    activity_type VARCHAR(255) NOT NULL,
-    activity_format VARCHAR(10),
-    site_network VARCHAR(255),
-    app_tool VARCHAR(36),
-    post_user_id VARCHAR(255) NOT NULL,
-    feed_date TIMESTAMP NOT NULL,
-    PRIMARY KEY (id)
-);
-CREATE INDEX feed_postdate_idx ON alf_activity_feed (post_date);
-CREATE INDEX feed_postuserid_idx ON alf_activity_feed (post_user_id);
-CREATE INDEX feed_feeduserid_idx ON alf_activity_feed (feed_user_id);
-CREATE INDEX feed_sitenetwork_idx ON alf_activity_feed (site_network);
-CREATE INDEX feed_activityformat_idx ON alf_activity_feed (activity_format);
-CREATE SEQUENCE alf_activity_feed_seq START WITH 1 INCREMENT BY 1;
-
-CREATE TABLE alf_activity_feed_control
-(
-    id INT8 NOT NULL,
-    feed_user_id VARCHAR(255) NOT NULL,
-    site_network VARCHAR(255),
-    app_tool VARCHAR(36),
-    last_modified TIMESTAMP NOT NULL,
-    PRIMARY KEY (id)    
-);
-CREATE INDEX feedctrl_feeduserid_idx ON alf_activity_feed_control (feed_user_id);
-CREATE SEQUENCE alf_activity_feed_control_seq START WITH 1 INCREMENT BY 1;
-
-CREATE TABLE alf_activity_post
-(
-    sequence_id INT8 NOT NULL,
-    post_date TIMESTAMP NOT NULL,
-    status VARCHAR(10) NOT NULL,
-    activity_data VARCHAR(1024) NOT NULL,
-    post_user_id VARCHAR(255) NOT NULL,
-    job_task_node INT4 NOT NULL,
-    site_network VARCHAR(255),
-    app_tool VARCHAR(36),
-    activity_type VARCHAR(255) NOT NULL,
-    last_modified TIMESTAMP NOT NULL,
-    PRIMARY KEY (sequence_id)
-);
-CREATE INDEX post_jobtasknode_idx ON alf_activity_post (job_task_node);
-CREATE INDEX post_status_idx ON alf_activity_post (status);
-CREATE SEQUENCE alf_activity_post_seq START WITH 1 INCREMENT BY 1;
-
 CREATE TABLE alf_audit_config
 (
     id INT8 NOT NULL,

config/alfresco/dbscripts/upgrade/3.0/org.hibernate.dialect.Dialect/create-activities-extras.sql

@@ -1,28 +0,0 @@
---
--- Title:      Activities Schema - Extras (Indexes)
--- Database:   Generic
--- Since:      V3.0.0 Schema
---
-
-CREATE INDEX post_jobtasknode_idx ON alf_activity_post(job_task_node);
-CREATE INDEX post_status_idx ON alf_activity_post(status);
-
-CREATE INDEX feed_postdate_idx ON alf_activity_feed(post_date);
-CREATE INDEX feed_postuserid_idx ON alf_activity_feed(post_user_id);
-CREATE INDEX feed_feeduserid_idx ON alf_activity_feed(feed_user_id);
-CREATE INDEX feed_sitenetwork_idx ON alf_activity_feed(site_network);
-CREATE INDEX feed_activityformat_idx ON alf_activity_feed(activity_format);
-
-CREATE INDEX feedctrl_feeduserid_idx ON alf_activity_feed_control(feed_user_id);
-
---
--- Record script finish
---
-DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.0-0-CreateActivitiesExtras';
-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.0-0-CreateActivitiesExtras', 'Executed script create V3.0: Created activities extras',
-    0, 125, -1, 126, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
-  );

config/alfresco/dbscripts/upgrade/3.0/org.hibernate.dialect.PostgreSQLDialect/create-activities-extras.sql

@@ -1,37 +0,0 @@
---
--- Title:      Activities Schema - Extras (Indexes, Sequences)
--- Database:   PostgreSQL
--- Since:      V3.0.0 Schema
---
-
--- Activity Post
-CREATE SEQUENCE alf_activity_post_seq START WITH 1 INCREMENT BY 1;
-CREATE INDEX post_jobtasknode_idx ON alf_activity_post(job_task_node);
-CREATE INDEX post_status_idx ON alf_activity_post(status);
-
--- Activity Feed
-CREATE SEQUENCE alf_activity_feed_seq START WITH 1 INCREMENT BY 1;
-
-CREATE INDEX feed_postdate_idx ON alf_activity_feed(post_date);
-CREATE INDEX feed_postuserid_idx ON alf_activity_feed(post_user_id);
-CREATE INDEX feed_feeduserid_idx ON alf_activity_feed(feed_user_id);
-CREATE INDEX feed_sitenetwork_idx ON alf_activity_feed(site_network);
-CREATE INDEX feed_activityformat_idx ON alf_activity_feed(activity_format);
-
--- Activity Feed Control
-CREATE SEQUENCE alf_activity_feed_control_seq START WITH 1 INCREMENT BY 1;
-
-CREATE INDEX feedctrl_feeduserid_idx ON alf_activity_feed_control(feed_user_id);
-
-
---
--- Record script finish
---
-DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.0-0-CreateActivitiesExtras';
-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.0-0-CreateActivitiesExtras', 'Executed script create V3.0: Created activities extras',
-    0, 125, -1, 126, null, 'UNKNOWN', TRUE, TRUE, 'Script completed'
-  );

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

@@ -1248,14 +1248,14 @@
         </property>
     </bean>
 
-    <bean id="patch.db-V3.0-0-CreateActivitiesExtras" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+    <bean id="patch.db-V3.0-ActivityTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V3.0-0-CreateActivitiesExtras</value></property>
+        <property name="id"><value>patch.db-V3.0-ActivityTables</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>125</value></property>
         <property name="targetSchema"><value>126</value></property>
         <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/upgrade/3.0/${db.script.dialect}/create-activities-extras.sql</value>
+            <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-ActivityTables.sql</value>
         </property>
     </bean>