Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

82424: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80837: ACE-2276 - First cut on activiti upgrade patches


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83259 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 07:10:11 +00:00
parent 03cce24c7a
commit 8a04649fd1
4 changed files with 350 additions and 25 deletions

View File

@@ -0,0 +1,203 @@
--
-- Title: Upgraded Activiti tables to 5.16.2 version
-- Database: MySQL
-- Since: V5.0 Schema 8002
-- Author: Mark Rogers
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- Upgraded Activiti tables to 5.16.2 version
alter table ACT_RU_TASK
add CATEGORY_ varchar(255);
alter table ACT_RU_EXECUTION drop foreign key ACT_FK_EXE_PROCDEF;
alter table ACT_RU_EXECUTION drop index ACT_UNIQ_RU_BUS_KEY;
alter table ACT_RU_EXECUTION
add constraint ACT_FK_EXE_PROCDEF
foreign key (PROC_DEF_ID_)
references ACT_RE_PROCDEF (ID_);
#
# ACT-1867: MySQL DATETIME and TIMESTAMP precision
# The way this is done, is by creating a new column, pumping over all data
# and then removing the old column.
#
# DEPLOY_TIME_ in ACT_RE_DEPLOYMENT
ALTER TABLE ACT_RE_DEPLOYMENT ADD DEPLOY_TIME_TEMP_ timestamp(3);
UPDATE ACT_RE_DEPLOYMENT SET DEPLOY_TIME_TEMP_ = DEPLOY_TIME_;
ALTER TABLE ACT_RE_DEPLOYMENT DROP COLUMN DEPLOY_TIME_;
ALTER TABLE ACT_RE_DEPLOYMENT CHANGE DEPLOY_TIME_TEMP_ DEPLOY_TIME_ timestamp(3);
# CREATE_TIME_ in ACT_RE_MODEL
ALTER TABLE ACT_RE_MODEL ADD CREATE_TIME_TEMP_ timestamp(3) null;
UPDATE ACT_RE_MODEL SET CREATE_TIME_TEMP_ = CREATE_TIME_;
ALTER TABLE ACT_RE_MODEL DROP COLUMN CREATE_TIME_;
ALTER TABLE ACT_RE_MODEL CHANGE CREATE_TIME_TEMP_ CREATE_TIME_ timestamp(3) null;
# LAST_UPDATE_TIME_ in ACT_RE_MODEL
ALTER TABLE ACT_RE_MODEL ADD LAST_UPDATE_TIME_TEMP_ timestamp(3) null;
UPDATE ACT_RE_MODEL SET LAST_UPDATE_TIME_TEMP_ = LAST_UPDATE_TIME_;
ALTER TABLE ACT_RE_MODEL DROP COLUMN LAST_UPDATE_TIME_;
ALTER TABLE ACT_RE_MODEL CHANGE LAST_UPDATE_TIME_TEMP_ LAST_UPDATE_TIME_ timestamp(3) null;
# LOCK_EXP_TIME_ in ACT_RU_JOB
ALTER TABLE ACT_RU_JOB ADD LOCK_EXP_TIME_TEMP_ timestamp(3) null;
UPDATE ACT_RU_JOB SET LOCK_EXP_TIME_TEMP_ = LOCK_EXP_TIME_;
ALTER TABLE ACT_RU_JOB DROP COLUMN LOCK_EXP_TIME_;
ALTER TABLE ACT_RU_JOB CHANGE LOCK_EXP_TIME_TEMP_ LOCK_EXP_TIME_ timestamp(3) null;
# DUEDATE_ in ACT_RU_JOB
ALTER TABLE ACT_RU_JOB ADD DUEDATE_TEMP_ timestamp(3) null;
UPDATE ACT_RU_JOB SET DUEDATE_TEMP_ = DUEDATE_;
ALTER TABLE ACT_RU_JOB DROP COLUMN DUEDATE_;
ALTER TABLE ACT_RU_JOB CHANGE DUEDATE_TEMP_ DUEDATE_ timestamp(3) null;
# CREATE_TIME_ in ACT_RU_TASK
ALTER TABLE ACT_RU_TASK ADD CREATE_TIME_TEMP_ timestamp(3);
UPDATE ACT_RU_TASK SET CREATE_TIME_TEMP_ = CREATE_TIME_;
ALTER TABLE ACT_RU_TASK DROP COLUMN CREATE_TIME_;
ALTER TABLE ACT_RU_TASK CHANGE CREATE_TIME_TEMP_ CREATE_TIME_ timestamp(3);
# DUE_DATE_ in ACT_RU_TASK
ALTER TABLE ACT_RU_TASK ADD DUE_DATE_TEMP_ datetime(3);
UPDATE ACT_RU_TASK SET DUE_DATE_TEMP_ = DUE_DATE_;
ALTER TABLE ACT_RU_TASK DROP COLUMN DUE_DATE_;
ALTER TABLE ACT_RU_TASK CHANGE DUE_DATE_TEMP_ DUE_DATE_ datetime(3);
# CREATED_ in ACT_RU_EVENT_SUBSCR
ALTER TABLE ACT_RU_EVENT_SUBSCR ADD CREATED_TEMP_ timestamp(3) not null;
UPDATE ACT_RU_EVENT_SUBSCR SET CREATED_TEMP_ = CREATED_;
ALTER TABLE ACT_RU_EVENT_SUBSCR DROP COLUMN CREATED_;
ALTER TABLE ACT_RU_EVENT_SUBSCR CHANGE CREATED_TEMP_ CREATED_ timestamp(3) not null DEFAULT CURRENT_TIMESTAMP(3);
alter table ACT_RE_DEPLOYMENT
add TENANT_ID_ varchar(255) default '';
alter table ACT_RE_PROCDEF
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_EXECUTION
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_TASK
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_JOB
add TENANT_ID_ varchar(255) default '';
alter table ACT_RE_MODEL
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_EVENT_SUBSCR
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_EVENT_SUBSCR
add PROC_DEF_ID_ varchar(64);
alter table ACT_RE_PROCDEF
drop index ACT_UNIQ_PROCDEF;
alter table ACT_RE_PROCDEF
add constraint ACT_UNIQ_PROCDEF
unique (KEY_,VERSION_, TENANT_ID_);
update ACT_GE_PROPERTY set VALUE_ = '5.15' where NAME_ = 'schema.version';
create table ACT_HI_IDENTITYLINK (
ID_ nvarchar(64),
GROUP_ID_ nvarchar(255),
TYPE_ nvarchar(255),
USER_ID_ nvarchar(255),
TASK_ID_ nvarchar(64),
PROC_INST_ID_ nvarchar(64),
primary key (ID_)
);
create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
create index ACT_IDX_HI_IDENT_LNK_TASK on ACT_HI_IDENTITYLINK(TASK_ID_);
create index ACT_IDX_HI_IDENT_LNK_PROCINST on ACT_HI_IDENTITYLINK(PROC_INST_ID_);
alter table ACT_HI_TASKINST
add CATEGORY_ nvarchar(255);
drop index ACT_HI_PROCINST.ACT_UNIQ_HI_BUS_KEY;
alter table ACT_HI_VARINST
add CREATE_TIME_ datetime;
alter table ACT_HI_VARINST
add LAST_UPDATED_TIME_ datetime;
alter table ACT_HI_PROCINST
add TENANT_ID_ nvarchar(255) default '';
alter table ACT_HI_ACTINST
add TENANT_ID_ nvarchar(255) default '';
alter table ACT_HI_TASKINST
add TENANT_ID_ nvarchar(255) default '';
alter table ACT_HI_ACTINST
alter column ASSIGNEE_ nvarchar(255);
update ACT_GE_PROPERTY set VALUE_ = '5.15.1' where NAME_ = 'schema.version';
alter table ACT_RU_TASK
add FORM_KEY_ nvarchar(255);
alter table ACT_RU_EXECUTION
add NAME_ nvarchar(255);
create table ACT_EVT_LOG (
LOG_NR_ numeric(19,0) IDENTITY(1,1),
TYPE_ nvarchar(64),
PROC_DEF_ID_ nvarchar(64),
PROC_INST_ID_ nvarchar(64),
EXECUTION_ID_ nvarchar(64),
TASK_ID_ nvarchar(64),
TIME_STAMP_ datetime not null,
USER_ID_ nvarchar(255),
DATA_ varbinary(max),
LOCK_OWNER_ nvarchar(255),
LOCK_TIME_ datetime null,
IS_PROCESSED_ tinyint default 0,
primary key (LOG_NR_)
);
alter table ACT_HI_PROCINST
add NAME_ nvarchar(255);
update ACT_GE_PROPERTY set VALUE_ = '5.16' where NAME_ = 'schema.version';
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-Activiti-5.16.2';
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-Activiti-5.16.2', 'Manually executed script upgrade V5.0: Upgraded Activiti tables to 5.16.2 version',
0, 8001, -1, 8002, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
);

View File

@@ -0,0 +1,106 @@
--
-- Title: Upgraded Activiti tables to 5.16.2 version
-- Database: MySQL
-- Since: V5.0 Schema 8002
-- Author: Mark Rogers
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- Upgraded Activiti tables to 5.16.2 version
alter table ACT_RU_TASK
add CATEGORY_ varchar(255);
alter table ACT_RU_EXECUTION drop constraint act_ru_execution_proc_def_id__business_key__key;
alter table ACT_RE_DEPLOYMENT
add TENANT_ID_ varchar(255) default '';
alter table ACT_RE_PROCDEF
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_EXECUTION
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_TASK
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_JOB
add TENANT_ID_ varchar(255) default '';
alter table ACT_RE_MODEL
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_EVENT_SUBSCR
add TENANT_ID_ varchar(255) default '';
alter table ACT_RU_EVENT_SUBSCR
add PROC_DEF_ID_ varchar(64);
alter table ACT_RE_PROCDEF
drop constraint ACT_UNIQ_PROCDEF;
alter table ACT_RE_PROCDEF
add constraint ACT_UNIQ_PROCDEF
unique (KEY_,VERSION_, TENANT_ID_);
update ACT_GE_PROPERTY set VALUE_ = '5.15' where NAME_ = 'schema.version';
alter table ACT_HI_TASKINST
add CATEGORY_ varchar(255);
alter table ACT_HI_PROCINST drop constraint act_hi_procinst_proc_def_id__business_key__key;
alter table ACT_HI_VARINST
add CREATE_TIME_ timestamp;
alter table ACT_HI_VARINST
add LAST_UPDATED_TIME_ timestamp;
alter table ACT_HI_PROCINST
add TENANT_ID_ varchar(255) default '';
alter table ACT_HI_ACTINST
add TENANT_ID_ varchar(255) default '';
alter table ACT_HI_TASKINST
add TENANT_ID_ varchar(255) default '';
alter table ACT_HI_ACTINST
alter column ASSIGNEE_ TYPE varchar(255);
alter table ACT_RU_TASK
add FORM_KEY_ varchar(255);
alter table ACT_RU_EXECUTION
add NAME_ varchar(255);
create table ACT_EVT_LOG (
LOG_NR_ SERIAL PRIMARY KEY,
TYPE_ varchar(64),
PROC_DEF_ID_ varchar(64),
PROC_INST_ID_ varchar(64),
EXECUTION_ID_ varchar(64),
TASK_ID_ varchar(64),
TIME_STAMP_ timestamp not null,
USER_ID_ varchar(255),
DATA_ bytea,
LOCK_OWNER_ varchar(255),
LOCK_TIME_ timestamp null,
IS_PROCESSED_ smallint default 0
);
update ACT_GE_PROPERTY set VALUE_ = '5.16' where NAME_ = 'schema.version';
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-Activiti-5.16.2';
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-Activiti-5.16.2', 'Manually executed script upgrade V5.0: Upgraded Activiti tables to 5.16.2 version',
0, 8001, -1, 8002, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
);

View File

@@ -461,4 +461,8 @@ patch.renameSiteAuthorityDisplayName.result=Updating of display names was comple
patch.addTagScopeAspect.description=Add tagscode aspect to the Company Home folder
patch.addTagScopeAspect.result=tagscope aspect added to the Company Home folder successfully
patch.db-Activiti-5.16.2.description=Update Activiti tables to 5.16.2
patch.db-Activiti-5.16.2.result=Activiti tables updated
patch.solrFacets.root.description=Creates the solr facets root folder in the Data Dictionary

View File

@@ -3354,6 +3354,17 @@
</property>
</bean>
<bean id="patch.db-Activiti-5.16.2" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id" value="patch.db-Activiti-5.16.2" />
<property name="description" value="patch.db-Activiti-5.16.2.description" />
<property name="fixesFromSchema" value="0" />
<property name="fixesToSchema" value="8002" />
<property name="targetSchema" value="8003" />
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/5.0/${db.script.dialect}/activiti-upgrade-5-16-2.sql</value>
</property>
</bean>
<bean id="patch.solrFacets.root" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
<property name="id"><value>patch.solrFacets.root</value></property>
<property name="description"><value>patch.solrFacets.root.description</value></property>
@@ -3379,4 +3390,5 @@
</props>
</property>
</bean>
</beans>