From 73623dd739413419bcfef52aae729b6d3523d75f Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Thu, 4 Sep 2014 07:10:29 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 82425: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 80872: ACE-2276 - Next attempt at activiti upgrade script for mysql git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../activiti-upgrade-5-16-2.sql | 176 +++++++----------- 1 file changed, 69 insertions(+), 107 deletions(-) diff --git a/config/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql b/config/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql index 7a01792a7c..f308102ee9 100644 --- a/config/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql +++ b/config/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql @@ -6,7 +6,11 @@ -- -- Please contact support@alfresco.com if you need assistance with the upgrade. -- --- Upgraded Activiti tables to 5.16.2 version +-- Upgraded Activiti tables from 5.14 to 5.16.2 version + +# MySQL < 5.6.4 does not support timestamps/dates with millisecond precision. +# This upgrade file lacks the necessary upgrades that are done on a 5.6.4+ installation +# to get millisecond precision. alter table ACT_RU_TASK add CATEGORY_ varchar(255); @@ -19,6 +23,39 @@ alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_PROCDEF foreign key (PROC_DEF_ID_) references ACT_RE_PROCDEF (ID_); + +#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'; # # ACT-1867: MySQL DATETIME and TIMESTAMP precision @@ -28,167 +65,92 @@ alter table ACT_RU_EXECUTION # DEPLOY_TIME_ in ACT_RE_DEPLOYMENT -ALTER TABLE ACT_RE_DEPLOYMENT ADD DEPLOY_TIME_TEMP_ timestamp(3); +ALTER TABLE ACT_RE_DEPLOYMENT ADD DEPLOY_TIME_TEMP_ timestamp; 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); +ALTER TABLE ACT_RE_DEPLOYMENT CHANGE DEPLOY_TIME_TEMP_ DEPLOY_TIME_ timestamp; # CREATE_TIME_ in ACT_RE_MODEL -ALTER TABLE ACT_RE_MODEL ADD CREATE_TIME_TEMP_ timestamp(3) null; +ALTER TABLE ACT_RE_MODEL ADD CREATE_TIME_TEMP_ timestamp 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; +ALTER TABLE ACT_RE_MODEL CHANGE CREATE_TIME_TEMP_ CREATE_TIME_ timestamp null; # LAST_UPDATE_TIME_ in ACT_RE_MODEL -ALTER TABLE ACT_RE_MODEL ADD LAST_UPDATE_TIME_TEMP_ timestamp(3) null; +ALTER TABLE ACT_RE_MODEL ADD LAST_UPDATE_TIME_TEMP_ timestamp 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; +ALTER TABLE ACT_RE_MODEL CHANGE LAST_UPDATE_TIME_TEMP_ LAST_UPDATE_TIME_ timestamp null; # LOCK_EXP_TIME_ in ACT_RU_JOB -ALTER TABLE ACT_RU_JOB ADD LOCK_EXP_TIME_TEMP_ timestamp(3) null; +ALTER TABLE ACT_RU_JOB ADD LOCK_EXP_TIME_TEMP_ timestamp 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; +ALTER TABLE ACT_RU_JOB CHANGE LOCK_EXP_TIME_TEMP_ LOCK_EXP_TIME_ timestamp null; # DUEDATE_ in ACT_RU_JOB -ALTER TABLE ACT_RU_JOB ADD DUEDATE_TEMP_ timestamp(3) null; +ALTER TABLE ACT_RU_JOB ADD DUEDATE_TEMP_ timestamp 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; +ALTER TABLE ACT_RU_JOB CHANGE DUEDATE_TEMP_ DUEDATE_ timestamp null; # CREATE_TIME_ in ACT_RU_TASK -ALTER TABLE ACT_RU_TASK ADD CREATE_TIME_TEMP_ timestamp(3); +ALTER TABLE ACT_RU_TASK ADD CREATE_TIME_TEMP_ timestamp; 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); +ALTER TABLE ACT_RU_TASK CHANGE CREATE_TIME_TEMP_ CREATE_TIME_ timestamp; # DUE_DATE_ in ACT_RU_TASK -ALTER TABLE ACT_RU_TASK ADD DUE_DATE_TEMP_ datetime(3); +ALTER TABLE ACT_RU_TASK ADD DUE_DATE_TEMP_ datetime; 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); +ALTER TABLE ACT_RU_TASK CHANGE DUE_DATE_TEMP_ DUE_DATE_ datetime; # CREATED_ in ACT_RU_EVENT_SUBSCR -ALTER TABLE ACT_RU_EVENT_SUBSCR ADD CREATED_TEMP_ timestamp(3) not null; +ALTER TABLE ACT_RU_EVENT_SUBSCR ADD CREATED_TEMP_ timestamp 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_RU_EVENT_SUBSCR CHANGE CREATED_TEMP_ CREATED_ timestamp not null DEFAULT CURRENT_TIMESTAMP; -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); + add FORM_KEY_ varchar(255); alter table ACT_RU_EXECUTION - add NAME_ nvarchar(255); + add NAME_ varchar(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, + LOG_NR_ bigint auto_increment, + 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_ LONGBLOB, + LOCK_OWNER_ varchar(255), + LOCK_TIME_ timestamp null, IS_PROCESSED_ tinyint default 0, primary key (LOG_NR_) -); +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; -alter table ACT_HI_PROCINST - add NAME_ nvarchar(255); - update ACT_GE_PROPERTY set VALUE_ = '5.16' where NAME_ = 'schema.version'; +update ACT_GE_PROPERTY set VALUE_ = '5.16.1' where NAME_ = 'schema.version'; -- -- Record script finish