diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/JobQueryImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/JobQueryImpl.java index 590df8ac8a5546a0fdc9668db21be786c17f9a28..6f82995f6de0884b0967c0b9499c8385f92c72e0 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/JobQueryImpl.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/JobQueryImpl.java @@ -36,6 +36,7 @@ public class JobQueryImpl extends AbstractQuery implements JobQue protected String id; protected String processInstanceId; protected String executionId; + protected String processDefinitionId; protected boolean retriesLeft; protected boolean executable; protected boolean onlyTimers; @@ -74,6 +75,14 @@ public class JobQueryImpl extends AbstractQuery implements JobQue return this; } + public JobQueryImpl processDefinitionId(String processDefinitionId) { + if (processDefinitionId == null) { + throw new ActivitiException("Provided process definition id is null"); + } + this.processDefinitionId = processDefinitionId; + return this; + } + public JobQueryImpl executionId(String executionId) { if (executionId == null) { throw new ActivitiException("Provided execution id is null"); diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/TaskQueryImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/TaskQueryImpl.java index 16d40b38fb6acc7d934b1ee8aa12981dd1fbfc2b..12f2dd436c78a4b0804af093564e786e895859a7 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/TaskQueryImpl.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/TaskQueryImpl.java @@ -284,7 +284,6 @@ public class TaskQueryImpl extends AbstractQuery implements Tas return this; } - @Override public TaskQuery taskVariableValueEqualsIgnoreCase(String name, String value) { if(value == null) { throw new ActivitiException("value is null"); @@ -293,7 +292,6 @@ public class TaskQueryImpl extends AbstractQuery implements Tas return this; } - @Override public TaskQuery taskVariableValueNotEqualsIgnoreCase(String name, String value) { if(value == null) { throw new ActivitiException("value is null"); @@ -322,7 +320,6 @@ public class TaskQueryImpl extends AbstractQuery implements Tas return this; } - @Override public TaskQuery processVariableValueEqualsIgnoreCase(String name, String value) { if(value == null) { throw new ActivitiException("value is null"); @@ -331,7 +328,6 @@ public class TaskQueryImpl extends AbstractQuery implements Tas return this; } - @Override public TaskQuery processVariableValueNotEqualsIgnoreCase(String name, String value) { if(value == null) { throw new ActivitiException("value is null"); diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessDefinitionStateCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessDefinitionStateCmd.java index 331579cec354b20767bbf7603289f9a84d64a6eb..467b467e0f6cd3888c333dcec9a011389a9d381b 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessDefinitionStateCmd.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessDefinitionStateCmd.java @@ -118,10 +118,11 @@ public abstract class AbstractSetProcessDefinitionStateCmd implements Command processDefinitions) { for (ProcessDefinitionEntity processDefinition : processDefinitions) { TimerEntity timer = new TimerEntity(); + timer.setProcessDefinitionId(processDefinition.getId()); timer.setDuedate(executionDate); timer.setJobHandlerType(getDelayedExecutionJobHandlerType()); timer.setJobHandlerConfiguration(TimerChangeProcessDefinitionSuspensionStateJobHandler - .createJobHandlerConfiguration(processDefinition.getId(), includeProcessInstances)); + .createJobHandlerConfiguration(includeProcessInstances)); commandContext.getJobManager().schedule(timer); } } diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/FormTypes.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/FormTypes.java index b7361ac83c0825f671bd06df42bf0d8e32803fab..0a5e862dff0f49eb3b1b13b29cf1465582082708 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/FormTypes.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/FormTypes.java @@ -14,6 +14,7 @@ package org.activiti.engine.impl.form; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import org.activiti.engine.impl.bpmn.parser.BpmnParse; @@ -42,7 +43,8 @@ public class FormTypes { formType = new DateFormType(datePatternText); } else if ("enum".equals(typeText)) { - Map values = new HashMap(); + // ACT-1023: Using linked hashmap to preserve the order in which the entries are defined + Map values = new LinkedHashMap(); for (Element valueElement: formPropertyElement.elementsNS(BpmnParser.ACTIVITI_BPMN_EXTENSIONS_NS,"value")) { String valueId = valueElement.attribute("id"); String valueName = valueElement.attribute("name"); diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/HistoryLevel.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/HistoryLevel.java index 855383a1169f7ec7f6403a25b317a1ff2d62f353..a6af691543bf60aaae90586f31e52a31f90669f3 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/HistoryLevel.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/HistoryLevel.java @@ -23,8 +23,8 @@ import org.activiti.engine.ActivitiException; public enum HistoryLevel { NONE("none"), - ACTIVITY("audit"), - AUDIT("activity"), + ACTIVITY("activity"), + AUDIT("audit"), FULL("full"); private String key; diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/AsyncContinuationJobHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/AsyncContinuationJobHandler.java index 825ce00e87b31928d13ee9e42a900a7d80db5f7f..1b9ac33557a44c79cb58ff77dd84a5d75e951709 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/AsyncContinuationJobHandler.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/AsyncContinuationJobHandler.java @@ -14,6 +14,7 @@ package org.activiti.engine.impl.jobexecutor; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; import org.activiti.engine.impl.pvm.runtime.AtomicOperation; /** @@ -27,8 +28,8 @@ public class AsyncContinuationJobHandler implements JobHandler { public String getType() { return TYPE; } - - public void execute(String configuration, ExecutionEntity execution, CommandContext commandContext) { + + public void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext) { // ATM only AtomicOperationTransitionCreateScope can be performed asynchronously AtomicOperation atomicOperation = AtomicOperation.TRANSITION_CREATE_SCOPE; diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/JobHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/JobHandler.java index 35053cbe465444e3d292b4a6e2a47c6211244a33..519c9a59fdeba994a885cfee8a207f13320fead6 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/JobHandler.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/JobHandler.java @@ -14,6 +14,7 @@ package org.activiti.engine.impl.jobexecutor; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; /** @@ -22,5 +23,5 @@ import org.activiti.engine.impl.persistence.entity.ExecutionEntity; public interface JobHandler { String getType(); - void execute(String configuration, ExecutionEntity execution, CommandContext commandContext); + void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext); } diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/ProcessEventJobHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/ProcessEventJobHandler.java index 839784ae9eac771a8882b302a5b2c98067129147..2a937e7309d507a12a759b96d043841873ca8d9a 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/ProcessEventJobHandler.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/ProcessEventJobHandler.java @@ -16,6 +16,7 @@ package org.activiti.engine.impl.jobexecutor; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.persistence.entity.EventSubscriptionEntity; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; /** @@ -29,7 +30,7 @@ public class ProcessEventJobHandler implements JobHandler { return TYPE; } - public void execute(String configuration, ExecutionEntity execution, CommandContext commandContext) { + public void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext) { // lookup subscription: EventSubscriptionEntity eventSubscription = commandContext.getEventSubscriptionManager() .findEventSubscriptionbyId(configuration); diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerActivateProcessDefinitionHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerActivateProcessDefinitionHandler.java index ed777d6aa3e3a1bcee225e4315a741816443682a..5dba2452a24ccf566e72e332af6ec118a54094cf 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerActivateProcessDefinitionHandler.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerActivateProcessDefinitionHandler.java @@ -15,6 +15,7 @@ package org.activiti.engine.impl.jobexecutor; import org.activiti.engine.impl.cmd.ActivateProcessDefinitionCmd; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; import org.activiti.engine.impl.util.json.JSONObject; /** @@ -27,10 +28,10 @@ public class TimerActivateProcessDefinitionHandler extends TimerChangeProcessDef public String getType() { return TYPE; } - - public void execute(String configuration, ExecutionEntity execution, CommandContext commandContext) { + + public void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext) { JSONObject cfgJson = new JSONObject(configuration); - String processDefinitionId = getProcessDefinitionId(cfgJson); + String processDefinitionId = job.getProcessDefinitionId(); boolean activateProcessInstances = getIncludeProcessInstances(cfgJson); ActivateProcessDefinitionCmd activateProcessDefinitionCmd = diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerCatchIntermediateEventJobHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerCatchIntermediateEventJobHandler.java index e6e7c558d305278be8991fa0ed07242b38e98d14..e91c194788a9d071af8accc9a7a91bf05ed5ae1e 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerCatchIntermediateEventJobHandler.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerCatchIntermediateEventJobHandler.java @@ -18,6 +18,7 @@ import java.util.logging.Logger; import org.activiti.engine.ActivitiException; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; import org.activiti.engine.impl.pvm.process.ActivityImpl; @@ -31,7 +32,7 @@ public class TimerCatchIntermediateEventJobHandler implements JobHandler { return TYPE; } - public void execute(String configuration, ExecutionEntity execution, CommandContext commandContext) { + public void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext) { ActivityImpl intermediateEventActivity = execution.getProcessDefinition().findActivity(configuration); if (intermediateEventActivity == null) { diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerChangeProcessDefinitionSuspensionStateJobHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerChangeProcessDefinitionSuspensionStateJobHandler.java index ef04f78c1e9de4217e36f1ddf18743521954a42d..81c67ac6b709ce6f508733ea9a3fc388f97f7797 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerChangeProcessDefinitionSuspensionStateJobHandler.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerChangeProcessDefinitionSuspensionStateJobHandler.java @@ -19,21 +19,14 @@ import org.activiti.engine.impl.util.json.JSONObject; */ public abstract class TimerChangeProcessDefinitionSuspensionStateJobHandler implements JobHandler { - private static final String JOB_HANDLER_CFG_PROCESS_DEFINITION_ID = "processDefinitionId"; - private static final String JOB_HANDLER_CFG_INCLUDE_PROCESS_INSTANCES = "includeProcessInstances"; - public static String createJobHandlerConfiguration(String processDefinitionId, boolean includeProcessInstances) { + public static String createJobHandlerConfiguration(boolean includeProcessInstances) { JSONObject json = new JSONObject(); - json.put(JOB_HANDLER_CFG_PROCESS_DEFINITION_ID, processDefinitionId); json.put(JOB_HANDLER_CFG_INCLUDE_PROCESS_INSTANCES, includeProcessInstances); return json.toString(); } - public static String getProcessDefinitionId(JSONObject jobHandlerCfgJson) { - return jobHandlerCfgJson.getString(JOB_HANDLER_CFG_PROCESS_DEFINITION_ID); - } - public static boolean getIncludeProcessInstances(JSONObject jobHandlerCfgJson) { return jobHandlerCfgJson.getBoolean(JOB_HANDLER_CFG_INCLUDE_PROCESS_INSTANCES); } diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerExecuteNestedActivityJobHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerExecuteNestedActivityJobHandler.java index 000f0f22a49b6680a453bafb6df0bb8e9ffb2a11..5e307605b4caadbda34809021c43ce3ac4491606 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerExecuteNestedActivityJobHandler.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerExecuteNestedActivityJobHandler.java @@ -18,6 +18,7 @@ import java.util.logging.Logger; import org.activiti.engine.ActivitiException; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; import org.activiti.engine.impl.pvm.process.ActivityImpl; @@ -34,8 +35,8 @@ public class TimerExecuteNestedActivityJobHandler implements JobHandler { public String getType() { return TYPE; } - - public void execute(String configuration, ExecutionEntity execution, CommandContext commandContext) { + + public void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext) { ActivityImpl borderEventActivity = execution.getProcessDefinition().findActivity(configuration); if (borderEventActivity == null) { diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerStartEventJobHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerStartEventJobHandler.java index ac07be62eefcb6a9263d66691231ee71ef98e8a6..b39ded5a35ee1ecf987f3b530f4ca50881bd83ae 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerStartEventJobHandler.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerStartEventJobHandler.java @@ -21,6 +21,7 @@ import org.activiti.engine.impl.context.Context; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.persistence.deploy.DeploymentCache; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; import org.activiti.engine.repository.ProcessDefinition; @@ -33,8 +34,8 @@ public class TimerStartEventJobHandler implements JobHandler { public String getType() { return TYPE; } - - public void execute(String configuration, ExecutionEntity execution, CommandContext commandContext) { + + public void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext) { DeploymentCache deploymentCache = Context .getProcessEngineConfiguration() .getDeploymentCache(); diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerSuspendProcessDefinitionHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerSuspendProcessDefinitionHandler.java index 5af61f09b898124866e23a035763e3b5d308ab79..e08d12744875300fc87d7439d1c676292eaed78c 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerSuspendProcessDefinitionHandler.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/TimerSuspendProcessDefinitionHandler.java @@ -15,6 +15,7 @@ package org.activiti.engine.impl.jobexecutor; import org.activiti.engine.impl.cmd.SuspendProcessDefinitionCmd; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; import org.activiti.engine.impl.util.json.JSONObject; /** @@ -27,10 +28,10 @@ public class TimerSuspendProcessDefinitionHandler extends TimerChangeProcessDefi public String getType() { return TYPE; } - - public void execute(String configuration, ExecutionEntity execution, CommandContext commandContext) { + + public void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext) { JSONObject cfgJson = new JSONObject(configuration); - String processDefinitionId = getProcessDefinitionId(cfgJson); + String processDefinitionId = job.getProcessDefinitionId(); boolean suspendProcessInstances = getIncludeProcessInstances(cfgJson); SuspendProcessDefinitionCmd suspendProcessDefinitionCmd = diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntity.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntity.java index 7d6fa55e8459d945477626ac96104581c68d5a63..8d0a7da651923858ae646b949ca463e5e58c41c5 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntity.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntity.java @@ -54,6 +54,7 @@ public abstract class JobEntity implements Serializable, Job, PersistentObject, protected String executionId = null; protected String processInstanceId = null; + protected String processDefinitionId = null; protected boolean isExclusive = DEFAULT_EXCLUSIVE; @@ -76,7 +77,7 @@ public abstract class JobEntity implements Serializable, Job, PersistentObject, Map jobHandlers = Context.getProcessEngineConfiguration().getJobHandlers(); JobHandler jobHandler = jobHandlers.get(jobHandlerType); - jobHandler.execute(jobHandlerConfiguration, execution, commandContext); + jobHandler.execute(this, jobHandlerConfiguration, execution, commandContext); } public void insert() { @@ -204,6 +205,14 @@ public abstract class JobEntity implements Serializable, Job, PersistentObject, this.duedate = duedate; } + public String getProcessDefinitionId() { + return processDefinitionId; + } + + public void setProcessDefinitionId(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; + } + public void setExceptionStacktrace(String exception) { byte[] exceptionBytes = null; if(exception == null) { diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/runtime/Job.java b/modules/activiti-engine/src/main/java/org/activiti/engine/runtime/Job.java index 820fd08826f54fe7b819a9668b9c4c42c8ceaef9..680c4d7a29d5037206448ea1d73e70211e2bc9eb 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/runtime/Job.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/runtime/Job.java @@ -45,6 +45,11 @@ public interface Job { */ String getExecutionId(); + /** + * Returns the specific process definition on which the job was created + */ + String getProcessDefinitionId(); + /** * Returns the number of retries this job has left. * Whenever the jobexecutor fails to execute the job, this value is decremented. diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/runtime/JobQuery.java b/modules/activiti-engine/src/main/java/org/activiti/engine/runtime/JobQuery.java index 5a0d7b80a4a5a4252b71994bab6dcc7d41c1876f..9fbb2acfb02133786ee5e9bd59dc48a878c6f278 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/runtime/JobQuery.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/runtime/JobQuery.java @@ -34,6 +34,9 @@ public interface JobQuery extends Query { /** Only select jobs which exist for the given execution */ JobQuery executionId(String executionId); + + /** Only select jobs which exist for the given process definition id */ + JobQuery processDefinitionId(String processDefinitionid); /** Only select jobs which have retries left */ JobQuery withRetriesLeft(); diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql index 213538126f3ce4c43fda7405029cf38696c5b290..5cb01087142741991e9689a8c2a299afbb431048 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql @@ -73,6 +73,7 @@ create table ACT_RU_JOB ( EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)), EXECUTION_ID_ varchar(64), PROCESS_INSTANCE_ID_ varchar(64), + PROC_DEF_ID_ varchar(64), RETRIES_ integer, EXCEPTION_STACK_ID_ varchar(64), EXCEPTION_MSG_ varchar(4000), diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql index 0033664f7dfddcb0e0757052f1d9a4ab719b8118..19078c9acbb824488c37a342a24576a1cb86b0e2 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql @@ -71,6 +71,7 @@ create table ACT_RU_JOB ( EXCLUSIVE_ boolean, EXECUTION_ID_ varchar(64), PROCESS_INSTANCE_ID_ varchar(64), + PROC_DEF_ID_ varchar(64), RETRIES_ integer, EXCEPTION_STACK_ID_ varchar(64), EXCEPTION_MSG_ varchar(4000), diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql index 858754beaf1ce5527bbaca9eda87a6adbce02f1a..d1909fb7dbed059b3cd25392aba6f558472add01 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql @@ -71,6 +71,7 @@ create table ACT_RU_JOB ( EXCLUSIVE_ bit, EXECUTION_ID_ nvarchar(64), PROCESS_INSTANCE_ID_ nvarchar(64), + PROC_DEF_ID_ nvarchar(64), RETRIES_ int, EXCEPTION_STACK_ID_ nvarchar(64), EXCEPTION_MSG_ nvarchar(4000), diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql index 98ecc164a84a09df09bb3ee1cf1960b099a2ea6f..a000774d43a6e5229abc75935b43be0e264a57cc 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql @@ -72,6 +72,7 @@ create table ACT_RU_JOB ( EXCLUSIVE_ boolean, EXECUTION_ID_ varchar(64), PROCESS_INSTANCE_ID_ varchar(64), + PROC_DEF_ID_ varchar(64), RETRIES_ integer, EXCEPTION_STACK_ID_ varchar(64), EXCEPTION_MSG_ varchar(4000), @@ -114,6 +115,7 @@ create table ACT_RU_TASK ( PRIORITY_ integer, CREATE_TIME_ timestamp, DUE_DATE_ datetime, + SUSPENSION_STATE_ integer, primary key (ID_) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql index 67b2f9a718286abc7534e5b6027f1a24ff650039..ab9e37846f4e57aa41df7118c018a48382b643e8 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql @@ -71,6 +71,7 @@ create table ACT_RU_JOB ( EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)), EXECUTION_ID_ NVARCHAR2(64), PROCESS_INSTANCE_ID_ NVARCHAR2(64), + PROC_DEF_ID_ NVARCHAR2(64), RETRIES_ INTEGER, EXCEPTION_STACK_ID_ NVARCHAR2(64), EXCEPTION_MSG_ NVARCHAR2(2000), diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql index 4620514e1a2103b3cf4f2b71942e9620ae42abfe..47aaa018932c68e8c33c211c04636d625308de70 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql @@ -72,6 +72,7 @@ create table ACT_RU_JOB ( EXCLUSIVE_ boolean, EXECUTION_ID_ varchar(64), PROCESS_INSTANCE_ID_ varchar(64), + PROC_DEF_ID_ varchar(64), RETRIES_ integer, EXCEPTION_STACK_ID_ varchar(64), EXCEPTION_MSG_ varchar(4000), diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.mssql.drop.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.mssql.drop.engine.sql index 307eee4528acfc5aaf0e823b2de5d1931f05a24f..bdc14c44bf7cc18545dcc14dc02bcd09ad0b2a92 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.mssql.drop.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.mssql.drop.engine.sql @@ -5,53 +5,23 @@ drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_GROUP; drop index ACT_RU_VARIABLE.ACT_IDX_VARIABLE_TASK_ID; drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_CONFIG_; -alter table ACT_GE_BYTEARRAY - drop constraint ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PROCDEF; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_RU_IDENTITYLINK - drop constraint ACT_FK_TSKASS_TASK; - -alter table ACT_RU_IDENTITYLINK - drop constraint ACT_FK_ATHRZ_PROCEDEF; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop constraint ACT_FK_JOB_EXCEPTION; - -alter table ACT_RU_EVENT_SUBSCR - drop constraint ACT_FK_EVENT_EXEC; - -alter table ACT_RE_MODEL - drop constraint ACT_FK_MODEL_SOURCE; - -alter table ACT_RE_MODEL - drop constraint ACT_FK_MODEL_SOURCE_EXTRA; +alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; +alter table ACT_RE_PROCDEF drop constraint ACT_UNIQ_PROCDEF; +alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_PROCDEF; +alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_PARENT; +alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; +alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_ATHRZ_PROCEDEF; +alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; +alter table ACT_RU_TASK drop constraint ACT_FK_TASK_PROCINST; +alter table ACT_RU_TASK drop constraint ACT_FK_TASK_PROCDEF; +alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_EXE; +alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_PROCINST; +alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_BYTEARRAY; +alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR drop constraint ACT_FK_EVENT_EXEC; +alter table ACT_RE_MODEL drop constraint ACT_FK_MODEL_SOURCE; +alter table ACT_RE_MODEL drop constraint ACT_FK_MODEL_SOURCE_EXTRA; drop index ACT_RU_IDENTITYLINK.ACT_IDX_ATHRZ_PROCEDEF; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.engine.sql index 2a174184f491f36d1c1f491e60bdb236d01e3066..2b55e67ffbe21193eac561514817b4455964b61f 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.engine.sql @@ -1,92 +1,11 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; -drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; -drop index ACT_IDX_TSKASS_TASK; -drop index ACT_IDX_TASK_EXEC; -drop index ACT_IDX_TASK_PROCINST; -drop index ACT_IDX_TASK_PROCDEF; -drop index ACT_IDX_VAR_EXE; -drop index ACT_IDX_VAR_PROCINST; -drop index ACT_IDX_VAR_BYTEARRAY; -drop index ACT_IDX_JOB_EXCEPTION; -drop index ACT_IDX_MODEL_SOURCE; -drop index ACT_IDX_MODEL_SOURCE_EXTRA; - -drop index ACT_IDX_EXEC_BUSKEY; -drop index ACT_IDX_TASK_CREATE; -drop index ACT_IDX_IDENT_LNK_USER; -drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_VARIABLE_TASK_ID; - -alter table ACT_GE_BYTEARRAY - drop constraint ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PROCDEF; - -alter table ACT_RU_IDENTITYLINK - drop constraint ACT_FK_TSKASS_TASK; - -alter table ACT_RU_IDENTITYLINK - drop constraint ACT_FK_ATHRZ_PROCEDEF; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop constraint ACT_FK_JOB_EXCEPTION; - -alter table ACT_RU_EVENT_SUBSCR - drop constraint ACT_FK_EVENT_EXEC; - -alter table ACT_RE_PROCDEF - drop CONSTRAINT ACT_UNIQ_PROCDEF; - -alter table ACT_RE_MODEL - drop CONSTRAINT ACT_FK_MODEL_SOURCE; - -alter table ACT_RE_MODEL - drop CONSTRAINT ACT_FK_MODEL_SOURCE_EXTRA; - -drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; -drop index ACT_IDX_EVENT_SUBSCR; -drop index ACT_IDX_ATHRZ_PROCEDEF; - -drop table ACT_GE_PROPERTY; -drop table ACT_GE_BYTEARRAY; -drop table ACT_RE_DEPLOYMENT; -drop table ACT_RE_MODEL; -drop table ACT_RE_PROCDEF; -drop table ACT_RU_EXECUTION; -drop table ACT_RU_JOB; -drop table ACT_RU_TASK; -drop table ACT_RU_IDENTITYLINK; -drop table ACT_RU_VARIABLE; -drop table ACT_RU_EVENT_SUBSCR; +drop table ACT_GE_PROPERTY cascade; +drop table ACT_GE_BYTEARRAY cascade; +drop table ACT_RE_DEPLOYMENT cascade; +drop table ACT_RE_MODEL cascade; +drop table ACT_RE_PROCDEF cascade; +drop table ACT_RU_EXECUTION cascade; +drop table ACT_RU_JOB cascade; +drop table ACT_RU_TASK cascade; +drop table ACT_RU_IDENTITYLINK cascade; +drop table ACT_RU_VARIABLE cascade; +drop table ACT_RU_EVENT_SUBSCR cascade; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.history.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.history.sql index b27b8abe5745f583e011641e7b7c84d4cbc552d6..d6d8e4e4bc56411ff9e9680ed5f96e7f02dec42f 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.history.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.history.sql @@ -1,20 +1,7 @@ -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; -drop index ACT_IDX_HI_DETAIL_TASK_ID; -drop index ACT_IDX_HI_PROCVAR_PROC_INST; -drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; -drop index ACT_IDX_HI_ACT_INST_PROCINST; - -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_VARINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; -drop table ACT_HI_COMMENT; -drop table ACT_HI_ATTACHMENT; +drop table ACT_HI_PROCINST cascade; +drop table ACT_HI_ACTINST cascade; +drop table ACT_HI_VARINST cascade; +drop table ACT_HI_TASKINST cascade; +drop table ACT_HI_DETAIL cascade; +drop table ACT_HI_COMMENT cascade; +drop table ACT_HI_ATTACHMENT cascade; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.identity.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.identity.sql index 10ca22af87a7659a398cb616e113ae9f7ac97e2c..6cd71260a3c2015700b5156dcc4856f06b901d5f 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.identity.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/drop/activiti.postgres.drop.identity.sql @@ -1,10 +1,4 @@ -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - -drop table ACT_ID_INFO; -drop table ACT_ID_GROUP; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_USER; \ No newline at end of file +drop table ACT_ID_INFO cascade; +drop table ACT_ID_GROUP cascade; +drop table ACT_ID_MEMBERSHIP cascade; +drop table ACT_ID_USER cascade; \ No newline at end of file diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Job.xml b/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Job.xml index 37cb75beab5d85d760ad07694a5c35e207fcfc31..9ba89164dc74c2c657ec033e0413a3d73c81a5ff 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Job.xml +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Job.xml @@ -28,6 +28,7 @@ + @@ -67,7 +68,24 @@ (PI.SUSPENSION_STATE_ = 1) ) ${limitAfter} - + + + + + + - ${limitBefore} - select RES.* ${limitBetween} - from ${prefix}ACT_RU_JOB RES - LEFT OUTER JOIN ${prefix}ACT_RU_EXECUTION PI ON PI.ID_ = RES.PROCESS_INSTANCE_ID_ - where (RETRIES_ > 0) - and (DUEDATE_ is null or DUEDATE_ <= #{parameter, jdbcType=TIMESTAMP}) - and (LOCK_OWNER_ is null or LOCK_EXP_TIME_ <= #{parameter, jdbcType=TIMESTAMP}) - and ( - (RES.EXECUTION_ID_ is null) - or - (PI.SUSPENSION_STATE_ = 1) - ) - ${limitAfter} - - - - - - @@ -216,6 +217,7 @@ EXCLUSIVE_, EXECUTION_ID_, PROCESS_INSTANCE_ID_, + PROC_DEF_ID_, RETRIES_, EXCEPTION_STACK_ID_, EXCEPTION_MSG_, @@ -231,6 +233,7 @@ #{exclusive, jdbcType=BOOLEAN}, #{executionId, jdbcType=VARCHAR}, #{processInstanceId, jdbcType=VARCHAR}, + #{processDefinitionId, jdbcType=VARCHAR}, #{retries, jdbcType=INTEGER}, #{exceptionByteArrayId, jdbcType=VARCHAR}, #{exceptionMessage, jdbcType=VARCHAR}, @@ -261,13 +264,19 @@ @@ -292,6 +301,7 @@ EXCLUSIVE_, EXECUTION_ID_, PROCESS_INSTANCE_ID_, + PROC_DEF_ID_, RETRIES_, EXCEPTION_STACK_ID_, EXCEPTION_MSG_, @@ -305,6 +315,7 @@ #{exclusive, jdbcType=BOOLEAN}, #{executionId, jdbcType=VARCHAR}, #{processInstanceId, jdbcType=VARCHAR}, + #{processDefinitionId, jdbcType=VARCHAR}, #{retries, jdbcType=INTEGER}, #{exceptionByteArrayId, jdbcType=VARCHAR}, #{exceptionMessage, jdbcType=VARCHAR}, diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.510.to.511.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.510.to.511.engine.sql index 6844fa008f95088f8dc84e5c4c68c63c23c4ad3c..03b92b5b275e9513c4afe0dc29ef8b43bf047598 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.510.to.511.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.510.to.511.engine.sql @@ -1,19 +1,20 @@ -alter table ACT_RE_PROCDEF - alter column KEY_ set not null; - -alter table ACT_RE_PROCDEF - alter column VERSION_ set not null; - alter table ACT_RE_DEPLOYMENT add CATEGORY_ varchar(255); alter table ACT_RE_PROCDEF add DESCRIPTION_ varchar(4000); - + alter table ACT_RU_TASK add SUSPENSION_STATE_ integer; - -update ACT_RU_TASK set SUSPENSION_STATE= 1; + +Call Sysproc.admin_cmd ('REORG TABLE ACT_RU_TASK'); + +update ACT_RU_TASK set SUSPENSION_STATE_ = 1; + +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); create table ACT_RE_MODEL ( ID_ varchar(64) not null, @@ -39,4 +40,7 @@ alter table ACT_RE_MODEL delete from ACT_GE_PROPERTY where NAME_ = 'historyLevel'; +alter table ACT_RU_JOB + add PROC_DEF_ID_ varchar(64); + update ACT_GE_PROPERTY set VALUE_ = '5.11' where NAME_ = 'schema.version'; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.510.to.511.history.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.510.to.511.history.sql index 462ce30f0c422b88b874c451055f2ca3af67fe7d..7c896887d35204a760e5832cf181c957ca691fc5 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.510.to.511.history.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.510.to.511.history.sql @@ -1,6 +1,8 @@ create table ACT_HI_VARINST ( ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), + TASK_ID_ varchar(64), NAME_ varchar(255) not null, VAR_TYPE_ varchar(100), REV_ integer, @@ -15,10 +17,7 @@ create table ACT_HI_VARINST ( create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); -update ACT_GE_PROPERTY - set VALUE_ = VALUE_ + 1, - REV_ = REV_ + 1 - where NAME_ = 'historyLevel' and VALUE_ >= 2; +Call Sysproc.admin_cmd ('REORG TABLE ACT_HI_VARINST'); alter table ACT_HI_ACTINST add TASK_ID_ varchar(64); @@ -27,9 +26,11 @@ alter table ACT_HI_ACTINST add CALL_PROC_INST_ID_ varchar(64); alter table ACT_HI_DETAIL - alter column PROC_DEF_ID_ DROP NOT NULL; + alter column PROC_INST_ID_ DROP NOT NULL; alter table ACT_HI_DETAIL alter column EXECUTION_ID_ DROP NOT NULL; +Call Sysproc.admin_cmd ('REORG TABLE ACT_HI_DETAIL'); + create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_); \ No newline at end of file diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.59.to.510.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.59.to.510.engine.sql index eff804ec8abe551bd8a01bf7b5f25bea3e81aeff..306a1545af33162c4496ab163b2062b9f5aec7c0 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.59.to.510.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.59.to.510.engine.sql @@ -13,7 +13,15 @@ alter table ACT_RU_EXECUTION add CACHED_ENT_STATE_ integer; update ACT_RU_EXECUTION set CACHED_ENT_STATE_ = 7; - + +alter table ACT_RE_PROCDEF + alter column KEY_ set not null; + +alter table ACT_RE_PROCDEF + alter column VERSION_ set not null; + +Call Sysproc.admin_cmd ('REORG TABLE ACT_RE_PROCDEF'); + alter table ACT_RE_PROCDEF add constraint ACT_UNIQ_PROCDEF unique (KEY_,VERSION_); \ No newline at end of file diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.510.to.511.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.510.to.511.engine.sql index af4b9cdc3eb39f1c0a6735d07448469aafd95957..4e0e9e355f7dd370bd34441bd3e254178f91b3b0 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.510.to.511.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.510.to.511.engine.sql @@ -13,9 +13,14 @@ alter table ACT_RE_PROCDEF alter table ACT_RU_TASK add SUSPENSION_STATE_ integer; -update ACT_RU_TASK set SUSPENSION_STATE= 1; +update ACT_RU_TASK set SUSPENSION_STATE_ = 1; +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + create table ACT_RE_MODEL ( ID_ varchar(64) not null, NAME_ varchar(255), @@ -40,4 +45,7 @@ alter table ACT_RE_MODEL delete from ACT_GE_PROPERTY where NAME_ = 'historyLevel'; +alter table ACT_RU_JOB + add PROC_DEF_ID_ varchar(64); + update ACT_GE_PROPERTY set VALUE_ = '5.11' where NAME_ = 'schema.version'; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.510.to.511.history.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.510.to.511.history.sql index 8508f8da194c5f6ea3fd62ddcdf4ef0770d8af29..3f5a4487b3abb6e64cb80525494b6b1c62758b73 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.510.to.511.history.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.510.to.511.history.sql @@ -1,6 +1,8 @@ create table ACT_HI_VARINST ( ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), + TASK_ID_ varchar(64), NAME_ varchar(255) not null, VAR_TYPE_ varchar(100), REV_ integer, @@ -15,11 +17,6 @@ create table ACT_HI_VARINST ( create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); -update ACT_GE_PROPERTY - set VALUE_ = VALUE_ + 1, - REV_ = REV_ + 1 - where NAME_ = 'historyLevel' and VALUE_ >= 2; - alter table ACT_HI_ACTINST add TASK_ID_ varchar(64); diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.510.to.511.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.510.to.511.engine.sql index 8f894f59d90ecf79fa96e0f3699543c9a439b7cb..5ca80663e1e04f6a1e6d4d3330c9cb9c4f27bbe9 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.510.to.511.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.510.to.511.engine.sql @@ -1,11 +1,14 @@ -alter table ACT_RE_PROCDEF - alter column KEY_ nvarchar(255) not null; +alter table ACT_RE_PROCDEF drop constraint ACT_UNIQ_PROCDEF; + +alter table ACT_RE_PROCDEF alter column KEY_ nvarchar(255) not null; + +alter table ACT_RE_PROCDEF alter column VERSION_ int not null; alter table ACT_RE_PROCDEF - alter column VERSION_ int not null; - -alter table ACT_RE_DEPLOYMENT - add CATEGORY_ nvarchar(255); + add constraint ACT_UNIQ_PROCDEF + unique (KEY_,VERSION_); + +alter table ACT_RE_DEPLOYMENT add CATEGORY_ nvarchar(255); alter table ACT_RE_PROCDEF add DESCRIPTION_ nvarchar(4000); @@ -13,7 +16,12 @@ alter table ACT_RE_PROCDEF alter table ACT_RU_TASK add SUSPENSION_STATE_ int; -update ACT_RU_TASK set SUSPENSION_STATE= 1; +update ACT_RU_TASK set SUSPENSION_STATE_ = 1; + +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); create table ACT_RE_MODEL ( ID_ nvarchar(64) not null, @@ -39,4 +47,7 @@ alter table ACT_RE_MODEL delete from ACT_GE_PROPERTY where NAME_ = 'historyLevel'; +alter table ACT_RU_JOB + add PROC_DEF_ID_ nvarchar(64); + update ACT_GE_PROPERTY set VALUE_ = '5.11' where NAME_ = 'schema.version'; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.510.to.511.history.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.510.to.511.history.sql index bb5a80e2e8d080a0e227efacba7bed5b9259473a..530eadeda368ecae83a51315843eca347450c05f 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.510.to.511.history.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.510.to.511.history.sql @@ -1,6 +1,8 @@ create table ACT_HI_VARINST ( ID_ nvarchar(64) not null, - PROC_INST_ID_ nvarchar(64) not null, + PROC_INST_ID_ nvarchar(64), + EXECUTION_ID_ nvarchar(64), + TASK_ID_ nvarchar(64), NAME_ nvarchar(255) not null, VAR_TYPE_ nvarchar(100), REV_ int, @@ -15,16 +17,11 @@ create table ACT_HI_VARINST ( create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); -update ACT_GE_PROPERTY - set VALUE_ = VALUE_ + 1, - REV_ = REV_ + 1 - where NAME_ = 'historyLevel' and VALUE_ >= 2; - alter table ACT_HI_ACTINST - add column TASK_ID_ nvarchar(64); + add TASK_ID_ nvarchar(64); alter table ACT_HI_ACTINST - add column CALL_PROC_INST_ID_ nvarchar(64); + add CALL_PROC_INST_ID_ nvarchar(64); alter table ACT_HI_DETAIL alter column PROC_INST_ID_ nvarchar(64) null; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.510.to.511.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.510.to.511.engine.sql index 316cca13d01052edcb5c82035418be9a2a403912..8f18c1c10810911bae5d34d309bb30862d13bcc3 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.510.to.511.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.510.to.511.engine.sql @@ -13,6 +13,16 @@ alter table ACT_RE_DEPLOYMENT alter table ACT_RE_PROCDEF add DESCRIPTION_ varchar(4000); + +alter table ACT_RU_TASK + add SUSPENSION_STATE_ integer; + +update ACT_RU_TASK set SUSPENSION_STATE_ = 1; + +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); create table ACT_RE_MODEL ( ID_ varchar(64) not null, @@ -38,4 +48,7 @@ alter table ACT_RE_MODEL delete from ACT_GE_PROPERTY where NAME_ = 'historyLevel'; +alter table ACT_RU_JOB + add PROC_DEF_ID_ varchar(64); + update ACT_GE_PROPERTY set VALUE_ = '5.11' where NAME_ = 'schema.version'; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.510.to.511.history.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.510.to.511.history.sql index d8741e8550e71e1b689c7a084f230321e85f2eff..8c7cfb71fbfef90b6f6c71064b11997e6bea89c5 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.510.to.511.history.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.510.to.511.history.sql @@ -1,6 +1,8 @@ create table ACT_HI_VARINST ( ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), + TASK_ID_ varchar(64), NAME_ varchar(255) not null, VAR_TYPE_ varchar(100), REV_ integer, @@ -15,16 +17,11 @@ create table ACT_HI_VARINST ( create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); -update ACT_GE_PROPERTY - set VALUE_ = VALUE_ + 1, - REV_ = REV_ + 1 - where NAME_ = 'historyLevel' and VALUE_ >= 2; - alter table ACT_HI_ACTINST - add ASK_ID_ varchar(64); + add TASK_ID_ varchar(64); alter table ACT_HI_ACTINST - add CALL_PROC_INST_ID_ varchar(64)); + add CALL_PROC_INST_ID_ varchar(64); alter table ACT_HI_DETAIL MODIFY PROC_INST_ID_ varchar(64) null; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.510.to.511.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.510.to.511.engine.sql index 023e7941d2fe76d0d764e1a76bda5b164228ac94..c8dc6dec05917b8ff4f186e94e4c256af01d3e7f 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.510.to.511.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.510.to.511.engine.sql @@ -13,7 +13,12 @@ alter table ACT_RE_PROCDEF alter table ACT_RU_TASK add SUSPENSION_STATE_ INTEGER; -update ACT_RU_TASK set SUSPENSION_STATE= 1; +update ACT_RU_TASK set SUSPENSION_STATE_ = 1; + +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); create table ACT_RE_MODEL ( ID_ NVARCHAR2(64) not null, @@ -41,4 +46,7 @@ alter table ACT_RE_MODEL delete from ACT_GE_PROPERTY where NAME_ = 'historyLevel'; +alter table ACT_RU_JOB + add PROC_DEF_ID_ NVARCHAR2(64); + update ACT_GE_PROPERTY set VALUE_ = '5.11' where NAME_ = 'schema.version'; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.510.to.511.history.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.510.to.511.history.sql index 4ab10eb484a15441ca2b6eca61d8b4fee2a95cd1..237c4b78c1953e0d2a5790ec9b4b087d4b0110a6 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.510.to.511.history.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.510.to.511.history.sql @@ -1,6 +1,8 @@ create table ACT_HI_VARINST ( ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, + PROC_INST_ID_ NVARCHAR2(64), + EXECUTION_ID_ NVARCHAR2(64), + TASK_ID_ NVARCHAR2(64), NAME_ NVARCHAR2(255) not null, VAR_TYPE_ NVARCHAR2(100), REV_ INTEGER, @@ -15,11 +17,6 @@ create table ACT_HI_VARINST ( create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); -update ACT_GE_PROPERTY - set VALUE_ = VALUE_ + 1, - REV_ = REV_ + 1 - where NAME_ = 'historyLevel' and VALUE_ >= 2; - alter table ACT_HI_ACTINST add TASK_ID_ NVARCHAR2(64); diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.510.to.511.engine.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.510.to.511.engine.sql index 7af548fb50681ab729e9582e3e10e44dd3ae64a7..bd0b4677e6b7eab0f8393ed7426dac2157405e4b 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.510.to.511.engine.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.510.to.511.engine.sql @@ -10,10 +10,15 @@ add CATEGORY_ varchar(255); alter table ACT_RE_PROCDEF add DESCRIPTION_ varchar(4000); +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + alter table ACT_RU_TASK add SUSPENSION_STATE_ integer; -update ACT_RU_TASK set SUSPENSION_STATE= 1; +update ACT_RU_TASK set SUSPENSION_STATE_ = 1; create table ACT_RE_MODEL ( ID_ varchar(64) not null, @@ -41,4 +46,7 @@ alter table ACT_RE_MODEL delete from ACT_GE_PROPERTY where NAME_ = 'historyLevel'; +alter table ACT_RU_JOB + add PROC_DEF_ID_ varchar(64); + update ACT_GE_PROPERTY set VALUE_ = '5.11' where NAME_ = 'schema.version'; diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.510.to.511.history.sql b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.510.to.511.history.sql index 08dcc5d86edf988e2b5c98d48162f8c6e273eae5..ba0f89cf05626f4b4563c8f29d35d788591c17b3 100644 --- a/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.510.to.511.history.sql +++ b/modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.510.to.511.history.sql @@ -1,6 +1,8 @@ create table ACT_HI_VARINST ( ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), + TASK_ID_ varchar(64), NAME_ varchar(255) not null, VAR_TYPE_ varchar(100), REV_ integer, @@ -15,11 +17,6 @@ create table ACT_HI_VARINST ( create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); -update ACT_GE_PROPERTY - set VALUE_ = VALUE_ + 1, - REV_ = REV_ + 1 - where NAME_ = 'historyLevel' and VALUE_ >= 2; - alter table ACT_HI_ACTINST add column TASK_ID_ varchar(64); @@ -27,9 +24,9 @@ alter table ACT_HI_ACTINST add column CALL_PROC_INST_ID_ varchar(64); alter table ACT_HI_DETAIL - alter column PROC_DEF_ID_ set null; + alter column PROC_INST_ID_ drop not null; alter table ACT_HI_DETAIL - alter column EXECUTION_ID_ set null; + alter column EXECUTION_ID_ drop not null; create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_); \ No newline at end of file diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/form/FormServiceTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/form/FormServiceTest.java index 435de7231553029a54a61f37a86bb0ce63536274..d264bede6ee1bdf606664cf72b146321e86038fd 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/form/FormServiceTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/form/FormServiceTest.java @@ -15,8 +15,11 @@ package org.activiti.engine.test.api.form; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.activiti.engine.ActivitiException; import org.activiti.engine.form.FormProperty; @@ -267,11 +270,19 @@ public class FormServiceTest extends PluggableActivitiTestCase { assertEquals("enum", property.getType().getName()); Map values = (Map) property.getType().getInformation("values"); - Map expectedValues = new HashMap(); + Map expectedValues = new LinkedHashMap(); expectedValues.put("left", "Go Left"); expectedValues.put("right", "Go Right"); expectedValues.put("up", "Go Up"); expectedValues.put("down", "Go Down"); + + // ACT-1023: check if ordering is retained + Iterator> expectedValuesIterator = expectedValues.entrySet().iterator(); + for(Entry entry : values.entrySet()) { + Entry expectedEntryAtLocation = expectedValuesIterator.next(); + assertEquals(expectedEntryAtLocation.getKey(), entry.getKey()); + assertEquals(expectedEntryAtLocation.getValue(), entry.getValue()); + } assertEquals(expectedValues, values); } diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/ProcessDefinitionSuspensionTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/ProcessDefinitionSuspensionTest.java index 5c73fdf715805b1f7f40d5cf0805e8b055f1c021..f9a6de164892e74761e1bfa1c45ba2a5020c0416 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/ProcessDefinitionSuspensionTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/repository/ProcessDefinitionSuspensionTest.java @@ -286,11 +286,17 @@ public class ProcessDefinitionSuspensionTest extends PluggableActivitiTestCase { assertEquals(1, repositoryService.createProcessDefinitionQuery().active().count()); assertEquals(0, repositoryService.createProcessDefinitionQuery().suspended().count()); + // verify there is a job created + assertEquals(1, managementService.createJobQuery().processDefinitionId(processDefinition.getId()).count()); + // Move clock 8 days further and let job executor run long eightDaysSinceStartTime = oneWeekFromStartTime + (24 * 60 * 60 * 1000); ClockUtil.setCurrentTime(new Date(eightDaysSinceStartTime)); waitForJobExecutorToProcessAllJobs(5000L, 50L); + // verify job is now removed + assertEquals(0, managementService.createJobQuery().processDefinitionId(processDefinition.getId()).count()); + // Try to start process instance. It should fail now. try { runtimeService.startProcessInstanceById(processDefinition.getId()); @@ -475,6 +481,12 @@ public class ProcessDefinitionSuspensionTest extends PluggableActivitiTestCase { assertEquals(0, repositoryService.createProcessDefinitionQuery().suspended().count()); assertEquals(1, runtimeService.createProcessInstanceQuery().active().count()); + // Verify a job is created for each process definition + assertEquals(nrOfProcessDefinitions, managementService.createJobQuery().count()); + for (ProcessDefinition processDefinition : repositoryService.createProcessDefinitionQuery().list()) { + assertEquals(1, managementService.createJobQuery().processDefinitionId(processDefinition.getId()).count()); + } + // Move time 3 hours and run job executor ClockUtil.setCurrentTime(new Date(startTime.getTime() + (3 * hourInMs))); waitForJobExecutorToProcessAllJobs(5000L, 50L); diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/JobExecutorTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/JobExecutorTest.java index c857db20614b36505603c574626e2fa37b2aab1a..bca669b37a212f812ef2686b54f59164094bddf2 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/JobExecutorTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/JobExecutorTest.java @@ -12,15 +12,23 @@ */ package org.activiti.engine.test.jobexecutor; +import java.util.Calendar; import java.util.Date; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.TreeSet; +import org.activiti.engine.impl.Page; import org.activiti.engine.impl.interceptor.Command; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.interceptor.CommandExecutor; +import org.activiti.engine.impl.jobexecutor.GetUnlockedTimersByDuedateCmd; import org.activiti.engine.impl.persistence.entity.JobManager; +import org.activiti.engine.impl.persistence.entity.TimerEntity; +import org.activiti.engine.impl.util.ClockUtil; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.test.Deployment; @@ -39,6 +47,7 @@ public class JobExecutorTest extends JobExecutorTestCase { jobManager.send(createTweetMessage("message-three")); jobManager.send(createTweetMessage("message-four")); + jobManager.schedule(createTweetTimer("timer-one", new Date())); jobManager.schedule(createTweetTimer("timer-one", new Date())); jobManager.schedule(createTweetTimer("timer-two", new Date())); return null; @@ -58,4 +67,35 @@ public class JobExecutorTest extends JobExecutorTestCase { assertEquals(new TreeSet(expectedMessages), new TreeSet(messages)); } + + @Deployment + public void testSuspendedProcessTimerExecution() throws Exception { + // Process with boundary timer-event that fires in 1 hour + ProcessInstance procInst = runtimeService.startProcessInstanceByKey("suspendProcess"); + assertNotNull(procInst); + assertEquals(1, managementService.createJobQuery().processInstanceId(procInst.getId()).count()); + + // Shutdown the job-executor so timer's won't be executed + processEngineConfiguration.getJobExecutor().shutdown(); + + // Roll time ahead to be sure timer is due to fire + Calendar tomorrow = Calendar.getInstance(); + tomorrow.add(Calendar.DAY_OF_YEAR, 1); + ClockUtil.setCurrentTime(tomorrow.getTime()); + + // Check if timer is eligable to be executed, when process in not yet suspended + CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutorTxRequired(); + List jobs = commandExecutor.execute(new GetUnlockedTimersByDuedateCmd(ClockUtil.getCurrentTime(), new Page(0, 1))); + assertEquals(1, jobs.size()); + + // Suspend process instancd + runtimeService.suspendProcessInstanceById(procInst.getId()); + + // Check if the timer is NOT aquired, even though the duedate is reached + jobs = commandExecutor.execute(new GetUnlockedTimersByDuedateCmd(ClockUtil.getCurrentTime(), new Page(0, 1))); + assertEquals(0, jobs.size()); + + // Start job-executor again + processEngineConfiguration.getJobExecutor().start(); + } } diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/TweetExceptionHandler.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/TweetExceptionHandler.java index 90e7d120a7d4a41b738ff6afeea635effa1265c0..4e4ac74cd2dd7670ece017bf9613b9aaee1d59fa 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/TweetExceptionHandler.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/TweetExceptionHandler.java @@ -17,6 +17,7 @@ import java.util.logging.Logger; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.jobexecutor.JobHandler; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; /** @@ -32,7 +33,7 @@ public class TweetExceptionHandler implements JobHandler { return "tweet-exception"; } - public void execute(String configuration, ExecutionEntity execution, CommandContext commandContext) { + public void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext) { if (exceptionsRemaining>0) { exceptionsRemaining--; throw new RuntimeException("exception remaining: "+exceptionsRemaining); diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/TweetHandler.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/TweetHandler.java index 6c70974327a891f565e332d6cce3b5fd32a0d62d..c30565669385a32d2e870e55de92c6e4ba91af6b 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/TweetHandler.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/jobexecutor/TweetHandler.java @@ -18,6 +18,7 @@ import java.util.List; import org.activiti.engine.impl.interceptor.CommandContext; import org.activiti.engine.impl.jobexecutor.JobHandler; import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.impl.persistence.entity.JobEntity; import org.junit.Assert; public class TweetHandler implements JobHandler { @@ -27,8 +28,8 @@ public class TweetHandler implements JobHandler { public String getType() { return "tweet"; } - - public void execute(String configuration, ExecutionEntity execution, CommandContext commandContext) { + + public void execute(JobEntity job, String configuration, ExecutionEntity execution, CommandContext commandContext) { messages.add(configuration); Assert.assertNotNull(commandContext); } diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/jobexecutor/JobExecutortest.testSuspendedProcessTimerExecution.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/jobexecutor/JobExecutortest.testSuspendedProcessTimerExecution.bpmn20.xml new file mode 100644 index 0000000000000000000000000000000000000000..88c7afc464284ddd6cc2abd11fe812ca8d077eb4 --- /dev/null +++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/jobexecutor/JobExecutortest.testSuspendedProcessTimerExecution.bpmn20.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + PT1H + + + + + + + + + + diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/Constants.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/Constants.java index bca7fa561966ec3ac7b78e40645c0126ba4e2991..c35cde5c3e7a02e69f340ca20d1c0201408ba5b0 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/Constants.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/Constants.java @@ -12,6 +12,8 @@ */ package org.activiti.explorer; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -36,6 +38,9 @@ public class Constants { public static final String DEFAULT_DATE_FORMAT = "dd-MM-yyyy"; public static final String DEFAULT_TIME_FORMAT = "dd-MM-yyyy hh:mm:ss"; + public static final DateFormat DEFAULT_DATE_FORMATTER = new SimpleDateFormat(DEFAULT_DATE_FORMAT); + public static final DateFormat DEFAULT_TIME_FORMATTER = new SimpleDateFormat(DEFAULT_TIME_FORMAT); + // Default diagram image extension, when name cannot be deducted from resource name public static final String DEFAULT_DIAGRAM_IMAGE_EXTENSION = "png"; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/DefaultViewManager.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/DefaultViewManager.java index 1d06bcbb282f82a2f64bfc35300b1c6caea681cc..19336768473338a0289dfff84ff48c38171a6069 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/DefaultViewManager.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/DefaultViewManager.java @@ -34,6 +34,8 @@ import org.activiti.explorer.ui.management.deployment.DeploymentPage; import org.activiti.explorer.ui.management.identity.GroupPage; import org.activiti.explorer.ui.management.identity.UserPage; import org.activiti.explorer.ui.management.job.JobPage; +import org.activiti.explorer.ui.management.processdefinition.ActiveProcessDefinitionPage; +import org.activiti.explorer.ui.management.processdefinition.SuspendedProcessDefinitionPage; import org.activiti.explorer.ui.process.MyProcessInstancesPage; import org.activiti.explorer.ui.process.ProcessDefinitionPage; import org.activiti.explorer.ui.process.ProcessMenuBar; @@ -236,6 +238,22 @@ public class DefaultViewManager implements ViewManager { switchView(new DeploymentPage(deploymentId), ViewManager.MAIN_NAVIGATION_MANAGE, ManagementMenuBar.ENTRY_DEPLOYMENTS); } + public void showActiveProcessDefinitionsPage() { + switchView(new ActiveProcessDefinitionPage(), ViewManager.MAIN_NAVIGATION_MANAGE, ManagementMenuBar.ENTRY_ACTIVE_PROCESS_DEFINITIONS); + } + + public void showActiveProcessDefinitionsPage(String processDefinitionId) { + switchView(new ActiveProcessDefinitionPage(processDefinitionId), ViewManager.MAIN_NAVIGATION_MANAGE, ManagementMenuBar.ENTRY_ACTIVE_PROCESS_DEFINITIONS); + } + + public void showSuspendedProcessDefinitionsPage() { + switchView(new SuspendedProcessDefinitionPage(), ViewManager.MAIN_NAVIGATION_MANAGE, ManagementMenuBar.ENTRY_SUSPENDED_PROCESS_DEFINITIONS); + } + + public void showSuspendedProcessDefinitionsPage(String processDefinitionId) { + switchView(new SuspendedProcessDefinitionPage(processDefinitionId), ViewManager.MAIN_NAVIGATION_MANAGE, ManagementMenuBar.ENTRY_SUSPENDED_PROCESS_DEFINITIONS); + } + public void showJobPage() { switchView(new JobPage(), ViewManager.MAIN_NAVIGATION_MANAGE, ManagementMenuBar.ENTRY_JOBS); } diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ExplorerApp.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ExplorerApp.java index 1a4b55c58512d4d93856eab2d4440e041dbc7241..5a1f94ba93f291f25509f9e6829da9f30a93e4b2 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ExplorerApp.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ExplorerApp.java @@ -216,6 +216,15 @@ public class ExplorerApp extends Application implements HttpServletRequestListen } } + // Error handling --------------------------------------------------------------------------------- + + @Override + public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) { + super.terminalError(event); + + notificationManager.showErrorNotification(Messages.UNCAUGHT_EXCEPTION, event.getThrowable().getCause().getMessage()); + } + // URL Handling --------------------------------------------------------------------------------- public void setCurrentUriFragment(UriFragment fragment) { diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/Messages.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/Messages.java index 37d0984067a077e74eaa25a9c6dd8717e11de259..9b0dff816ec325b5a0c5a400004d480aeb2cd6aa 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/Messages.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/Messages.java @@ -28,6 +28,7 @@ public interface Messages { static final String BUTTON_OK = "button.ok"; static final String BUTTON_CREATE = "button.create"; static final String BUTTON_CANCEL = "button.cancel"; + static final String UNCAUGHT_EXCEPTION = "uncaught.exception"; // Navigation static final String NAVIGATION_ERROR_NOT_INVOLVED_TITLE = "navigation.error.not.involved.title"; @@ -193,12 +194,25 @@ public interface Messages { static final String PROCESS_DEPLOY_TIME = "process.deploy.time"; static final String PROCESS_HEADER_DIAGRAM = "process.header.diagram"; static final String PROCESS_NO_DIAGRAM = "process.no.diagram"; + static final String PROCESS_HEADER_SUSPENSION_STATE = "process.header.suspension.state"; + static final String PROCESS_SCHEDULED_SUSPEND = "process.scheduled.suspend"; + static final String PROCESS_SCHEDULED_ACTIVATE = "process.scheduled.activate"; static final String PROCESS_START = "process.start"; static final String PROCESS_EDIT = "process.edit"; static final String PROCESS_COPY = "process.copy"; static final String PROCESS_NEW = "process.new"; static final String PROCESS_DELETE = "process.delete"; static final String PROCESS_DEPLOY = "process.deploy"; + static final String PROCESS_ACTIVATE = "process.activate"; + static final String PROCESS_ACTIVATE_POPUP = "process.activate.popup"; + static final String PROCESS_ACTIVATE_POPUP_TIME_DESCRIPTION = "process.activate.popup.time.description"; + static final String PROCESS_ACTIVATE_POPUP_INCLUDE_PROCESS_INSTANCES_DESCRIPTION = "process.activate.popup.process.instances.description"; + static final String PROCESS_SUSPEND = "process.suspend"; + static final String PROCESS_SUSPEND_POPUP = "process.suspend.popup"; + static final String PROCESS_SUSPEND_POPUP_TIME_DESCRIPTION = "process.suspend.popup.time.description"; + static final String PROCESS_SUSPEND_POPUP_TIME_NOW = "process.suspend.popup.time.now"; + static final String PROCESS_SUSPEND_POPUP_TIME_DATE = "process.suspend.popup.time.date"; + static final String PROCESS_SUSPEND_POPUP_INCLUDE_PROCESS_INSTANCES_DESCRIPTION = "process.suspend.popup.process.instances.description"; static final String PROCESS_TOXML_FAILED = "process.toxml.failed"; static final String PROCESS_CONVERT = "process.convert"; static final String PROCESS_EXPORT = "process.export"; @@ -235,6 +249,8 @@ public interface Messages { // Management menu static final String MGMT_MENU_DATABASE = "management.menu.database"; static final String MGMT_MENU_DEPLOYMENTS = "management.menu.deployments"; + static final String MGMT_MENU_ACTIVE_PROCESS_DEFINITIONS = "management.menu.active.processdefinitions"; + static final String MGMT_MENU_SUSPENDED_PROCESS_DEFINITIONS = "management.menu.suspended.processdefinitions"; static final String MGMT_MENU_JOBS = "management.menu.jobs"; static final String MGMT_MENU_DEPLOYMENTS_SHOW_ALL = "management.menu.deployments.show.all"; static final String MGMT_MENU_DEPLOYMENTS_UPLOAD = "management.menu.deployments.upload"; @@ -244,6 +260,8 @@ public interface Messages { // Job page static final String JOB_EXECUTE = "job.execute"; + static final String JOB_DELETE = "job.delete"; + static final String JOB_DELETED = "job.deleted"; static final String JOB_HEADER_EXECUTION = "job.header.execution"; static final String JOB_RETRIES = "job.retries"; static final String JOB_NO_RETRIES = "job.no.retries"; @@ -254,6 +272,8 @@ public interface Messages { static final String JOB_NO_DUEDATE = "job.no.dudedate"; static final String JOB_ERROR = "job.error"; static final String JOB_NOT_EXECUTED = "job.not.executed"; + static final String JOB_SUSPEND_PROCESSDEFINITION = "job.suspend.processdefinition"; + static final String JOB_ACTIVATE_PROCESSDEFINITION = "job.activate.processdefinition"; // Deployment page static final String DEPLOYMENT_DELETE = "deployment.delete"; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ViewManager.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ViewManager.java index a340556288fd8e04ff86229258d5bd678d3d0ce7..d0fab9bed6494ed596ec676cf2e6630ff7e259d4 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ViewManager.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ViewManager.java @@ -89,6 +89,14 @@ public interface ViewManager { void showDeploymentPage(String deploymentId); + void showActiveProcessDefinitionsPage(); + + void showActiveProcessDefinitionsPage(String processDefinitionId); + + void showSuspendedProcessDefinitionsPage(); + + void showSuspendedProcessDefinitionsPage(String processDefinitionId); + void showJobPage(); void showJobPage(String jobId); diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/navigation/ActiveProcessDefinitionNavigator.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/navigation/ActiveProcessDefinitionNavigator.java new file mode 100644 index 0000000000000000000000000000000000000000..1d83b4dded239951bd97f32198de4508e9e99781 --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/navigation/ActiveProcessDefinitionNavigator.java @@ -0,0 +1,40 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.activiti.explorer.navigation; + +import org.activiti.explorer.ExplorerApp; + + +/** + * @author Joram Barrez + */ +public class ActiveProcessDefinitionNavigator extends ManagementNavigator { + + public static final String ACTIVE_PROC_DEF_URI_PART = "activeProcessDefinition"; + + public String getTrigger() { + return ACTIVE_PROC_DEF_URI_PART; + } + + public void handleManagementNavigation(UriFragment uriFragment) { + String processDefinitionId = uriFragment.getUriPart(1); + + if(processDefinitionId != null) { + ExplorerApp.get().getViewManager().showActiveProcessDefinitionsPage(processDefinitionId); + } else { + ExplorerApp.get().getViewManager().showActiveProcessDefinitionsPage(); + } + } + +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/navigation/SuspendedProcessDefinitionNavigator.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/navigation/SuspendedProcessDefinitionNavigator.java new file mode 100644 index 0000000000000000000000000000000000000000..c65b0fcf589c037624d91c99c41e2848c1294148 --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/navigation/SuspendedProcessDefinitionNavigator.java @@ -0,0 +1,40 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.activiti.explorer.navigation; + +import org.activiti.explorer.ExplorerApp; + + +/** + * @author Joram Barrez + */ +public class SuspendedProcessDefinitionNavigator extends ManagementNavigator { + + public static final String SUSPENDED_PROC_DEF_URI_PART = "suspendedProcessDefinition"; + + public String getTrigger() { + return SUSPENDED_PROC_DEF_URI_PART; + } + + public void handleManagementNavigation(UriFragment uriFragment) { + String processDefinitionId = uriFragment.getUriPart(1); + + if(processDefinitionId != null) { + ExplorerApp.get().getViewManager().showActiveProcessDefinitionsPage(processDefinitionId); + } else { + ExplorerApp.get().getViewManager().showActiveProcessDefinitionsPage(); + } + } + +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/alfresco/AlfrescoViewManager.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/alfresco/AlfrescoViewManager.java index 9f69b0db2d3033c809818412e4e7af42c953917e..326dc4e9a2ac416ae8edab499ea44095d36f1357 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/alfresco/AlfrescoViewManager.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/alfresco/AlfrescoViewManager.java @@ -15,7 +15,7 @@ package org.activiti.explorer.ui.alfresco; import org.activiti.explorer.DefaultViewManager; import org.activiti.explorer.ViewManager; -import org.activiti.explorer.ui.management.process.ProcessInstancePage; +import org.activiti.explorer.ui.management.processinstance.ProcessInstancePage; /** diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/custom/PopupWindow.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/custom/PopupWindow.java index 18a40d716b45894982ca8c05376fb7d968a14aa9..43538da0cc514c3ab589c31b9eb767bf80f8b744 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/custom/PopupWindow.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/custom/PopupWindow.java @@ -13,7 +13,6 @@ package org.activiti.explorer.ui.custom; -import com.vaadin.event.ShortcutAction; import com.vaadin.ui.Component; import com.vaadin.ui.Window; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/mainlayout/ExplorerLayout.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/mainlayout/ExplorerLayout.java index 29f7a12086696985202febea6770f8961634746b..eaedadf1e4937405b1e41d2397212098ac3648f9 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/mainlayout/ExplorerLayout.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/mainlayout/ExplorerLayout.java @@ -72,7 +72,6 @@ public interface ExplorerLayout { static final String STYLE_ADD = "add"; static final String STYLE_NO_LINE = "no-line"; - static final String STYLE_APPLICATION_LOGO = "logo"; static final String STYLE_WORKFLOW_CONSOLE_LOGO = "workflow-console-logo"; static final String STYLE_MAIN_MENU_BUTTON = "main-menu-button"; @@ -129,6 +128,10 @@ public interface ExplorerLayout { static final String STYLE_JOB_EXCEPTION_MESSAGE = "job-exception-message"; static final String STYLE_JOB_EXCEPTION_TRACE = "job-exception-trace"; static final String STYLE_JOB_HEADER_DUE_DATE = "job-duedate"; + + // Process definitions page + + static final String STYLE_PROCESS_DEFINITION_SUSPEND_CHOICE = "process-definition-suspend-choice"; // Related content static final String STYLE_RELATED_CONTENT_LIST = "related-content-list"; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/ManagementMenuBar.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/ManagementMenuBar.java index 25fa48da98cfb6794911bfd4d477ed76937a3f5d..b54ee6a3fa5e7420acb7d14370ce66baa9d8a291 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/ManagementMenuBar.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/ManagementMenuBar.java @@ -30,6 +30,8 @@ public class ManagementMenuBar extends ToolBar { public static final String ENTRY_DATABASE = "database"; public static final String ENTRY_DEPLOYMENTS = "deployments"; + public static final String ENTRY_ACTIVE_PROCESS_DEFINITIONS = "activeProcessDefinitions"; + public static final String ENTRY_SUSPENDED_PROCESS_DEFINITIONS = "suspendedProcessDefinitions"; public static final String ENTRY_JOBS = "jobs"; public static final String ENTRY_USERS = "users"; public static final String ENTRY_GROUPS = "groups"; @@ -49,6 +51,8 @@ public class ManagementMenuBar extends ToolBar { protected void initToolbarEntries() { addDatabaseToolbarEntry(); addDeploymentsToolbarEntry(); + addActiveProcessDefinitionsEntry(); + addSuspendedProcessDefinitionsEntry(); addJobsToolbarEntry(); addUsersToolbarEntry(); addGroupToolbarEntry(); @@ -72,6 +76,24 @@ public class ManagementMenuBar extends ToolBar { }); deploymentEntry.addMenuItem(i18nManager.getMessage(Messages.MGMT_MENU_DEPLOYMENTS_UPLOAD), new NewDeploymentListener()); } + + protected void addActiveProcessDefinitionsEntry() { + addToolbarEntry(ENTRY_ACTIVE_PROCESS_DEFINITIONS, + i18nManager.getMessage(Messages.MGMT_MENU_ACTIVE_PROCESS_DEFINITIONS), new ToolbarCommand() { + public void toolBarItemSelected() { + viewManager.showActiveProcessDefinitionsPage(); + } + }); + } + + protected void addSuspendedProcessDefinitionsEntry() { + addToolbarEntry(ENTRY_SUSPENDED_PROCESS_DEFINITIONS, + i18nManager.getMessage(Messages.MGMT_MENU_SUSPENDED_PROCESS_DEFINITIONS), new ToolbarCommand() { + public void toolBarItemSelected() { + viewManager.showSuspendedProcessDefinitionsPage(); + } + }); + } protected void addJobsToolbarEntry() { addToolbarEntry(ENTRY_JOBS, i18nManager.getMessage(Messages.MGMT_MENU_JOBS), new ToolbarCommand() { diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/identity/UserPage.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/identity/UserPage.java index 248f2e134991cdf113267ddc767e0263644789a7..6c97f6ad8c515df71b42134e430a1897efc1c4d4 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/identity/UserPage.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/identity/UserPage.java @@ -25,7 +25,6 @@ import org.activiti.explorer.ui.util.ThemeImageColumnGenerator; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.ui.Component; import com.vaadin.ui.Table; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/job/JobDetailPanel.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/job/JobDetailPanel.java index d4570f002307748c38266239f5358b0684abcfef..a1ba4bd6c2256d0294adaa4d1c6a8be6cbab90bb 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/job/JobDetailPanel.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/job/JobDetailPanel.java @@ -15,6 +15,9 @@ package org.activiti.explorer.ui.management.job; import org.activiti.engine.ActivitiException; import org.activiti.engine.ManagementService; import org.activiti.engine.ProcessEngines; +import org.activiti.engine.impl.jobexecutor.TimerActivateProcessDefinitionHandler; +import org.activiti.engine.impl.jobexecutor.TimerSuspendProcessDefinitionHandler; +import org.activiti.engine.impl.persistence.entity.JobEntity; import org.activiti.engine.impl.persistence.entity.MessageEntity; import org.activiti.engine.impl.persistence.entity.TimerEntity; import org.activiti.engine.runtime.Job; @@ -32,6 +35,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; @@ -71,6 +75,18 @@ public class JobDetailPanel extends DetailPanel { } protected void addActions() { + Button deleteButton = new Button(i18nManager.getMessage(Messages.JOB_DELETE)); + deleteButton.setIcon(Images.DELETE); + deleteButton.addListener(new ClickListener() { + private static final long serialVersionUID = 1L; + public void buttonClick(ClickEvent event) { + managementService.deleteJob(job.getId()); + + notificationManager.showInformationNotification(Messages.JOB_DELETED); + jobPage.refreshSelectNext(); + } + }); + Button executeButton = new Button(i18nManager.getMessage(Messages.JOB_EXECUTE)); executeButton.setIcon(Images.EXECUTE); executeButton.addListener(new ClickListener() { @@ -88,37 +104,38 @@ public class JobDetailPanel extends DetailPanel { } } }); - + jobPage.getToolBar().removeAllButtons(); jobPage.getToolBar().addButton(executeButton); + jobPage.getToolBar().addButton(deleteButton); } protected void addHeader() { - GridLayout taskDetails = new GridLayout(3, 2); - taskDetails.setWidth(100, UNITS_PERCENTAGE); - taskDetails.addStyleName(ExplorerLayout.STYLE_TITLE_BLOCK); - taskDetails.setSpacing(true); - taskDetails.setMargin(false, false, true, false); + GridLayout jobDetails = new GridLayout(3, 2); + jobDetails.setWidth(100, UNITS_PERCENTAGE); + jobDetails.addStyleName(ExplorerLayout.STYLE_TITLE_BLOCK); + jobDetails.setSpacing(true); + jobDetails.setMargin(false, false, true, false); // Add image Embedded image = new Embedded(null, Images.JOB_50); - taskDetails.addComponent(image, 0, 0, 0, 1); + jobDetails.addComponent(image, 0, 0, 0, 1); // Add job name Label nameLabel = new Label(getJobLabel(job)); nameLabel.addStyleName(Reindeer.LABEL_H2); - taskDetails.addComponent(nameLabel, 1, 0, 2, 0); + jobDetails.addComponent(nameLabel, 1, 0, 2, 0); // Add due date PrettyTimeLabel dueDateLabel = new PrettyTimeLabel(i18nManager.getMessage(Messages.JOB_DUEDATE), job.getDuedate(), i18nManager.getMessage(Messages.JOB_NO_DUEDATE), false); dueDateLabel.addStyleName(ExplorerLayout.STYLE_JOB_HEADER_DUE_DATE); - taskDetails.addComponent(dueDateLabel, 1, 1); + jobDetails.addComponent(dueDateLabel, 1, 1); - taskDetails.setColumnExpandRatio(1, 1.0f); - taskDetails.setColumnExpandRatio(2, 1.0f); + jobDetails.setColumnExpandRatio(1, 1.0f); + jobDetails.setColumnExpandRatio(2, 1.0f); - addDetailComponent(taskDetails); + addDetailComponent(jobDetails); } protected String getJobLabel(Job theJob) { @@ -177,11 +194,57 @@ public class JobDetailPanel extends DetailPanel { layout.addComponent(stackPanel); layout.setExpandRatio(stackPanel, 1.0f); } else { - Label noException = new Label(i18nManager.getMessage(Messages.JOB_NOT_EXECUTED)); - layout.addComponent(noException); - layout.setExpandRatio(noException, 1.0f); + + if (job.getProcessDefinitionId() != null) { + + // This is a hack .. need to cleanify this in the engine + JobEntity jobEntity = (JobEntity) job; + if (jobEntity.getJobHandlerType().equals(TimerSuspendProcessDefinitionHandler.TYPE)) { + addLinkToProcessDefinition(layout, i18nManager.getMessage(Messages.JOB_SUSPEND_PROCESSDEFINITION), false); + } else if (jobEntity.getJobHandlerType().equals(TimerActivateProcessDefinitionHandler.TYPE)) { + addLinkToProcessDefinition(layout, i18nManager.getMessage(Messages.JOB_ACTIVATE_PROCESSDEFINITION), true); + } else { + addNotYetExecutedLabel(layout); + } + + } else { + + addNotYetExecutedLabel(layout); + + } } } + + protected void addLinkToProcessDefinition(final VerticalLayout verticalLayout, final String labelText, final boolean isSuspendedProcessDefinition) { + HorizontalLayout layout = new HorizontalLayout(); + verticalLayout.addComponent(layout); + + Label processDefinitionLabel = new Label(labelText); + processDefinitionLabel.setSizeUndefined(); + layout.addComponent(processDefinitionLabel); + + layout.addComponent(new Label(" ", Label.CONTENT_XHTML)); + + Button showProcessDefinitionLink = new Button(job.getProcessDefinitionId()); + showProcessDefinitionLink.addStyleName(Reindeer.BUTTON_LINK); + showProcessDefinitionLink.addListener(new ClickListener() { + private static final long serialVersionUID = 1L; + public void buttonClick(ClickEvent event) { + if (isSuspendedProcessDefinition) { + ExplorerApp.get().getViewManager().showSuspendedProcessDefinitionsPage(job.getProcessDefinitionId()); + } else { + ExplorerApp.get().getViewManager().showActiveProcessDefinitionsPage(job.getProcessDefinitionId()); + } + } + }); + layout.addComponent(showProcessDefinitionLink); + } + + private void addNotYetExecutedLabel(VerticalLayout layout) { + Label noException = new Label(i18nManager.getMessage(Messages.JOB_NOT_EXECUTED)); + layout.addComponent(noException); + layout.setExpandRatio(noException, 1.0f); + } protected String getRetriesLabel(Job theJob) { String retriesString; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ActiveProcessDefinitionDetailPanel.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ActiveProcessDefinitionDetailPanel.java new file mode 100644 index 0000000000000000000000000000000000000000..e1a14f8d95588d3353537af3e841264c851daf60 --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ActiveProcessDefinitionDetailPanel.java @@ -0,0 +1,75 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.explorer.ui.management.processdefinition; + +import java.util.List; + +import org.activiti.engine.ProcessEngines; +import org.activiti.engine.impl.jobexecutor.TimerSuspendProcessDefinitionHandler; +import org.activiti.engine.impl.persistence.entity.JobEntity; +import org.activiti.engine.runtime.Job; +import org.activiti.explorer.ExplorerApp; +import org.activiti.explorer.Messages; +import org.activiti.explorer.ui.AbstractPage; +import org.activiti.explorer.ui.process.AbstractProcessDefinitionDetailPanel; + +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; + +/** + * @author Joram Barrez + */ +public class ActiveProcessDefinitionDetailPanel extends AbstractProcessDefinitionDetailPanel { + + private static final long serialVersionUID = 1L; + + public ActiveProcessDefinitionDetailPanel(String processDefinitionId, ActiveProcessDefinitionPage activeProcessDefinitionPage) { + super(processDefinitionId, activeProcessDefinitionPage); + } + + protected void initActions(final AbstractPage parentPage) { + ActiveProcessDefinitionPage processDefinitionPage = (ActiveProcessDefinitionPage) parentPage; + + Button suspendButton = new Button(i18nManager.getMessage(Messages.PROCESS_SUSPEND)); + suspendButton.addListener(new ClickListener() { + + private static final long serialVersionUID = 1L; + + public void buttonClick(ClickEvent event) { + ChangeProcessSuspensionStatePopupWindow popupWindow = + new ChangeProcessSuspensionStatePopupWindow(processDefinition.getId(), parentPage, true); + ExplorerApp.get().getViewManager().showPopupWindow(popupWindow); + } + + }); + + // Check if button must be disabled + boolean suspendJobPending = false; + List jobs = ProcessEngines.getDefaultProcessEngine().getManagementService() + .createJobQuery().processDefinitionId(processDefinition.getId()).list(); + for (Job job : jobs) { + // TODO: this is a hack. Needs to be cleaner in engine! + if ( ((JobEntity) job).getJobHandlerType().equals(TimerSuspendProcessDefinitionHandler.TYPE) ) { + suspendJobPending = true; + break; + } + } + suspendButton.setEnabled(!suspendJobPending); + + // Clear toolbar and add 'start' button + processDefinitionPage.getToolBar().removeAllButtons(); + processDefinitionPage.getToolBar().addButton(suspendButton); + } + +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ActiveProcessDefinitionListQuery.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ActiveProcessDefinitionListQuery.java new file mode 100644 index 0000000000000000000000000000000000000000..ce542ff15d74414cc871c2b7208fd5bc7ac050ae --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ActiveProcessDefinitionListQuery.java @@ -0,0 +1,66 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.activiti.explorer.ui.management.processdefinition; + +import java.util.ArrayList; +import java.util.List; + +import org.activiti.engine.ProcessEngines; +import org.activiti.engine.RepositoryService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.explorer.data.AbstractLazyLoadingQuery; + +import com.vaadin.data.Item; + + +/** + * @author Joram Barrez + */ +public class ActiveProcessDefinitionListQuery extends AbstractLazyLoadingQuery { + + protected RepositoryService repositoryService; + + public ActiveProcessDefinitionListQuery() { + this.repositoryService = ProcessEngines.getDefaultProcessEngine().getRepositoryService(); + } + + public int size() { + return (int) repositoryService.createProcessDefinitionQuery().active().count(); + } + + public List loadItems(int start, int count) { + List processDefinitions = repositoryService.createProcessDefinitionQuery() + .active() + .orderByProcessDefinitionName().asc() + .orderByProcessDefinitionVersion().asc() + .listPage(start, count); + + List processDefinitionItems = new ArrayList(); + for (ProcessDefinition processDefinition : processDefinitions) { + processDefinitionItems.add(new ProcessDefinitionListItem(processDefinition)); + } + + return processDefinitionItems; + } + + public Item loadSingleResult(String id) { + return new ProcessDefinitionListItem(repositoryService.createProcessDefinitionQuery() + .processDefinitionId(id).singleResult()); + } + + public void setSorting(Object[] propertyIds, boolean[] ascending) { + throw new UnsupportedOperationException(); + } + +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ActiveProcessDefinitionPage.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ActiveProcessDefinitionPage.java new file mode 100644 index 0000000000000000000000000000000000000000..0bfaeb5c47e81c1ccad3608a3c52980edd7b83b7 --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ActiveProcessDefinitionPage.java @@ -0,0 +1,96 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.explorer.ui.management.processdefinition; + +import org.activiti.explorer.ExplorerApp; +import org.activiti.explorer.data.LazyLoadingContainer; +import org.activiti.explorer.data.LazyLoadingQuery; +import org.activiti.explorer.navigation.ActiveProcessDefinitionNavigator; +import org.activiti.explorer.navigation.UriFragment; +import org.activiti.explorer.ui.management.ManagementPage; + +import com.vaadin.data.Item; +import com.vaadin.data.Property; +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.ui.Table; + +/** + * @author Joram Barrez + */ +public class ActiveProcessDefinitionPage extends ManagementPage { + + private static final long serialVersionUID = 1L; + protected String processDefinitionId; + protected Table processDefinitionTable; + protected LazyLoadingQuery processDefinitionListQuery; + protected LazyLoadingContainer processDefinitionListContainer; + + public ActiveProcessDefinitionPage() { + ExplorerApp.get().setCurrentUriFragment( + new UriFragment(ActiveProcessDefinitionNavigator.ACTIVE_PROC_DEF_URI_PART)); + } + + public ActiveProcessDefinitionPage(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; + } + + @Override + protected void initUi() { + super.initUi(); + + if (processDefinitionId == null) { + selectElement(0); + } else { + selectElement(processDefinitionListContainer.getIndexForObjectId(processDefinitionId)); + } + } + + protected Table createList() { + processDefinitionTable = new Table(); + + processDefinitionListQuery = new ActiveProcessDefinitionListQuery(); + processDefinitionListContainer = new LazyLoadingContainer(processDefinitionListQuery); + processDefinitionTable.setContainerDataSource(processDefinitionListContainer); + + // Column headers + processDefinitionTable.addContainerProperty("name", String.class, null); + processDefinitionTable.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN); + + // Listener to change right panel when clicked on a user + processDefinitionTable.addListener(new Property.ValueChangeListener() { + + private static final long serialVersionUID = 1L; + + public void valueChange(ValueChangeEvent event) { + Item item = processDefinitionTable.getItem(event.getProperty().getValue()); // the value of the property is the itemId of the table entry + if (item != null) { + String processDefinitionId = (String) item.getItemProperty("id").getValue(); + setDetailComponent(new ActiveProcessDefinitionDetailPanel(processDefinitionId, ActiveProcessDefinitionPage.this)); + + // Update URL + ExplorerApp.get().setCurrentUriFragment( + new UriFragment(ActiveProcessDefinitionNavigator.ACTIVE_PROC_DEF_URI_PART, processDefinitionId)); + + } else { + // Nothing selected + setDetailComponent(null); + ExplorerApp.get().setCurrentUriFragment(new UriFragment(ActiveProcessDefinitionNavigator.ACTIVE_PROC_DEF_URI_PART)); + } + } + + }); + + return processDefinitionTable; + } + +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ChangeProcessSuspensionStatePopupWindow.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ChangeProcessSuspensionStatePopupWindow.java new file mode 100644 index 0000000000000000000000000000000000000000..8e2f54517921bee5cc8fa6acd88f40571bbe816d --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ChangeProcessSuspensionStatePopupWindow.java @@ -0,0 +1,174 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.explorer.ui.management.processdefinition; + +import java.util.Date; + +import org.activiti.engine.ProcessEngines; +import org.activiti.engine.RepositoryService; +import org.activiti.explorer.ExplorerApp; +import org.activiti.explorer.I18nManager; +import org.activiti.explorer.Messages; +import org.activiti.explorer.ui.AbstractPage; +import org.activiti.explorer.ui.custom.PopupWindow; +import org.activiti.explorer.ui.mainlayout.ExplorerLayout; + +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.ui.Alignment; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.DateField; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.Reindeer; + +/** + * @author Joram Barrez + */ +public class ChangeProcessSuspensionStatePopupWindow extends PopupWindow { + + private static final long serialVersionUID = 1L; + + protected I18nManager i18nManager; + protected String processDefinitionId; + + protected AbstractPage parentPage; + protected VerticalLayout verticalLayout; + protected CheckBox nowCheckBox; + protected CheckBox dateCheckBox; + protected DateField dateField; + protected CheckBox includeProcessInstancesCheckBox; + + public ChangeProcessSuspensionStatePopupWindow(String processDefinitionId, AbstractPage parentPage, boolean suspend) { + this.processDefinitionId = processDefinitionId; + this.parentPage = parentPage; + this.i18nManager = ExplorerApp.get().getI18nManager(); + + setCaption(suspend ? i18nManager.getMessage(Messages.PROCESS_SUSPEND_POPUP) : + i18nManager.getMessage(Messages.PROCESS_ACTIVATE_POPUP)); + setModal(true); + center(); + setResizable(false); + setWidth(400, UNITS_PIXELS); + setHeight(300, UNITS_PIXELS); + addStyleName(Reindeer.WINDOW_LIGHT); + + verticalLayout = new VerticalLayout(); + addComponent(verticalLayout); + addTimeSection(suspend); + addIncludeProcessInstancesSection(suspend); + addOkButton(suspend); + } + + protected void addTimeSection(boolean suspend) { + Label timeLabel = new Label(suspend ? i18nManager.getMessage(Messages.PROCESS_SUSPEND_POPUP_TIME_DESCRIPTION) + : i18nManager.getMessage(Messages.PROCESS_ACTIVATE_POPUP_TIME_DESCRIPTION)); + verticalLayout.addComponent(timeLabel); + verticalLayout.addComponent(new Label(" ", Label.CONTENT_XHTML)); + + nowCheckBox = new CheckBox(i18nManager.getMessage(Messages.PROCESS_SUSPEND_POPUP_TIME_NOW), true); + nowCheckBox.addStyleName(ExplorerLayout.STYLE_PROCESS_DEFINITION_SUSPEND_CHOICE); + nowCheckBox.setImmediate(true); + nowCheckBox.addListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + if (nowCheckBox.booleanValue() == true) { + dateField.setValue(null); + dateCheckBox.setValue(false); + } else { + dateCheckBox.setValue(true); + dateField.setValue(new Date()); + } + } + }); + verticalLayout.addComponent(nowCheckBox); + + HorizontalLayout dateLayout = new HorizontalLayout(); + verticalLayout.addComponent(dateLayout); + + dateCheckBox = new CheckBox(i18nManager.getMessage(Messages.PROCESS_SUSPEND_POPUP_TIME_DATE)); + dateCheckBox.addStyleName(ExplorerLayout.STYLE_PROCESS_DEFINITION_SUSPEND_CHOICE); + dateCheckBox.setImmediate(true); + dateCheckBox.addListener(new ClickListener() { + public void buttonClick(ClickEvent event) { + if (dateCheckBox.booleanValue() == true) { + dateField.setValue(new Date()); + nowCheckBox.setValue(false); + } else { + dateField.setValue(null); + nowCheckBox.setValue(true); + } + } + }); + dateLayout.addComponent(dateCheckBox); + + dateField = new DateField(); + dateField.setImmediate(true); + dateField.addListener(new ValueChangeListener() { + + public void valueChange(ValueChangeEvent event) { + if (dateField.getValue() != null) { + nowCheckBox.setValue(false); + dateCheckBox.setValue(true); + } + } + + }); + dateLayout.addComponent(dateField); + } + + protected void addIncludeProcessInstancesSection(boolean suspend) { + verticalLayout.addComponent(new Label(" ", Label.CONTENT_XHTML)); + verticalLayout.addComponent(new Label(" ", Label.CONTENT_XHTML)); + + includeProcessInstancesCheckBox = new CheckBox(suspend ? + i18nManager.getMessage(Messages.PROCESS_SUSPEND_POPUP_INCLUDE_PROCESS_INSTANCES_DESCRIPTION) : + i18nManager.getMessage(Messages.PROCESS_ACTIVATE_POPUP_INCLUDE_PROCESS_INSTANCES_DESCRIPTION), true); + verticalLayout.addComponent(includeProcessInstancesCheckBox); + } + + protected void addOkButton(final boolean suspend) { + verticalLayout.addComponent(new Label(" ", Label.CONTENT_XHTML)); + verticalLayout.addComponent(new Label(" ", Label.CONTENT_XHTML)); + + Button okButton = new Button(i18nManager.getMessage(Messages.BUTTON_OK)); + verticalLayout.addComponent(okButton); + verticalLayout.setComponentAlignment(okButton, Alignment.BOTTOM_CENTER); + + okButton.addListener(new ClickListener() { + + private static final long serialVersionUID = 1L; + + public void buttonClick(ClickEvent event) { + RepositoryService repositoryService = ProcessEngines.getDefaultProcessEngine().getRepositoryService(); + boolean includeProcessInstances = (Boolean) includeProcessInstancesCheckBox.getValue(); + + if (suspend) { + repositoryService.suspendProcessDefinitionById(processDefinitionId, + includeProcessInstances, (Date) dateField.getValue()); + } else { + repositoryService.activateProcessDefinitionById(processDefinitionId, + includeProcessInstances, (Date) dateField.getValue()); + } + + close(); + parentPage.refreshSelectNext(); // select next item in list on the left + } + + }); + } + +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ProcessDefinitionListItem.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ProcessDefinitionListItem.java new file mode 100644 index 0000000000000000000000000000000000000000..f519bff156034f49c9600fa589ae46267f9bca19 --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/ProcessDefinitionListItem.java @@ -0,0 +1,56 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.explorer.ui.management.processdefinition; + +import org.activiti.engine.repository.ProcessDefinition; + +import com.vaadin.data.util.ObjectProperty; +import com.vaadin.data.util.PropertysetItem; + +/** + * @author Joram Barrez + */ +public class ProcessDefinitionListItem extends PropertysetItem implements Comparable { + + private static final long serialVersionUID = 1L; + + public ProcessDefinitionListItem(ProcessDefinition processDefinition) { + addItemProperty("id", new ObjectProperty(processDefinition.getId(), String.class)); + addItemProperty("key", new ObjectProperty(processDefinition.getKey(), String.class)); + addItemProperty("name", new ObjectProperty(processDefinition.getName() ,String.class)); + addItemProperty("version", new ObjectProperty(processDefinition.getVersion() ,Integer.class)); + } + + public int compareTo(ProcessDefinitionListItem other) { + String name = (String) getItemProperty("name").getValue(); + String otherName = (String) other.getItemProperty("name").getValue(); + + int comparison = name.compareTo(otherName); + if (comparison != 0) { + return comparison; + } else { + String key = (String) getItemProperty("key").getValue(); + String otherKey = (String) other.getItemProperty("key").getValue(); + comparison = key.compareTo(otherKey); + + if (comparison != 0) { + return comparison; + } else { + Integer version = (Integer) getItemProperty("version").getValue(); + Integer otherVersion = (Integer) other.getItemProperty("version").getValue(); + return version.compareTo(otherVersion); + } + } + } + +} \ No newline at end of file diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/SuspendedProcessDefinitionDetailPanel.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/SuspendedProcessDefinitionDetailPanel.java new file mode 100644 index 0000000000000000000000000000000000000000..6aee0e6698d931b56de7e31651586242821dacb8 --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/SuspendedProcessDefinitionDetailPanel.java @@ -0,0 +1,75 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.explorer.ui.management.processdefinition; + +import java.util.List; + +import org.activiti.engine.ProcessEngines; +import org.activiti.engine.impl.jobexecutor.TimerActivateProcessDefinitionHandler; +import org.activiti.engine.impl.persistence.entity.JobEntity; +import org.activiti.engine.runtime.Job; +import org.activiti.explorer.ExplorerApp; +import org.activiti.explorer.Messages; +import org.activiti.explorer.ui.AbstractPage; +import org.activiti.explorer.ui.process.AbstractProcessDefinitionDetailPanel; + +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; + +/** + * @author Joram Barrez + */ +public class SuspendedProcessDefinitionDetailPanel extends AbstractProcessDefinitionDetailPanel { + + private static final long serialVersionUID = 1L; + + public SuspendedProcessDefinitionDetailPanel(String processDefinitionId, SuspendedProcessDefinitionPage suspendedProcessDefinitionPage) { + super(processDefinitionId, suspendedProcessDefinitionPage); + } + + protected void initActions(final AbstractPage parentPage) { + SuspendedProcessDefinitionPage processDefinitionPage = (SuspendedProcessDefinitionPage) parentPage; + + Button activateButton = new Button(i18nManager.getMessage(Messages.PROCESS_ACTIVATE)); + activateButton.addListener(new ClickListener() { + + private static final long serialVersionUID = 1L; + + public void buttonClick(ClickEvent event) { + ChangeProcessSuspensionStatePopupWindow popupWindow = + new ChangeProcessSuspensionStatePopupWindow(processDefinition.getId(), parentPage, false); + ExplorerApp.get().getViewManager().showPopupWindow(popupWindow); + } + + }); + + // Check if already activation job pending + boolean activateJobPending = false; + List jobs = ProcessEngines.getDefaultProcessEngine().getManagementService() + .createJobQuery().processDefinitionId(processDefinition.getId()).list(); + for (Job job : jobs) { + // TODO: this is a hack. Needs to be cleaner in engine! + if ( ((JobEntity) job).getJobHandlerType().equals(TimerActivateProcessDefinitionHandler.TYPE) ) { + activateJobPending = true; + break; + } + } + activateButton.setEnabled(!activateJobPending); + + // Clear toolbar and add 'start' button + processDefinitionPage.getToolBar().removeAllButtons(); + processDefinitionPage.getToolBar().addButton(activateButton); + } + +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/SuspendedProcessDefinitionListQuery.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/SuspendedProcessDefinitionListQuery.java new file mode 100644 index 0000000000000000000000000000000000000000..85df4c21614da7c906e63ab70849fdb270e8b620 --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/SuspendedProcessDefinitionListQuery.java @@ -0,0 +1,66 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.activiti.explorer.ui.management.processdefinition; + +import java.util.ArrayList; +import java.util.List; + +import org.activiti.engine.ProcessEngines; +import org.activiti.engine.RepositoryService; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.explorer.data.AbstractLazyLoadingQuery; + +import com.vaadin.data.Item; + + +/** + * @author Joram Barrez + */ +public class SuspendedProcessDefinitionListQuery extends AbstractLazyLoadingQuery { + + protected RepositoryService repositoryService; + + public SuspendedProcessDefinitionListQuery() { + this.repositoryService = ProcessEngines.getDefaultProcessEngine().getRepositoryService(); + } + + public int size() { + return (int) repositoryService.createProcessDefinitionQuery().suspended().count(); + } + + public List loadItems(int start, int count) { + List processDefinitions = repositoryService.createProcessDefinitionQuery() + .suspended() + .orderByProcessDefinitionName().asc() + .orderByProcessDefinitionVersion().asc() + .listPage(start, count); + + List processDefinitionItems = new ArrayList(); + for (ProcessDefinition processDefinition : processDefinitions) { + processDefinitionItems.add(new ProcessDefinitionListItem(processDefinition)); + } + + return processDefinitionItems; + } + + public Item loadSingleResult(String id) { + return new ProcessDefinitionListItem(repositoryService.createProcessDefinitionQuery() + .processDefinitionId(id).singleResult()); + } + + public void setSorting(Object[] propertyIds, boolean[] ascending) { + throw new UnsupportedOperationException(); + } + +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/SuspendedProcessDefinitionPage.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/SuspendedProcessDefinitionPage.java new file mode 100644 index 0000000000000000000000000000000000000000..34ee20c9fb3d612ca867b25b9cc89e979dd17b0d --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processdefinition/SuspendedProcessDefinitionPage.java @@ -0,0 +1,97 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.explorer.ui.management.processdefinition; + +import org.activiti.explorer.ExplorerApp; +import org.activiti.explorer.data.LazyLoadingContainer; +import org.activiti.explorer.data.LazyLoadingQuery; +import org.activiti.explorer.navigation.ActiveProcessDefinitionNavigator; +import org.activiti.explorer.navigation.SuspendedProcessDefinitionNavigator; +import org.activiti.explorer.navigation.UriFragment; +import org.activiti.explorer.ui.management.ManagementPage; + +import com.vaadin.data.Item; +import com.vaadin.data.Property; +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.ui.Table; + +/** + * @author Joram Barrez + */ +public class SuspendedProcessDefinitionPage extends ManagementPage { + + private static final long serialVersionUID = 1L; + protected String processDefinitionId; + protected Table processDefinitionTable; + protected LazyLoadingQuery processDefinitionListQuery; + protected LazyLoadingContainer processDefinitionListContainer; + + public SuspendedProcessDefinitionPage() { + ExplorerApp.get().setCurrentUriFragment( + new UriFragment(SuspendedProcessDefinitionNavigator.SUSPENDED_PROC_DEF_URI_PART)); + } + + public SuspendedProcessDefinitionPage(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; + } + + @Override + protected void initUi() { + super.initUi(); + + if (processDefinitionId == null) { + selectElement(0); + } else { + selectElement(processDefinitionListContainer.getIndexForObjectId(processDefinitionId)); + } + } + + protected Table createList() { + processDefinitionTable = new Table(); + + processDefinitionListQuery = new SuspendedProcessDefinitionListQuery(); + processDefinitionListContainer = new LazyLoadingContainer(processDefinitionListQuery); + processDefinitionTable.setContainerDataSource(processDefinitionListContainer); + + // Column headers + processDefinitionTable.addContainerProperty("name", String.class, null); + processDefinitionTable.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN); + + // Listener to change right panel when clicked on a user + processDefinitionTable.addListener(new Property.ValueChangeListener() { + + private static final long serialVersionUID = 1L; + + public void valueChange(ValueChangeEvent event) { + Item item = processDefinitionTable.getItem(event.getProperty().getValue()); // the value of the property is the itemId of the table entry + if (item != null) { + String processDefinitionId = (String) item.getItemProperty("id").getValue(); + setDetailComponent(new SuspendedProcessDefinitionDetailPanel(processDefinitionId, SuspendedProcessDefinitionPage.this)); + + // Update URL + ExplorerApp.get().setCurrentUriFragment( + new UriFragment(ActiveProcessDefinitionNavigator.ACTIVE_PROC_DEF_URI_PART, processDefinitionId)); + + } else { + // Nothing selected + setDetailComponent(null); + ExplorerApp.get().setCurrentUriFragment(new UriFragment(ActiveProcessDefinitionNavigator.ACTIVE_PROC_DEF_URI_PART)); + } + } + + }); + + return processDefinitionTable; + } + +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/AlfrescoProcessInstanceDetailPanel.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/AlfrescoProcessInstanceDetailPanel.java similarity index 95% rename from modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/AlfrescoProcessInstanceDetailPanel.java rename to modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/AlfrescoProcessInstanceDetailPanel.java index be94da658a869340b898d179a33d5a5d22a50d34..1d555c28a394de56b1c4526501a1176b985dae44 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/AlfrescoProcessInstanceDetailPanel.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/AlfrescoProcessInstanceDetailPanel.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.activiti.explorer.ui.management.process; +package org.activiti.explorer.ui.management.processinstance; import org.activiti.explorer.ui.AbstractTablePage; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/DeleteProcessInstanceClickListener.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/DeleteProcessInstanceClickListener.java similarity index 97% rename from modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/DeleteProcessInstanceClickListener.java rename to modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/DeleteProcessInstanceClickListener.java index 3c3678e2aa61ce6881a779c9585379b59810aaad..ff69f2ca97a4249c63c8fcff300ac9542d80c0e3 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/DeleteProcessInstanceClickListener.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/DeleteProcessInstanceClickListener.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.activiti.explorer.ui.management.process; +package org.activiti.explorer.ui.management.processinstance; import org.activiti.engine.ProcessEngines; import org.activiti.engine.RuntimeService; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstanceDetailPanel.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstanceDetailPanel.java similarity index 99% rename from modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstanceDetailPanel.java rename to modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstanceDetailPanel.java index 79bcd04a4d3ef780ddf4406d3ed62a85f125d877..4a0f385bdb4c85d7868a2b799469d0e07e838700 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstanceDetailPanel.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstanceDetailPanel.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.activiti.explorer.ui.management.process; +package org.activiti.explorer.ui.management.processinstance; import java.util.List; import java.util.Map; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstanceListItem.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstanceListItem.java similarity index 96% rename from modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstanceListItem.java rename to modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstanceListItem.java index 1c2c9266fceb1da335511c400e3619a8d3446c14..c39630540a868c9026374c31f3be1b1077e7f1f9 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstanceListItem.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstanceListItem.java @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activiti.explorer.ui.management.process; +package org.activiti.explorer.ui.management.processinstance; import org.activiti.engine.runtime.ProcessInstance; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstanceListQuery.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstanceListQuery.java similarity index 98% rename from modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstanceListQuery.java rename to modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstanceListQuery.java index b949277ab08ad2d48d8151ecade2e83c0e2a81de..5f18507e69dffcc72271cd4913bab7bb02d16e62 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstanceListQuery.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstanceListQuery.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.activiti.explorer.ui.management.process; +package org.activiti.explorer.ui.management.processinstance; import java.util.ArrayList; import java.util.HashMap; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstancePage.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstancePage.java similarity index 98% rename from modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstancePage.java rename to modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstancePage.java index fb2b031353a9b020ec79589ac6d27113b0fc5e1f..a293000436ea45fe79b09c863015312614faf181 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/process/ProcessInstancePage.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/management/processinstance/ProcessInstancePage.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.activiti.explorer.ui.management.process; +package org.activiti.explorer.ui.management.processinstance; import org.activiti.explorer.ExplorerApp; import org.activiti.explorer.data.LazyLoadingContainer; diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/AbstractProcessDefinitionDetailPanel.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/AbstractProcessDefinitionDetailPanel.java new file mode 100644 index 0000000000000000000000000000000000000000..d1ed8af0c6942ca7afe62bbba4d7987a7498fa90 --- /dev/null +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/AbstractProcessDefinitionDetailPanel.java @@ -0,0 +1,171 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.explorer.ui.process; + +import org.activiti.engine.FormService; +import org.activiti.engine.ManagementService; +import org.activiti.engine.ProcessEngines; +import org.activiti.engine.RepositoryService; +import org.activiti.engine.repository.Deployment; +import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.explorer.ExplorerApp; +import org.activiti.explorer.I18nManager; +import org.activiti.explorer.Messages; +import org.activiti.explorer.ui.AbstractPage; +import org.activiti.explorer.ui.Images; +import org.activiti.explorer.ui.custom.DetailPanel; +import org.activiti.explorer.ui.custom.PrettyTimeLabel; +import org.activiti.explorer.ui.form.FormPropertiesForm; +import org.activiti.explorer.ui.mainlayout.ExplorerLayout; + +import com.vaadin.ui.ComponentContainer; +import com.vaadin.ui.Embedded; +import com.vaadin.ui.GridLayout; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.themes.Reindeer; + + +/** + * Panel showing process definition detail. + * + * @author Frederik Heremans + * @author Joram Barrez + */ +public abstract class AbstractProcessDefinitionDetailPanel extends DetailPanel { + + private static final long serialVersionUID = 1L; + + // Members + protected ProcessDefinition processDefinition; + protected Deployment deployment; + protected AbstractPage parentPage; + + // Services + protected RepositoryService repositoryService; + protected ManagementService managementService; + protected FormService formService; + protected I18nManager i18nManager; + + // UI + protected VerticalLayout detailPanelLayout; + protected HorizontalLayout detailContainer; + protected HorizontalLayout actionsContainer; + protected Label nameLabel; + + protected FormPropertiesForm processDefinitionStartForm; + protected ProcessDefinitionInfoComponent definitionInfoComponent; + + public AbstractProcessDefinitionDetailPanel(String processDefinitionId, AbstractPage parentPage) { + this.repositoryService = ProcessEngines.getDefaultProcessEngine().getRepositoryService(); + this.managementService = ProcessEngines.getDefaultProcessEngine().getManagementService(); + this.formService = ProcessEngines.getDefaultProcessEngine().getFormService(); + this.i18nManager = ExplorerApp.get().getI18nManager(); + + this.parentPage = parentPage; + this.processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefinitionId).singleResult(); + + if(processDefinition != null) { + deployment = repositoryService.createDeploymentQuery().deploymentId(processDefinition.getDeploymentId()).singleResult(); + } + + initUi(); + } + + protected void initUi() { + setSizeFull(); + addStyleName(Reindeer.LAYOUT_WHITE); + + detailPanelLayout = new VerticalLayout(); + detailPanelLayout.setWidth(100, UNITS_PERCENTAGE); + detailPanelLayout.setMargin(true); + setDetailContainer(detailPanelLayout); + + // All details about the process definition + initHeader(); + + detailContainer = new HorizontalLayout(); + detailContainer.addStyleName(Reindeer.PANEL_LIGHT); + detailPanelLayout.addComponent(detailContainer); + detailContainer.setSizeFull(); + + initActions(parentPage); + initProcessDefinitionInfo(); + } + + /** + * Custom toolbar buttons are added here + */ + protected abstract void initActions(AbstractPage parentPage); + + + public void initProcessDefinitionInfo() { + if(definitionInfoComponent == null) { + definitionInfoComponent = new ProcessDefinitionInfoComponent(processDefinition, deployment); + } + + detailContainer.removeAllComponents(); + detailContainer.addComponent(definitionInfoComponent); + } + + protected void initHeader() { + GridLayout details = new GridLayout(2, 2); + details.setWidth(100, UNITS_PERCENTAGE); + details.addStyleName(ExplorerLayout.STYLE_TITLE_BLOCK); + details.setSpacing(true); + details.setMargin(false, false, true, false); + details.setColumnExpandRatio(1, 1.0f); + detailPanelLayout.addComponent(details); + + // Image + Embedded image = new Embedded(null, Images.PROCESS_50); + details.addComponent(image, 0, 0, 0, 1); + + // Name + Label nameLabel = new Label(getProcessDisplayName(processDefinition)); + nameLabel.addStyleName(Reindeer.LABEL_H2); + details.addComponent(nameLabel, 1, 0); + + // Properties + HorizontalLayout propertiesLayout = new HorizontalLayout(); + propertiesLayout.setSpacing(true); + details.addComponent(propertiesLayout); + + // Version + String versionString = i18nManager.getMessage(Messages.PROCESS_VERSION, processDefinition.getVersion()); + Label versionLabel = new Label(versionString); + versionLabel.addStyleName(ExplorerLayout.STYLE_PROCESS_HEADER_VERSION); + propertiesLayout.addComponent(versionLabel); + + // Add deploy time + PrettyTimeLabel deployTimeLabel = new PrettyTimeLabel(i18nManager.getMessage(Messages.PROCESS_DEPLOY_TIME), + deployment.getDeploymentTime(), null, true); + deployTimeLabel.addStyleName(ExplorerLayout.STYLE_PROCESS_HEADER_DEPLOY_TIME); + propertiesLayout.addComponent(deployTimeLabel); + } + + protected String getProcessDisplayName(ProcessDefinition processDefinition) { + if(processDefinition.getName() != null) { + return processDefinition.getName(); + } else { + return processDefinition.getKey(); + } + } + + protected void addEmptySpace(ComponentContainer container) { + Label emptySpace = new Label(" ", Label.CONTENT_XHTML); + emptySpace.setSizeUndefined(); + container.addComponent(emptySpace); + } +} diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/DefaultProcessDefinitionFilter.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/DefaultProcessDefinitionFilter.java index 3aca9431c5b788fd0c6f040bd73ae1e91d683935..eb7f1d56419d539172323f10603f0ce3ea1e2b70 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/DefaultProcessDefinitionFilter.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/DefaultProcessDefinitionFilter.java @@ -31,17 +31,20 @@ public class DefaultProcessDefinitionFilter implements ProcessDefinitionFilter { public ProcessDefinitionQuery getQuery(RepositoryService repositoryService) { - return repositoryService - .createProcessDefinitionQuery() - .latestVersion() - .orderByProcessDefinitionName().asc() - .orderByProcessDefinitionKey().asc(); // name is not unique, so we add the order on key (so we can use it in the comparsion of ProcessDefinitionListItem) + return getBaseQuery(repositoryService) + .orderByProcessDefinitionName().asc() + .orderByProcessDefinitionKey().asc(); // name is not unique, so we add the order on key (so we can use it in the comparsion of ProcessDefinitionListItem) } public ProcessDefinitionQuery getCountQuery(RepositoryService repositoryService) { + return getBaseQuery(repositoryService); + } + + protected ProcessDefinitionQuery getBaseQuery(RepositoryService repositoryService) { return repositoryService .createProcessDefinitionQuery() - .latestVersion(); + .latestVersion() + .active(); } public ProcessDefinitionListItem createItem(ProcessDefinition processDefinition) { diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessDefinitionDetailPanel.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessDefinitionDetailPanel.java index 2c61ccca6747b8de74b004355adb2b3ddecbe1cc..7db6a3427e002c5829c07b8b22b959daf0c53660 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessDefinitionDetailPanel.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessDefinitionDetailPanel.java @@ -12,102 +12,40 @@ */ package org.activiti.explorer.ui.process; -import org.activiti.engine.FormService; -import org.activiti.engine.ProcessEngines; -import org.activiti.engine.RepositoryService; import org.activiti.engine.form.StartFormData; -import org.activiti.engine.repository.Deployment; -import org.activiti.engine.repository.ProcessDefinition; import org.activiti.explorer.ExplorerApp; -import org.activiti.explorer.I18nManager; import org.activiti.explorer.Messages; -import org.activiti.explorer.ui.Images; -import org.activiti.explorer.ui.custom.DetailPanel; -import org.activiti.explorer.ui.custom.PrettyTimeLabel; +import org.activiti.explorer.ui.AbstractPage; import org.activiti.explorer.ui.form.FormPropertiesEventListener; import org.activiti.explorer.ui.form.FormPropertiesForm; import org.activiti.explorer.ui.form.FormPropertiesForm.FormPropertiesEvent; -import org.activiti.explorer.ui.mainlayout.ExplorerLayout; import org.activiti.explorer.ui.process.listener.ConvertProcessDefinitionToModelClickListener; import org.activiti.explorer.ui.process.listener.StartProcessInstanceClickListener; import com.vaadin.ui.Button; -import com.vaadin.ui.ComponentContainer; -import com.vaadin.ui.Embedded; -import com.vaadin.ui.GridLayout; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.themes.Reindeer; /** * Panel showing process definition detail. * * @author Frederik Heremans + * @author Joram Barrez */ -public class ProcessDefinitionDetailPanel extends DetailPanel { +public class ProcessDefinitionDetailPanel extends AbstractProcessDefinitionDetailPanel { private static final long serialVersionUID = 1L; - // Members - protected ProcessDefinition processDefinition; - protected Deployment deployment; - protected ProcessDefinitionPage processDefinitionPage; - - // Services - protected RepositoryService repositoryService; - protected FormService formService; - protected I18nManager i18nManager; - - // UI - protected VerticalLayout detailPanelLayout; - protected HorizontalLayout detailContainer; - protected HorizontalLayout actionsContainer; - protected Label nameLabel; protected Button startProcessInstanceButton; protected Button editProcessDefinitionButton; - protected FormPropertiesForm processDefinitionStartForm; - protected ProcessDefinitionInfoComponent definitionInfoComponent; public ProcessDefinitionDetailPanel(String processDefinitionId, ProcessDefinitionPage processDefinitionPage) { - this.repositoryService = ProcessEngines.getDefaultProcessEngine().getRepositoryService(); - this.formService = ProcessEngines.getDefaultProcessEngine().getFormService(); - this.i18nManager = ExplorerApp.get().getI18nManager(); - - this.processDefinitionPage = processDefinitionPage; - this.processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefinitionId).singleResult(); - - if(processDefinition != null) { - deployment = repositoryService.createDeploymentQuery().deploymentId(processDefinition.getDeploymentId()).singleResult(); - } - - initUi(); - } - - protected void initUi() { - setSizeFull(); - addStyleName(Reindeer.LAYOUT_WHITE); - - detailPanelLayout = new VerticalLayout(); - detailPanelLayout.setWidth(100, UNITS_PERCENTAGE); - detailPanelLayout.setMargin(true); - setDetailContainer(detailPanelLayout); - - // All details about the process definition - initHeader(); - - detailContainer = new HorizontalLayout(); - detailContainer.addStyleName(Reindeer.PANEL_LIGHT); - detailPanelLayout.addComponent(detailContainer); - detailContainer.setSizeFull(); - - initActions(); - initProcessDefinitionInfo(); + super(processDefinitionId, processDefinitionPage); } - protected void initActions() { + protected void initActions(AbstractPage parentPage) { + ProcessDefinitionPage processDefinitionPage = (ProcessDefinitionPage) parentPage; + startProcessInstanceButton = new Button(i18nManager.getMessage(Messages.PROCESS_START)); startProcessInstanceButton.addListener(new StartProcessInstanceClickListener(processDefinition, processDefinitionPage)); @@ -124,20 +62,6 @@ public class ProcessDefinitionDetailPanel extends DetailPanel { processDefinitionPage.getToolBar().addButton(editProcessDefinitionButton); } - - public void initProcessDefinitionInfo() { - if(definitionInfoComponent == null) { - definitionInfoComponent = new ProcessDefinitionInfoComponent(processDefinition, deployment); - } - - if (startProcessInstanceButton != null) { - startProcessInstanceButton.setEnabled(true); - } - - detailContainer.removeAllComponents(); - detailContainer.addComponent(definitionInfoComponent); - } - public void showProcessStartForm(StartFormData startFormData) { if(processDefinitionStartForm == null) { processDefinitionStartForm = new FormPropertiesForm(); @@ -167,53 +91,13 @@ public class ProcessDefinitionDetailPanel extends DetailPanel { detailContainer.addComponent(processDefinitionStartForm); } - protected void initHeader() { - GridLayout details = new GridLayout(2, 2); - details.setWidth(100, UNITS_PERCENTAGE); - details.addStyleName(ExplorerLayout.STYLE_TITLE_BLOCK); - details.setSpacing(true); - details.setMargin(false, false, true, false); - details.setColumnExpandRatio(1, 1.0f); - detailPanelLayout.addComponent(details); - - // Image - Embedded image = new Embedded(null, Images.PROCESS_50); - details.addComponent(image, 0, 0, 0, 1); - - // Name - Label nameLabel = new Label(getProcessDisplayName(processDefinition)); - nameLabel.addStyleName(Reindeer.LABEL_H2); - details.addComponent(nameLabel, 1, 0); - - // Properties - HorizontalLayout propertiesLayout = new HorizontalLayout(); - propertiesLayout.setSpacing(true); - details.addComponent(propertiesLayout); - - // Version - String versionString = i18nManager.getMessage(Messages.PROCESS_VERSION, processDefinition.getVersion()); - Label versionLabel = new Label(versionString); - versionLabel.addStyleName(ExplorerLayout.STYLE_PROCESS_HEADER_VERSION); - propertiesLayout.addComponent(versionLabel); + @Override + public void initProcessDefinitionInfo() { + super.initProcessDefinitionInfo(); - // Add deploy time - PrettyTimeLabel deployTimeLabel = new PrettyTimeLabel(i18nManager.getMessage(Messages.PROCESS_DEPLOY_TIME), - deployment.getDeploymentTime(), null, true); - deployTimeLabel.addStyleName(ExplorerLayout.STYLE_PROCESS_HEADER_DEPLOY_TIME); - propertiesLayout.addComponent(deployTimeLabel); - } - - protected String getProcessDisplayName(ProcessDefinition processDefinition) { - if(processDefinition.getName() != null) { - return processDefinition.getName(); - } else { - return processDefinition.getKey(); + if (startProcessInstanceButton != null) { + startProcessInstanceButton.setEnabled(true); } } - protected void addEmptySpace(ComponentContainer container) { - Label emptySpace = new Label(" ", Label.CONTENT_XHTML); - emptySpace.setSizeUndefined(); - container.addComponent(emptySpace); - } } diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessDefinitionInfoComponent.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessDefinitionInfoComponent.java index f8cfbd68df2a47bd3e2f189e3855eab03a345a66..690acec8c33e3bd7d638f231b10e5a78d5244d22 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessDefinitionInfoComponent.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessDefinitionInfoComponent.java @@ -13,10 +13,19 @@ package org.activiti.explorer.ui.process; +import java.util.ArrayList; +import java.util.List; + +import org.activiti.engine.ManagementService; import org.activiti.engine.ProcessEngines; import org.activiti.engine.RepositoryService; +import org.activiti.engine.impl.jobexecutor.TimerActivateProcessDefinitionHandler; +import org.activiti.engine.impl.jobexecutor.TimerSuspendProcessDefinitionHandler; +import org.activiti.engine.impl.persistence.entity.JobEntity; import org.activiti.engine.repository.Deployment; import org.activiti.engine.repository.ProcessDefinition; +import org.activiti.engine.runtime.Job; +import org.activiti.explorer.Constants; import org.activiti.explorer.ExplorerApp; import org.activiti.explorer.I18nManager; import org.activiti.explorer.Messages; @@ -34,6 +43,7 @@ import com.vaadin.ui.themes.Reindeer; /** * @author Frederik Heremans + * @author Joram Barrez */ public class ProcessDefinitionInfoComponent extends VerticalLayout { @@ -41,6 +51,7 @@ public class ProcessDefinitionInfoComponent extends VerticalLayout { // Services protected RepositoryService repositoryService; + protected ManagementService managementService; protected I18nManager i18nManager; // Members @@ -55,6 +66,7 @@ public class ProcessDefinitionInfoComponent extends VerticalLayout { public ProcessDefinitionInfoComponent(ProcessDefinition processDefinition, Deployment deployment) { super(); this.repositoryService = ProcessEngines.getDefaultProcessEngine().getRepositoryService(); + this.managementService = ProcessEngines.getDefaultProcessEngine().getManagementService(); this.i18nManager = ExplorerApp.get().getI18nManager(); this.processDefinition = processDefinition; @@ -62,9 +74,49 @@ public class ProcessDefinitionInfoComponent extends VerticalLayout { addStyleName(ExplorerLayout.STYLE_DETAIL_BLOCK); + initSuspensionStateInformation(); initImage(); } + protected void initSuspensionStateInformation() { + List jobs = managementService.createJobQuery() + .processDefinitionId(processDefinition.getId()).orderByJobDuedate().asc().list(); + List suspensionStateJobs = new ArrayList(); + + // TODO: this is a hack (ie the cast to JobEntity)... we must clean this in the engine! + for (Job job : jobs) { + JobEntity jobEntity = (JobEntity) job; + if (jobEntity.getJobHandlerType().equals(TimerSuspendProcessDefinitionHandler.TYPE) + || jobEntity.getJobHandlerType().equals(TimerActivateProcessDefinitionHandler.TYPE)) { + suspensionStateJobs.add(jobEntity); + } + } + + if (suspensionStateJobs.size() > 0) { + + // Header + Label suspensionStateTitle = new Label(i18nManager.getMessage(Messages.PROCESS_HEADER_SUSPENSION_STATE)); + suspensionStateTitle.addStyleName(ExplorerLayout.STYLE_H3); + addComponent(suspensionStateTitle); + addEmptySpace(this); + + // Actual suspend/activation jobs + for (JobEntity jobEntity : suspensionStateJobs) { + if (jobEntity.getJobHandlerType().equals(TimerSuspendProcessDefinitionHandler.TYPE)) { + Label suspendLabel = new Label(i18nManager.getMessage(Messages.PROCESS_SCHEDULED_SUSPEND, + Constants.DEFAULT_TIME_FORMATTER.format(jobEntity.getDuedate())), Label.CONTENT_XHTML); + addComponent(suspendLabel); + } else if (jobEntity.getJobHandlerType().equals(TimerActivateProcessDefinitionHandler.TYPE)) { + Label suspendLabel = new Label(i18nManager.getMessage(Messages.PROCESS_SCHEDULED_ACTIVATE, + Constants.DEFAULT_TIME_FORMATTER.format(jobEntity.getDuedate())), Label.CONTENT_XHTML); + addComponent(suspendLabel); + } + } + } + + addEmptySpace(this); + } + protected void initImage() { processImageContainer = new VerticalLayout(); diff --git a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessInstancePage.java b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessInstancePage.java index 45b2789dc56d6e163a4b933b3dea7d983d87af85..996318150ad698658e7bcf29318e3a9053fe7d84 100644 --- a/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessInstancePage.java +++ b/modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/process/ProcessInstancePage.java @@ -21,7 +21,7 @@ import org.activiti.explorer.ui.AbstractTablePage; import org.activiti.explorer.ui.Images; import org.activiti.explorer.ui.custom.ToolBar; import org.activiti.explorer.ui.mainlayout.ExplorerLayout; -import org.activiti.explorer.ui.management.process.ProcessInstanceDetailPanel; +import org.activiti.explorer.ui.management.processinstance.ProcessInstanceDetailPanel; import org.activiti.explorer.ui.util.ThemeImageColumnGenerator; import com.vaadin.data.Item; diff --git a/modules/activiti-explorer/src/main/resources/messages.properties b/modules/activiti-explorer/src/main/resources/messages.properties index cdb6702695532d7da79781117aa85f9179b5888f..44f17e54412f7d4a8c475bf64ba8b2305b7562e2 100644 --- a/modules/activiti-explorer/src/main/resources/messages.properties +++ b/modules/activiti-explorer/src/main/resources/messages.properties @@ -7,6 +7,7 @@ confirmation.dialog.no= No button.ok = Ok button.create = Create button.cancel = Cancel +uncaught.exception = Warning! # Navigation navigation.error.not.involved.title = Cannot view task @@ -175,12 +176,25 @@ process.version = Version {0} process.deploy.time = Deployed {0} process.header.diagram = Process Diagram process.no.diagram = No image available for this process. +process.header.suspension.state = Suspension state changes +process.scheduled.suspend = This process definition is scheduled to be suspended on {0} +process.scheduled.activate = This process definition is scheduled to be activated on {0} process.start = Start process process.edit = Edit model process.copy = Copy model process.delete = Delete model process.new = New model process.deploy = Deploy +process.activate = Activate +process.activate.popup = Activate process definition +process.activate.popup.time.description = When do you want to activate this process definition? +process.activate.popup.process.instances.description = Also activate all process instances for this process definitions +process.suspend = Suspend +process.suspend.popup = Suspend process definition +process.suspend.popup.time.description = When do you want to suspend this process definition? +process.suspend.popup.time.now = now +process.suspend.popup.time.date = on +process.suspend.popup.process.instances.description = Also suspend all process instances for this process definition process.convert = Convert to editable model process.export = Export to BPMN 2.0 process.toxml.failed = Create of BPMN XML failed @@ -219,6 +233,8 @@ management.menu.database = Database management.menu.deployments = Deployments management.menu.deployments.show.all = Show all management.menu.deployments.upload = Upload new +management.menu.active.processdefinitions = Active Processes +management.menu.suspended.processdefinitions = Suspended Processes management.menu.jobs = Jobs management.menu.users = Users management.menu.groups = Groups @@ -226,6 +242,8 @@ management.menu.admin = Administration # Job page job.execute = Execute +job.delete = Delete +job.deleted = Job deleted job.header.execution = Job execution job.retries = Retries : {0} job.no.retries = No more retries left @@ -236,6 +254,8 @@ job.duedate = Due {0} job.no.dudedate = No duedate job.error = Error occurred while executing job job.not.executed = Job hasn't been executed yet. +job.suspend.processdefinition = This job will suspend process definition +job.activate.processdefinition = This job will activate process definition # Deployment page deployment.delete = Delete diff --git a/modules/activiti-spring/src/main/java/org/activiti/spring/SpringTransactionContext.java b/modules/activiti-spring/src/main/java/org/activiti/spring/SpringTransactionContext.java index 82518e18b9ec0e35af8a63189d1cee2e9da6397d..8bf51bcede62526a2d5c4822507e68d7c6b90258 100644 --- a/modules/activiti-spring/src/main/java/org/activiti/spring/SpringTransactionContext.java +++ b/modules/activiti-spring/src/main/java/org/activiti/spring/SpringTransactionContext.java @@ -13,6 +13,7 @@ package org.activiti.spring; + import org.activiti.engine.impl.cfg.TransactionContext; import org.activiti.engine.impl.cfg.TransactionListener; import org.activiti.engine.impl.cfg.TransactionState; @@ -79,7 +80,9 @@ public class SpringTransactionContext implements TransactionContext { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { @Override public void afterCompletion(int status) { - transactionListener.execute(commandContext); + if(TransactionSynchronization.STATUS_ROLLED_BACK == status) { + transactionListener.execute(commandContext); + } } }); diff --git a/modules/activiti-upgrade/pom.xml b/modules/activiti-upgrade/pom.xml index afbdad7a8e4cd2f894c6dfe05a4eb53e0d90a8ae..dff3c4031fc824d200a2e9f6551baa7ee49beddc 100644 --- a/modules/activiti-upgrade/pom.xml +++ b/modules/activiti-upgrade/pom.xml @@ -10,13 +10,15 @@ true + 5.11-SNAPSHOT + 8.4-701.jdbc4 org.activiti activiti-engine - 5.11-SNAPSHOT + ${dependencyVersion} junit @@ -37,7 +39,7 @@ postgresql postgresql - 8.4-701.jdbc4 + ${postgresVersion} com.oracle.jdbc @@ -49,6 +51,18 @@ jtds 1.2.4 + + com.microsoft.sqlserver + sqljdbc4 + 4.0 + test + + + com.ibm.db2.jcc + db2jcc4 + 10.1 + test + @@ -105,25 +119,102 @@ - - drop - - false - - - create - false + true generate + + + releaseVersion + + - false + true + + + + maven-antrun-plugin + 1.4 + + + generate.data.file + process-test-classes + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -133,55 +224,164 @@ - - maven-surefire-plugin - - false - false - - - **/*AfterTest.java - - - maven-antrun-plugin - 1.4 - customized.config.for.db + create.old.schema process-test-classes run - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - database-test-drop-schema + drop.schema prepare-package run - + + + + + + - - - - - + + + + + + + + + + + + + + maven-surefire-plugin + + false + false + + + + database + ${database} + + + + **/*TestCase.java + + + + + + + + + drop + + true + + + + + maven-antrun-plugin + 1.4 + + + drop.schema + process-test-classes + + run + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/CleanPostgres.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/CleanPostgres.java new file mode 100644 index 0000000000000000000000000000000000000000..742124a5e9c8313d2ce7ed7f8f9f303a20b4d9c4 --- /dev/null +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/CleanPostgres.java @@ -0,0 +1,92 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.upgrade; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.util.logging.Logger; + +import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl; +import org.activiti.engine.impl.db.DbSqlSession; +import org.activiti.engine.impl.interceptor.Command; +import org.activiti.engine.impl.interceptor.CommandContext; +import org.activiti.engine.impl.interceptor.CommandExecutor; + +public class CleanPostgres { + + private static Logger log = Logger.getLogger(CleanPostgres.class.getName()); + + static String[] cleanStatements = new String[] { + "drop table ACT_GE_PROPERTY cascade;", + "drop table ACT_GE_BYTEARRAY cascade;", + "drop table ACT_RE_MODEL cascade;", + "drop table ACT_RE_DEPLOYMENT cascade;", + "drop table ACT_RE_PROCDEF cascade;", + "drop table ACT_RU_IDENTITYLINK cascade;", + "drop table ACT_RU_VARIABLE cascade;", + "drop table ACT_RU_TASK cascade;", + "drop table ACT_RU_EXECUTION cascade;", + "drop table ACT_RU_JOB cascade;", + "drop table ACT_RU_EVENT_SUBSCR cascade;", + "drop table ACT_HI_PROCINST cascade;", + "drop table ACT_HI_ACTINST cascade;", + "drop table ACT_HI_VARINST cascade;", + "drop table ACT_HI_TASKINST cascade;", + "drop table ACT_HI_DETAIL cascade;", + "drop table ACT_HI_COMMENT cascade;", + "drop table ACT_HI_ATTACHMENT cascade;", + "drop table ACT_ID_INFO cascade;", + "drop table ACT_ID_MEMBERSHIP cascade;", + "drop table ACT_ID_GROUP cascade;", + "drop table ACT_ID_USER cascade;"}; + + public static void main(String[] args) { + try { + if ("postgres".equals(args[0])) { + ProcessEngineConfigurationImpl processEngineConfiguration = UpgradeTestCase.createProcessEngineConfiguration("postgres"); + processEngineConfiguration.buildProcessEngine(); + CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutorTxRequired(); + commandExecutor.execute(new Command() { + + public Object execute(CommandContext commandContext) { + try { + Connection connection = commandContext.getSession(DbSqlSession.class).getSqlSession().getConnection(); + connection.setAutoCommit(false); + + for (String cleanStatement : cleanStatements) { + try { + PreparedStatement preparedStatement = connection.prepareStatement(cleanStatement); + preparedStatement.execute(); + connection.commit(); + log.info("executed ["+cleanStatement+"] successfully"); + + } catch (Exception e) { + log.info("ERROR WHILE EXECUTING ["+cleanStatement+"]:"); + e.printStackTrace(); + connection.rollback(); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + }); + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + +} diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatter.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatter.java new file mode 100644 index 0000000000000000000000000000000000000000..b3b6fa1e11d9a7c77b701a1e4530f3a567a438c4 --- /dev/null +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatter.java @@ -0,0 +1,45 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.upgrade; + +import java.text.SimpleDateFormat; +import java.util.Date; + + +public class DatabaseFormatter { + + static SimpleDateFormat defaultDateFormat = new SimpleDateFormat("''yyyy-MM-dd HH:mm:ss''"); + + public String formatDate(Date date) { + return defaultDateFormat.format(date); + } + + public String formatBoolean(boolean b) { + return Boolean.toString(b); + } + + public String formatBinary(byte[] bytes) { + StringBuffer sb = new StringBuffer(); + sb.append("X'"); + appendBytesInHex(sb, bytes); + sb.append("'"); + return sb.toString(); + } + + protected void appendBytesInHex(StringBuffer sb, byte[] bytes) { + for (byte b : bytes) { + sb.append(String.format("%02X", b)); + } + } + +} diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterDb2.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterDb2.java new file mode 100644 index 0000000000000000000000000000000000000000..0c0da2b8347b187dc7132984aa33b7d0c8961c4f --- /dev/null +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterDb2.java @@ -0,0 +1,42 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.upgrade; + +import java.util.Date; + + +public class DatabaseFormatterDb2 extends DatabaseFormatter { + + @Override + public String formatBinary(byte[] bytes) { + StringBuffer sb = new StringBuffer(); + sb.append("blob(X'"); + appendBytesInHex(sb, bytes); + sb.append("')"); + return sb.toString(); + } + + @Override + public String formatBoolean(boolean b) { + return (b ? "1" : "0"); + } + + @Override + public String formatDate(Date date) { + StringBuffer sb = new StringBuffer(); + sb.append("TIMESTAMP ("); + sb.append(defaultDateFormat.format(date)); + sb.append(")"); + return sb.toString(); + } +} diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterMsSqlServer.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterMsSqlServer.java new file mode 100644 index 0000000000000000000000000000000000000000..53dbe1faeebf12bbc0d5ec5cd48a41ee2c33c6fb --- /dev/null +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterMsSqlServer.java @@ -0,0 +1,31 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.upgrade; + + +public class DatabaseFormatterMsSqlServer extends DatabaseFormatter { + + @Override + public String formatBinary(byte[] bytes) { + StringBuffer sb = new StringBuffer(); + sb.append("0x"); + appendBytesInHex(sb, bytes); + return sb.toString(); + } + + @Override + public String formatBoolean(boolean b) { + return (b ? "1" : "0"); + } + +} diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterOracle.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterOracle.java new file mode 100644 index 0000000000000000000000000000000000000000..4451f73992ff7ff0960e6a4099b93b0424ac5158 --- /dev/null +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterOracle.java @@ -0,0 +1,44 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.upgrade; + +import java.text.SimpleDateFormat; +import java.util.Date; + + +public class DatabaseFormatterOracle extends DatabaseFormatter { + + static SimpleDateFormat oracleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SS"); + + public String formatDate(Date date) { + StringBuffer sb = new StringBuffer(); + sb.append("to_timestamp('"); + sb.append(oracleDateFormat.format(date)); + sb.append("', 'YYYY-MM-DD HH:MI:SS.FF')"); + return sb.toString(); + } + + @Override + public String formatBoolean(boolean b) { + return (b ? "1" : "0"); + } + + @Override + public String formatBinary(byte[] bytes) { + StringBuffer sb = new StringBuffer(); + sb.append("hextoraw('"); + appendBytesInHex(sb, bytes); + sb.append("')"); + return sb.toString(); + } +} diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterPostgres.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterPostgres.java new file mode 100644 index 0000000000000000000000000000000000000000..57fd66c041f97e84bdb46f0153f7026146380f0f --- /dev/null +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterPostgres.java @@ -0,0 +1,27 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.upgrade; + + +public class DatabaseFormatterPostgres extends DatabaseFormatter { + + @Override + public String formatBinary(byte[] bytes) { + StringBuffer sb = new StringBuffer(); + sb.append("decode('"); + appendBytesInHex(sb, bytes); + sb.append("', 'hex')"); + return sb.toString(); + } + +} diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyConnection.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyConnection.java index 93f86065fc64bc231d5320697954b5dedddff6ca..fc073ea090f141d3616d1b47661b6ff04e1895ab 100644 --- a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyConnection.java +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyConnection.java @@ -1,3 +1,15 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.activiti.upgrade; import java.sql.Array; @@ -17,6 +29,7 @@ import java.sql.Statement; import java.sql.Struct; import java.util.Map; import java.util.Properties; +import java.util.concurrent.Executor; public class ProxyConnection implements Connection { @@ -229,4 +242,24 @@ public class ProxyConnection implements Connection { public void setTypeMap(Map> map) throws SQLException { connection.setTypeMap(map); } + + public void setSchema(String schema) throws SQLException { + throw new RuntimeException("buzz"); + } + + public String getSchema() throws SQLException { + throw new RuntimeException("buzz"); + } + + public void abort(Executor executor) throws SQLException { + throw new RuntimeException("buzz"); + } + + public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { + throw new RuntimeException("buzz"); + } + + public int getNetworkTimeout() throws SQLException { + throw new RuntimeException("buzz"); + } } diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyDriver.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyDriver.java index 419c825db4f9720c807f2cf988df58a52ebe57ae..4af65880ca8235776f9d890c8a8ac04dcd63073e 100644 --- a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyDriver.java +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyDriver.java @@ -1,3 +1,15 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.activiti.upgrade; import java.sql.Connection; @@ -5,16 +17,20 @@ import java.sql.Driver; import java.sql.DriverManager; import java.sql.DriverPropertyInfo; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.Properties; +import java.util.logging.Logger; public class ProxyDriver implements Driver { - + + private static Logger log = Logger.getLogger(ProxyDriver.class.getName()); + static String url; + static DatabaseFormatter databaseFormatter = new DatabaseFormatter(); static DateFormat dateFormat; public static List statements = new ArrayList(); @@ -29,9 +45,15 @@ public class ProxyDriver implements Driver { public static void setUrl(String url) { ProxyDriver.url = url; - if (url.startsWith("jdbc:mysql")) { - dateFormat = new SimpleDateFormat("''yyyy-MM-dd HH:mm:ss''"); - } + if (url.startsWith("jdbc:oracle")) { + databaseFormatter = new DatabaseFormatterOracle(); + } else if (url.startsWith("jdbc:sqlserver")) { + databaseFormatter = new DatabaseFormatterMsSqlServer(); + } else if (url.startsWith("jdbc:db2")) { + databaseFormatter = new DatabaseFormatterDb2(); + } else if (url.startsWith("jdbc:postgresql")) { + databaseFormatter = new DatabaseFormatterPostgres(); + } } public boolean acceptsURL(String url) throws SQLException { @@ -39,7 +61,17 @@ public class ProxyDriver implements Driver { } public Connection connect(String url, Properties properties) throws SQLException { - Connection connection = DriverManager.getConnection(ProxyDriver.url, properties); + if (!"proxy".equals(url)) { + return null; + } + Connection connection; + try { + log.info("creating proxy connection to "+ProxyDriver.url); + connection = DriverManager.getConnection(ProxyDriver.url, properties); + } catch (SQLException e) { + e.printStackTrace(); + throw e; + } return new ProxyConnection(connection, this); } @@ -59,4 +91,7 @@ public class ProxyDriver implements Driver { throw new RuntimeException("buzz"); } + public Logger getParentLogger() throws SQLFeatureNotSupportedException { + throw new RuntimeException("buzz"); + } } diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyStatement.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyStatement.java index 6cc1f072a23a878375918ed22a26d947f89ca1ad..66c780840087c9767248c5574af624fd83bc7675 100644 --- a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyStatement.java +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/ProxyStatement.java @@ -1,5 +1,18 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.activiti.upgrade; +import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; @@ -101,56 +114,64 @@ public class ProxyStatement implements PreparedStatement { ////////////////////////////////////////////////////////////////////// - public void setString(int parameterIndex, String x) throws SQLException { - parameters.put(parameterIndex, "'"+x+"'"); - preparedStatement.setString(parameterIndex, x); - } - - public void setBoolean(int parameterIndex, boolean x) throws SQLException { - parameters.put(parameterIndex, Boolean.toString(x)); - preparedStatement.setBoolean(parameterIndex, x); - } - - public void setNull(int parameterIndex, int sqlType) throws SQLException { - parameters.put(parameterIndex, "null"); - preparedStatement.setNull(parameterIndex, sqlType); - } - - public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException { - parameters.put(parameterIndex, "null"); - preparedStatement.setNull(parameterIndex, sqlType, typeName); - } - - public void setTime(int parameterIndex, Time x) throws SQLException { - parameters.put(parameterIndex, ProxyDriver.dateFormat.format(x)); - preparedStatement.setTime(parameterIndex, x); + InputStream setInputStreamParameter(int parameterIndex, InputStream x) { + byte[] bytes = IoUtil.readInputStream(x, "jdbc variable bytes"); + parameters.put(parameterIndex, ProxyDriver.databaseFormatter.formatBinary(bytes)); + return new ByteArrayInputStream(bytes); } - + public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException { - parameters.put(parameterIndex, ProxyDriver.dateFormat.format(x)); + parameters.put(parameterIndex, ProxyDriver.databaseFormatter.formatDate(x)); preparedStatement.setTime(parameterIndex, x, cal); } public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException { - parameters.put(parameterIndex, ProxyDriver.dateFormat.format(x)); + parameters.put(parameterIndex, ProxyDriver.databaseFormatter.formatDate(x)); preparedStatement.setTimestamp(parameterIndex, x); } public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException { - parameters.put(parameterIndex, ProxyDriver.dateFormat.format(x)); + parameters.put(parameterIndex, ProxyDriver.databaseFormatter.formatDate(x)); preparedStatement.setTimestamp(parameterIndex, x, cal); } public void setDate(int parameterIndex, Date x) throws SQLException { - parameters.put(parameterIndex, ProxyDriver.dateFormat.format(x)); + parameters.put(parameterIndex, ProxyDriver.databaseFormatter.formatDate(x)); preparedStatement.setDate(parameterIndex, x); } public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException { - parameters.put(parameterIndex, ProxyDriver.dateFormat.format(x)); + parameters.put(parameterIndex, ProxyDriver.databaseFormatter.formatDate(x)); preparedStatement.setDate(parameterIndex, x, cal); } + public void setBoolean(int parameterIndex, boolean x) throws SQLException { + parameters.put(parameterIndex, ProxyDriver.databaseFormatter.formatBoolean(x)); + preparedStatement.setBoolean(parameterIndex, x); + } + + ////////////////////////////////////////////////////////////////////// + + public void setString(int parameterIndex, String x) throws SQLException { + parameters.put(parameterIndex, "'"+x+"'"); + preparedStatement.setString(parameterIndex, x); + } + + public void setNull(int parameterIndex, int sqlType) throws SQLException { + parameters.put(parameterIndex, "null"); + preparedStatement.setNull(parameterIndex, sqlType); + } + + public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException { + parameters.put(parameterIndex, "null"); + preparedStatement.setNull(parameterIndex, sqlType, typeName); + } + + public void setTime(int parameterIndex, Time x) throws SQLException { + parameters.put(parameterIndex, ProxyDriver.dateFormat.format(x)); + preparedStatement.setTime(parameterIndex, x); + } + public void setInt(int parameterIndex, int x) throws SQLException { parameters.put(parameterIndex, Integer.toString(x)); preparedStatement.setInt(parameterIndex, x); @@ -162,29 +183,20 @@ public class ProxyStatement implements PreparedStatement { } public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException { - setInputStreamParameter(parameterIndex, x); + x = setInputStreamParameter(parameterIndex, x); preparedStatement.setBinaryStream(parameterIndex, x); } public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException { - setInputStreamParameter(parameterIndex, x); + x = setInputStreamParameter(parameterIndex, x); preparedStatement.setBinaryStream(parameterIndex, x, length); } public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException { - setInputStreamParameter(parameterIndex, x); + x = setInputStreamParameter(parameterIndex, x); preparedStatement.setBinaryStream(parameterIndex, x, length); } - void setInputStreamParameter(int parameterIndex, InputStream x) { - byte[] bytes = IoUtil.readInputStream(x, "jdbc variable bytes"); - StringBuffer sb = new StringBuffer(); - for (byte b : bytes) { - sb.append(Integer.toHexString((int) (b & 0xff))); - } - parameters.put(parameterIndex, "0x"+sb.toString()); - } - ////////////////////////////////////////////////////////////////////// public void setArray(int parameterIndex, Array x) throws SQLException { @@ -527,4 +539,11 @@ public class ProxyStatement implements PreparedStatement { return preparedStatement.getParameterMetaData(); } + public void closeOnCompletion() throws SQLException { + throw new RuntimeException("buzz"); + } + + public boolean isCloseOnCompletion() throws SQLException { + throw new RuntimeException("buzz"); + } } diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/UpgradeDataGenerator.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/UpgradeDataGenerator.java index 4d47c2fda1c0a106f2c33b86293e492d2986940f..fc2a41f38e9a523bff26b4dbebdf778080bf9efb 100644 --- a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/UpgradeDataGenerator.java +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/UpgradeDataGenerator.java @@ -12,18 +12,16 @@ */ package org.activiti.upgrade; -import java.io.FileInputStream; +import java.io.PrintWriter; import java.sql.DriverManager; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; import java.util.logging.Logger; import org.activiti.engine.ProcessEngine; -import org.activiti.engine.ProcessEngineConfiguration; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl; +import org.activiti.engine.impl.db.DbSqlSession; +import org.activiti.engine.impl.interceptor.Command; +import org.activiti.engine.impl.interceptor.CommandContext; +import org.activiti.engine.impl.interceptor.CommandExecutor; import org.activiti.engine.impl.util.ClassNameUtil; import org.activiti.engine.impl.util.LogUtil; import org.activiti.upgrade.test.UpgradeTaskOneTest; @@ -34,7 +32,7 @@ import org.activiti.upgrade.test.UpgradeTaskTwoTest; */ public class UpgradeDataGenerator { - private static Logger log = Logger.getLogger(UpgradeTestCase.class.getName()); + static Logger log = Logger.getLogger(UpgradeTestCase.class.getName()); static UpgradeTestCase[] upgradeTestCases = new UpgradeTestCase[]{ new UpgradeTaskOneTest(), @@ -42,44 +40,33 @@ public class UpgradeDataGenerator { }; public static void main(String[] args) { + + ProcessEngineConfigurationImpl processEngineConfiguration = null; + try { LogUtil.readJavaUtilLoggingConfigFromClasspath(); - if (args==null || args.length!=1) { - throw new RuntimeException("exactly argument expected: database"); + if (args==null || args.length!=2) { + throw new RuntimeException("exactly 2 arguments expected: database and releaseVersion"); } String database = args[0]; + String releaseVersion = args[1]; log.fine("database: "+database); + log.fine("releaseVersion: "+releaseVersion); - ProcessEngineConfiguration processEngineConfiguration = (ProcessEngineConfigurationImpl) ProcessEngineConfiguration - .createStandaloneProcessEngineConfiguration() - .setHistory("full") - .setJobExecutorActivate(false); + processEngineConfiguration = UpgradeTestCase.createProcessEngineConfiguration(database); - // loading properties - log.fine("loading properties..."); - String propertiesFileName = System.getProperty("user.home")+System.getProperty("file.separator")+".activiti"+System.getProperty("file.separator")+"jdbc"+System.getProperty("file.separator")+"build."+database+".properties"; - Properties properties = new Properties(); - properties.load(new FileInputStream(propertiesFileName)); - log.fine("jdbc url.....: "+processEngineConfiguration.getJdbcUrl()); - log.fine("jdbc username: "+processEngineConfiguration.getJdbcUsername()); - // install the jdbc proxy driver - log.fine("installing jdbc proxy driver..."); - ProxyDriver.setUrl(properties.getProperty("jdbc.url")); - DriverManager.registerDriver(new ProxyDriver()); - - // configure the jdbc parameters in the process engine configuration - processEngineConfiguration.setJdbcDriver(properties.getProperty("jdbc.driver")); + log.fine("installing jdbc proxy driver delegating to "+processEngineConfiguration.getJdbcUrl()); + ProxyDriver.setUrl(processEngineConfiguration.getJdbcUrl()); processEngineConfiguration.setJdbcUrl("proxy"); - processEngineConfiguration.setJdbcUsername(properties.getProperty("jdbc.username")); - processEngineConfiguration.setJdbcPassword(properties.getProperty("jdbc.password")); + DriverManager.registerDriver(new ProxyDriver()); log.fine("building the process engine..."); ProcessEngine processEngine = processEngineConfiguration.buildProcessEngine(); - + log.fine("deploy processes and start process instances"); UpgradeTestCase.setProcessEngine(processEngine); @@ -89,15 +76,33 @@ public class UpgradeDataGenerator { } log.fine("### Captured SQL"); - + PrintWriter file = new PrintWriter("src/test/resources/org/activiti/db/"+releaseVersion+"/data/"+database+".data.sql"); System.err.println(); System.err.println(); for (String statement: ProxyDriver.statements) { System.err.println(statement); System.err.println(); + file.println(statement); + file.println(); } + file.close(); + } catch (Exception e) { e.printStackTrace(); } + + dbSchemaDrop(processEngineConfiguration); + } + + private static void dbSchemaDrop(ProcessEngineConfigurationImpl processEngineConfiguration) { + CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutorTxRequired(); + commandExecutor.execute(new Command (){ + public Object execute(CommandContext commandContext) { + commandContext + .getSession(DbSqlSession.class) + .dbSchemaDrop(); + return null; + } + }); } } diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/UpgradeTestCase.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/UpgradeTestCase.java index f1b1c752a5bf45f83bd6ae1ac442c4d0311a873b..e293a4ffe33bc11660a6c0292551ecf0aa9b223b 100644 --- a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/UpgradeTestCase.java +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/UpgradeTestCase.java @@ -1,5 +1,22 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.activiti.upgrade; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Properties; + import junit.framework.TestCase; import org.activiti.engine.HistoryService; @@ -8,12 +25,15 @@ import org.activiti.engine.ProcessEngine; import org.activiti.engine.ProcessEngineConfiguration; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; +import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl; import org.activiti.engine.impl.util.LogUtil; +import org.junit.Ignore; import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.notification.Failure; +@Ignore public abstract class UpgradeTestCase extends TestCase { static { @@ -43,6 +63,19 @@ public abstract class UpgradeTestCase extends TestCase { } } } + + @Override + protected void setUp() throws Exception { + super.setUp(); + + if (processEngine==null) { + String database = System.getProperty("database"); + UpgradeDataGenerator.log.fine("Configuration properties..."); + UpgradeDataGenerator.log.fine("database.....:"+database); + setProcessEngine(createProcessEngineConfiguration(database).buildProcessEngine()); + } + } + public static void setProcessEngine(ProcessEngine processEngine) { UpgradeTestCase.processEngine = processEngine; @@ -53,4 +86,29 @@ public abstract class UpgradeTestCase extends TestCase { } public abstract void runInTheOldVersion(); + + public static ProcessEngineConfigurationImpl createProcessEngineConfiguration(String database) throws Exception { + ProcessEngineConfigurationImpl processEngineConfiguration; + processEngineConfiguration = (ProcessEngineConfigurationImpl) ProcessEngineConfiguration + .createStandaloneProcessEngineConfiguration() + .setDatabaseSchemaUpdate("true") + .setHistory("full") + .setJobExecutorActivate(false); + + // loading properties + String propertiesFileName = System.getProperty("user.home")+System.getProperty("file.separator")+".activiti"+System.getProperty("file.separator")+"upgrade"+System.getProperty("file.separator")+"build."+database+".properties"; + Properties properties = new Properties(); + properties.load(new FileInputStream(propertiesFileName)); + + // configure the jdbc parameters in the process engine configuration + processEngineConfiguration.setJdbcDriver(properties.getProperty("jdbc.driver")); + processEngineConfiguration.setJdbcUrl(properties.getProperty("jdbc.url")); + processEngineConfiguration.setJdbcUsername(properties.getProperty("jdbc.username")); + processEngineConfiguration.setJdbcPassword(properties.getProperty("jdbc.password")); + + UpgradeDataGenerator.log.fine("jdbc url.....: "+processEngineConfiguration.getJdbcUrl()); + UpgradeDataGenerator.log.fine("jdbc username: "+processEngineConfiguration.getJdbcUsername()); + + return processEngineConfiguration; + } } diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/test/UpgradeTaskOneTest.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/test/UpgradeTaskOneTest.java index e5c804a7e640ee8b9ad06232efc5a8ff8b509f06..bfe0f5e29a72a790591ef07f61080a3e3ee0c836 100644 --- a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/test/UpgradeTaskOneTest.java +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/test/UpgradeTaskOneTest.java @@ -1,3 +1,15 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.activiti.upgrade.test; import org.activiti.engine.HistoryService; diff --git a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/test/UpgradeTaskTwoTest.java b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/test/UpgradeTaskTwoTest.java index 1ea3786a4a3c66f3d736b1e5b4f8d5f2bbf2bcab..c1aa68d2edc0fd70cacf780f207a4c6ee3b1b9b0 100644 --- a/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/test/UpgradeTaskTwoTest.java +++ b/modules/activiti-upgrade/src/test/java/org/activiti/upgrade/test/UpgradeTaskTwoTest.java @@ -1,3 +1,15 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.activiti.upgrade.test; import java.util.HashMap; diff --git a/modules/activiti-upgrade/src/test/resources/activiti.cfg.xml b/modules/activiti-upgrade/src/test/resources/activiti.cfg.xml deleted file mode 100644 index ab79a0d56b2a768370b82531ab794f728f8eaf54..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/activiti.cfg.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/modules/activiti-upgrade/src/test/resources/logging.properties b/modules/activiti-upgrade/src/test/resources/logging.properties index 16b0cc23eeee10a3d94b0d56829b8e1f0ffb52fa..e740f873c235193a28afc0523e600cb88e45641b 100644 --- a/modules/activiti-upgrade/src/test/resources/logging.properties +++ b/modules/activiti-upgrade/src/test/resources/logging.properties @@ -1,4 +1,4 @@ handlers = java.util.logging.ConsoleHandler -.level = FINE +.level = FINE java.util.logging.ConsoleHandler.level=FINEST java.util.logging.ConsoleHandler.formatter=org.activiti.engine.impl.util.LogUtil$LogFormatter diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.h2.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.h2.create.sql deleted file mode 100644 index 8d3ad24e05628d9ac03da46440aa65f45754e7f8..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.h2.create.sql +++ /dev/null @@ -1,278 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.0', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ longvarbinary, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ bit, - IS_CONCURRENT_ bit, - IS_SCOPE_ bit, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ bit, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_UNIQ_RU_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); - -alter table ACT_HI_PROCINST - add constraint ACT_UNIQ_HI_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP; - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER; - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY; - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.mysql.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.mysql.create.sql deleted file mode 100644 index 4a97e07b2e4afa1be4b65714b6f1687ced1c5c18..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.mysql.create.sql +++ /dev/null @@ -1,273 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.0', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ LONGBLOB, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ TINYINT, - IS_CONCURRENT_ TINYINT, - IS_SCOPE_ TINYINT, - primary key (ID_), - unique ACT_UNIQ_RU_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp NULL, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ TINYINT, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique ACT_UNIQ_HI_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ datetime not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.oracle.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.oracle.create.sql deleted file mode 100644 index feb9be0568efeb276ddaa6e725c6675b89d56e91..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.oracle.create.sql +++ /dev/null @@ -1,295 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ NVARCHAR2(64), - VALUE_ NVARCHAR2(300), - REV_ INTEGER, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.0', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - DEPLOYMENT_ID_ NVARCHAR2(64), - BYTES_ BLOB, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DEPLOY_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - PROC_INST_ID_ NVARCHAR2(64), - BUSINESS_KEY_ NVARCHAR2(255), - PARENT_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - SUPER_EXEC_ NVARCHAR2(64), - ACT_ID_ NVARCHAR2(255), - IS_ACTIVE_ NUMBER(1,0) CHECK (IS_ACTIVE_ IN (1,0)), - IS_CONCURRENT_ NUMBER(1,0) CHECK (IS_CONCURRENT_ IN (1,0)), - IS_SCOPE_ NUMBER(1,0) CHECK (IS_SCOPE_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ NVARCHAR2(64) NOT NULL, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) NOT NULL, - LOCK_EXP_TIME_ TIMESTAMP(6), - LOCK_OWNER_ NVARCHAR2(255), - EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)), - EXECUTION_ID_ NVARCHAR2(64), - PROCESS_INSTANCE_ID_ NVARCHAR2(64), - RETRIES_ INTEGER, - EXCEPTION_STACK_ID_ NVARCHAR2(64), - EXCEPTION_MSG_ NVARCHAR2(255), - DUEDATE_ TIMESTAMP(6), - REPEAT_ NVARCHAR2(255), - HANDLER_TYPE_ NVARCHAR2(255), - HANDLER_CFG_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - TYPE_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ NVARCHAR2(64), - GROUP_ID_ NVARCHAR2(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - FIRST_ NVARCHAR2(255), - LAST_ NVARCHAR2(255), - EMAIL_ NVARCHAR2(255), - PWD_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ NVARCHAR2(64), - CATEGORY_ NVARCHAR2(255), - NAME_ NVARCHAR2(255), - KEY_ NVARCHAR2(255), - VERSION_ INTEGER, - DEPLOYMENT_ID_ NVARCHAR2(64), - RESOURCE_NAME_ NVARCHAR2(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ NUMBER(1,0) CHECK (HAS_START_FORM_KEY_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - TASK_DEF_KEY_ NVARCHAR2(255), - ASSIGNEE_ NVARCHAR2(64), - PRIORITY_ INTEGER, - CREATE_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - GROUP_ID_ NVARCHAR2(64), - TYPE_ NVARCHAR2(255), - USER_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ NVARCHAR2(64) not null, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) not null, - NAME_ NVARCHAR2(255) not null, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - BUSINESS_KEY_ NVARCHAR2(255), - PROC_DEF_ID_ NVARCHAR2(64) not null, - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - START_USER_ID_ NVARCHAR2(255), - START_ACT_ID_ NVARCHAR2(255), - END_ACT_ID_ NVARCHAR2(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - ACT_ID_ NVARCHAR2(255) not null, - ACT_NAME_ NVARCHAR2(255), - ACT_TYPE_ NVARCHAR2(255) not null, - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ NVARCHAR2(255) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - ACT_INST_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255) not null, - VAR_TYPE_ NVARCHAR2(64), - REV_ INTEGER, - TIME_ TIMESTAMP(6) not null, - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.postgres.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.postgres.create.sql deleted file mode 100644 index 7944e2091ed56defeb90aa2dde7a2265b51b2fb8..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/create/activiti.postgres.create.sql +++ /dev/null @@ -1,287 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.0', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ bytea, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ boolean, - IS_CONCURRENT_ boolean, - IS_SCOPE_ boolean, - primary key (ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ boolean, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(64), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.mysql.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.mysql.drop.sql deleted file mode 100644 index 71a51beb7feb6678c3dec0e680716eda4cb8d400..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.mysql.drop.sql +++ /dev/null @@ -1,72 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; -drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; -drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; -drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; -drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; -drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; -drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; - - -alter table ACT_GE_BYTEARRAY - drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop FOREIGN KEY ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; - - drop table if exists ACT_GE_PROPERTY; - drop table if exists ACT_RU_VARIABLE; - drop table if exists ACT_GE_BYTEARRAY; - drop table if exists ACT_RE_DEPLOYMENT; - drop table if exists ACT_RU_IDENTITYLINK; - drop table if exists ACT_RU_TASK; - drop table if exists ACT_RE_PROCDEF; - drop table if exists ACT_RU_EXECUTION; - drop table if exists ACT_ID_MEMBERSHIP; - drop table if exists ACT_ID_GROUP; - drop table if exists ACT_ID_USER; - drop table if exists ACT_RU_JOB; - drop table if exists ACT_HI_PROCINST; - drop table if exists ACT_HI_ACTINST; - drop table if exists ACT_HI_DETAIL; - \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.h2.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.h2.create.sql deleted file mode 100644 index 87cc5364b0f1115e7bfac2fe5b074f16f4834d75..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.h2.create.sql +++ /dev/null @@ -1,299 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.1', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.1)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ longvarbinary, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ bit, - IS_CONCURRENT_ bit, - IS_SCOPE_ bit, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ bit, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_UNIQ_RU_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); - -alter table ACT_HI_PROCINST - add constraint ACT_UNIQ_HI_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP; - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER; - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY; - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.mysql.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.mysql.create.sql deleted file mode 100644 index d7c0c2f671dafc5218677c8bbc1862fa6a17e634..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.mysql.create.sql +++ /dev/null @@ -1,293 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.1', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.1)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ LONGBLOB, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ TINYINT, - IS_CONCURRENT_ TINYINT, - IS_SCOPE_ TINYINT, - primary key (ID_), - unique ACT_UNIQ_RU_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp NULL, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ TINYINT, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique ACT_UNIQ_HI_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ datetime not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.oracle.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.oracle.create.sql deleted file mode 100644 index 57a887eafb6d418029853f2eae1de0301bca4a93..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.oracle.create.sql +++ /dev/null @@ -1,315 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ NVARCHAR2(64), - VALUE_ NVARCHAR2(300), - REV_ INTEGER, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.1', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.1)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - DEPLOYMENT_ID_ NVARCHAR2(64), - BYTES_ BLOB, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DEPLOY_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - PROC_INST_ID_ NVARCHAR2(64), - BUSINESS_KEY_ NVARCHAR2(255), - PARENT_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - SUPER_EXEC_ NVARCHAR2(64), - ACT_ID_ NVARCHAR2(255), - IS_ACTIVE_ NUMBER(1,0) CHECK (IS_ACTIVE_ IN (1,0)), - IS_CONCURRENT_ NUMBER(1,0) CHECK (IS_CONCURRENT_ IN (1,0)), - IS_SCOPE_ NUMBER(1,0) CHECK (IS_SCOPE_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ NVARCHAR2(64) NOT NULL, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) NOT NULL, - LOCK_EXP_TIME_ TIMESTAMP(6), - LOCK_OWNER_ NVARCHAR2(255), - EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)), - EXECUTION_ID_ NVARCHAR2(64), - PROCESS_INSTANCE_ID_ NVARCHAR2(64), - RETRIES_ INTEGER, - EXCEPTION_STACK_ID_ NVARCHAR2(64), - EXCEPTION_MSG_ NVARCHAR2(255), - DUEDATE_ TIMESTAMP(6), - REPEAT_ NVARCHAR2(255), - HANDLER_TYPE_ NVARCHAR2(255), - HANDLER_CFG_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - TYPE_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ NVARCHAR2(64), - GROUP_ID_ NVARCHAR2(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - FIRST_ NVARCHAR2(255), - LAST_ NVARCHAR2(255), - EMAIL_ NVARCHAR2(255), - PWD_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ NVARCHAR2(64), - CATEGORY_ NVARCHAR2(255), - NAME_ NVARCHAR2(255), - KEY_ NVARCHAR2(255), - VERSION_ INTEGER, - DEPLOYMENT_ID_ NVARCHAR2(64), - RESOURCE_NAME_ NVARCHAR2(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ NUMBER(1,0) CHECK (HAS_START_FORM_KEY_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - TASK_DEF_KEY_ NVARCHAR2(255), - ASSIGNEE_ NVARCHAR2(64), - PRIORITY_ INTEGER, - CREATE_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - GROUP_ID_ NVARCHAR2(64), - TYPE_ NVARCHAR2(255), - USER_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ NVARCHAR2(64) not null, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) not null, - NAME_ NVARCHAR2(255) not null, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - BUSINESS_KEY_ NVARCHAR2(255), - PROC_DEF_ID_ NVARCHAR2(64) not null, - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - START_USER_ID_ NVARCHAR2(255), - START_ACT_ID_ NVARCHAR2(255), - END_ACT_ID_ NVARCHAR2(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - ACT_ID_ NVARCHAR2(255) not null, - ACT_NAME_ NVARCHAR2(255), - ACT_TYPE_ NVARCHAR2(255) not null, - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64), - TASK_DEF_KEY_ NVARCHAR2(255), - PROC_INST_ID_ NVARCHAR2(64), - EXECUTION_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - DELETE_REASON_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ NVARCHAR2(255) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - TASK_ID_ NVARCHAR2(64), - ACT_INST_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255) not null, - VAR_TYPE_ NVARCHAR2(64), - REV_ INTEGER, - TIME_ TIMESTAMP(6) not null, - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.postgres.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.postgres.create.sql deleted file mode 100644 index 2724faf4670d80bd5624e7cd8d5433cde5aab016..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/create/activiti.postgres.create.sql +++ /dev/null @@ -1,307 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.1', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.1)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ bytea, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ boolean, - IS_CONCURRENT_ boolean, - IS_SCOPE_ boolean, - primary key (ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ boolean, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(64), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.mysql.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.mysql.drop.sql deleted file mode 100644 index 908af447abd1f9c9f945dca230d979572d745d96..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.mysql.drop.sql +++ /dev/null @@ -1,73 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; -drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; -drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; -drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; -drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; -drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; -drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; - - -alter table ACT_GE_BYTEARRAY - drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop FOREIGN KEY ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; - - drop table if exists ACT_GE_PROPERTY; - drop table if exists ACT_RU_VARIABLE; - drop table if exists ACT_GE_BYTEARRAY; - drop table if exists ACT_RE_DEPLOYMENT; - drop table if exists ACT_RU_IDENTITYLINK; - drop table if exists ACT_RU_TASK; - drop table if exists ACT_RE_PROCDEF; - drop table if exists ACT_RU_EXECUTION; - drop table if exists ACT_ID_MEMBERSHIP; - drop table if exists ACT_ID_GROUP; - drop table if exists ACT_ID_USER; - drop table if exists ACT_RU_JOB; - drop table if exists ACT_HI_PROCINST; - drop table if exists ACT_HI_ACTINST; - drop table if exists ACT_HI_TASKINST; - drop table if exists ACT_HI_DETAIL; - \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/create/activiti.db2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/create/activiti.db2.create.engine.sql index 09ffad7e9615bc866a29ed36e0be6e234f0e9d6d..694a22b4bbb2486eb47a5bccd4fadb903627b116 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/create/activiti.db2.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/create/activiti.db2.create.engine.sql @@ -158,9 +158,11 @@ alter table ACT_GE_BYTEARRAY foreign key (DEPLOYMENT_ID_) references ACT_RE_DEPLOYMENT (ID_); -alter table ACT_RE_PROCDEF - add constraint ACT_UNIQ_PROCDEF - unique (KEY_,VERSION_); +-- THIS IS ONLY COMMENTED IN THE UPGRADE TESTS +-- IT WAS PART OF THE 5.10 RELEASE AND FAILS +-- alter table ACT_RE_PROCDEF +-- add constraint ACT_UNIQ_PROCDEF +-- unique (KEY_,VERSION_); alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_PROCINST diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/db2.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/db2.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..3147086e7295ba1bd2c6425eb482927dbe8a0f87 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/db2.data.sql @@ -0,0 +1,534 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', TIMESTAMP ('2012-11-22 15:48:18')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', blob(X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '1', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + 0, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + TIMESTAMP ('2012-11-22 15:48:19'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + TIMESTAMP ('2012-11-22 15:48:19'), + TIMESTAMP ('2012-11-22 15:48:19'), + 6 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + TIMESTAMP ('2012-11-22 15:48:19'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + TIMESTAMP ('2012-11-22 15:48:19'), + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + TIMESTAMP ('2012-11-22 15:48:19'), + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + TIMESTAMP ('2012-11-22 15:48:19'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + TIMESTAMP ('2012-11-22 15:48:19'), + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + TIMESTAMP ('2012-11-22 15:48:19'), + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = TIMESTAMP ('2012-11-22 15:48:19'), + DURATION_ = 580 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = TIMESTAMP ('2012-11-22 15:48:19'), + DURATION_ = 487, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + IS_EVENT_SCOPE_ = 0, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1, + CACHED_ENT_STATE_ = 2 + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', TIMESTAMP ('2012-11-22 15:48:20')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', blob(X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '10', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + 0, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + TIMESTAMP ('2012-11-22 15:48:20'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + TIMESTAMP ('2012-11-22 15:48:20'), + TIMESTAMP ('2012-11-22 15:48:20'), + 1 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + TIMESTAMP ('2012-11-22 15:48:20'), + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + TIMESTAMP ('2012-11-22 15:48:20'), + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + TIMESTAMP ('2012-11-22 15:48:20'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + TIMESTAMP ('2012-11-22 15:48:20'), + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + TIMESTAMP ('2012-11-22 15:48:20'), + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/h2.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/h2.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..64984fc839e597d1daeb994a25ae9d58ab3f0ff1 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/h2.data.sql @@ -0,0 +1,534 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-19 17:44:48'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '1', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-19 17:44:48', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-19 17:44:48', + '2012-11-19 17:44:48', + 21 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-19 17:44:48', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-19 17:44:48', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-19 17:44:48', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-19 17:44:49', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-19 17:44:49', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-19 17:44:49', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 17:44:49', + DURATION_ = 373 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 17:44:49', + DURATION_ = 332, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + IS_EVENT_SCOPE_ = false, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1, + CACHED_ENT_STATE_ = 2 + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-19 17:44:49'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '10', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-19 17:44:49', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-19 17:44:49', + '2012-11-19 17:44:49', + 2 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-19 17:44:49', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-19 17:44:49', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-19 17:44:49', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-19 17:44:49', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-19 17:44:49', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/mssql.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/mssql.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..6df7a65060c118068d0b5128cb750212a82d48b3 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/mssql.data.sql @@ -0,0 +1,534 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-21 16:11:39'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '1', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + 0, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-21 16:11:40', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-21 16:11:40', + '2012-11-21 16:11:40', + 11 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-21 16:11:40', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-21 16:11:40', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-21 16:11:40', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-21 16:11:41', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-21 16:11:41', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-21 16:11:41', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + IS_EVENT_SCOPE_ = 0, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1, + CACHED_ENT_STATE_ = 2 + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-21 16:11:41', + DURATION_ = 863, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-21 16:11:41', + DURATION_ = 1032 + where ID_ = '6'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-21 16:11:41'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '10', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + 0, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-21 16:11:42', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-21 16:11:42', + '2012-11-21 16:11:42', + 1 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-21 16:11:42', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-21 16:11:42', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-21 16:11:42', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-21 16:11:42', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-21 16:11:42', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/mysql.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/mysql.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..1c637c29eef88919d45b52e4dd6ca9cf57d59830 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/mysql.data.sql @@ -0,0 +1,534 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-19 15:14:03'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '1', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-19 15:14:04', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-19 15:14:04', + '2012-11-19 15:14:04', + 27 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-19 15:14:04', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-19 15:14:04', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-19 15:14:04', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-19 15:14:04', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-19 15:14:04', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-19 15:14:04', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + IS_EVENT_SCOPE_ = false, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1, + CACHED_ENT_STATE_ = 2 + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 15:14:04', + DURATION_ = 501, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 15:14:04', + DURATION_ = 548 + where ID_ = '6'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-19 15:14:04'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '10', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-19 15:14:05', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-19 15:14:05', + '2012-11-19 15:14:05', + 1 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-19 15:14:05', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-19 15:14:05', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-19 15:14:05', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-19 15:14:05', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-19 15:14:05', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/oracle.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/oracle.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..61854777ca6ce2a852b1ab136bc7cfbc65af9fbf --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/oracle.data.sql @@ -0,0 +1,534 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', to_timestamp('2012-11-21 09:18:53.566', 'YYYY-MM-DD HH:MI:SS.FF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '1', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + 0, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + to_timestamp('2012-11-21 09:18:54.136', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 09:18:54.137', 'YYYY-MM-DD HH:MI:SS.FF'), + to_timestamp('2012-11-21 09:18:54.143', 'YYYY-MM-DD HH:MI:SS.FF'), + 6 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + to_timestamp('2012-11-21 09:18:54.144', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + to_timestamp('2012-11-21 09:18:54.144', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + to_timestamp('2012-11-21 09:18:54.144', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + to_timestamp('2012-11-21 09:18:54.689', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + to_timestamp('2012-11-21 09:18:54.689', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + to_timestamp('2012-11-21 09:18:54.689', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + IS_EVENT_SCOPE_ = 0, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1, + CACHED_ENT_STATE_ = 2 + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 09:18:54.689', 'YYYY-MM-DD HH:MI:SS.FF'), + DURATION_ = 545 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 09:18:54.596', 'YYYY-MM-DD HH:MI:SS.FF'), + DURATION_ = 452, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', to_timestamp('2012-11-21 09:18:54.892', 'YYYY-MM-DD HH:MI:SS.FF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '10', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + 0, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + to_timestamp('2012-11-21 09:18:55.198', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 09:18:55.198', 'YYYY-MM-DD HH:MI:SS.FF'), + to_timestamp('2012-11-21 09:18:55.198', 'YYYY-MM-DD HH:MI:SS.FF'), + 0 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + to_timestamp('2012-11-21 09:18:55.198', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + to_timestamp('2012-11-21 09:18:55.198', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + to_timestamp('2012-11-21 09:18:55.198', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + to_timestamp('2012-11-21 09:18:55.199', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + to_timestamp('2012-11-21 09:18:55.199', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/postgres.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/postgres.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..c14aa023cb3c08f8f8690c4051463b273bba8324 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/postgres.data.sql @@ -0,0 +1,534 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-22 17:06:51'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', decode('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', 'hex'), '1', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-22 17:06:51', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-22 17:06:51', + '2012-11-22 17:06:51', + 7 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-22 17:06:51', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-22 17:06:51', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-22 17:06:51', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-22 17:06:51', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-22 17:06:51', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-22 17:06:51', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + IS_EVENT_SCOPE_ = false, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1, + CACHED_ENT_STATE_ = 2 + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-22 17:06:51', + DURATION_ = 83 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-22 17:06:51', + DURATION_ = 74, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-22 17:06:51'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', decode('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', 'hex'), '10', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-22 17:06:52', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-22 17:06:52', + '2012-11-22 17:06:52', + 0 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-22 17:06:52', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-22 17:06:52', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-22 17:06:52', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-22 17:06:52', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-22 17:06:52', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.db2.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.db2.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..b560a9d5fb331bcca2444ff36550223fbf4bc4b8 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.db2.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY; +drop index ACT_IDX_TASK_CREATE; +drop index ACT_IDX_IDENT_LNK_USER; +drop index ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_IDX_VARIABLE_TASK_ID; + +alter table ACT_GE_BYTEARRAY + drop foreign key ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop foreign key ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop foreign key ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + +drop table ACT_GE_PROPERTY; +drop table ACT_GE_BYTEARRAY; +drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; +drop table ACT_RU_VARIABLE; +drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_TASK; +drop table ACT_RU_EXECUTION; +drop table ACT_RU_JOB; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.db2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.db2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.db2.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.db2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.db2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3f62284e91860884790d0082da24806977886eb1 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.db2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.h2.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.h2.drop.engine.sql similarity index 63% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.h2.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.h2.drop.engine.sql index 200c5fc60800945f09d572861b52437de961123c..ef00e7be1b0520cffbbf34253ee9f159155bc465 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.h2.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.h2.drop.engine.sql @@ -2,14 +2,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; @@ -23,21 +16,18 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - alter table ACT_RU_EXECUTION - drop constraint ACT_UNIQ_RU_BUS_KEY; - -alter table ACT_HI_PROCINST - drop constraint ACT_UNIQ_HI_BUS_KEY; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_UNIQ_RU_BUS_KEY; + alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; - + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; @@ -59,18 +49,22 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop constraint ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + drop table ACT_GE_PROPERTY if exists; drop table ACT_GE_BYTEARRAY if exists; drop table ACT_RE_DEPLOYMENT if exists; drop table ACT_RU_EXECUTION if exists; -drop table ACT_ID_GROUP if exists; -drop table ACT_ID_MEMBERSHIP if exists; -drop table ACT_ID_USER if exists; drop table ACT_RU_JOB if exists; drop table ACT_RE_PROCDEF if exists; drop table ACT_RU_TASK if exists; drop table ACT_RU_IDENTITYLINK if exists; drop table ACT_RU_VARIABLE if exists; -drop table ACT_HI_PROCINST if exists; -drop table ACT_HI_ACTINST if exists; -drop table ACT_HI_DETAIL if exists; +drop table ACT_RU_EVENT_SUBSCR if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.h2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.h2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..936591335ea20d3541a1869460ca7fe591b7daeb --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.h2.drop.history.sql @@ -0,0 +1,23 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +alter table ACT_HI_PROCINST + drop constraint ACT_UNIQ_HI_BUS_KEY; + +drop table ACT_HI_PROCINST if exists; +drop table ACT_HI_ACTINST if exists; +drop table ACT_HI_VARINST if exists; +drop table ACT_HI_TASKINST if exists; +drop table ACT_HI_DETAIL if exists; +drop table ACT_HI_COMMENT if exists; +drop table ACT_HI_ATTACHMENT if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.h2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.h2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..8290d1d16811b7d0fd03b15139f781f76ed35a2d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.h2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO if exists; +drop table ACT_ID_GROUP if exists; +drop table ACT_ID_MEMBERSHIP if exists; +drop table ACT_ID_USER if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mssql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mssql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..4e3ee2e43f12bc0edeceb038e0ae1e44d7e4c889 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mssql.drop.engine.sql @@ -0,0 +1,61 @@ +drop index ACT_RU_EXECUTION.ACT_IDX_EXEC_BUSKEY; +drop index ACT_RU_TASK.ACT_IDX_TASK_CREATE; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_USER; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_RU_VARIABLE.ACT_IDX_VARIABLE_TASK_ID; +drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_CONFIG_; + +alter table ACT_GE_BYTEARRAY + drop constraint ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_SUPER; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop constraint ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +drop index ACT_RU_IDENTITYLINK.ACT_IDX_ATHRZ_PROCEDEF; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_PROPERTY') drop table ACT_GE_PROPERTY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_BYTEARRAY') drop table ACT_GE_BYTEARRAY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_PROCDEF') drop table ACT_RE_PROCDEF; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_DEPLOYMENT') drop table ACT_RE_DEPLOYMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_IDENTITYLINK') drop table ACT_RU_IDENTITYLINK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TASK') drop table ACT_RU_TASK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') drop table ACT_RU_VARIABLE; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXECUTION') drop table ACT_RU_EXECUTION; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EVENT_SUBSCR') drop table ACT_RU_EVENT_SUBSCR; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') drop table ACT_RU_JOB; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mssql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mssql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..486b61f9c68e0ca595f67c64869753bbe2bb7933 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mssql.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_INST_END; +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_START; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_END; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TIME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_NAME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_PROCINST') drop table ACT_HI_PROCINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ACTINST') drop table ACT_HI_ACTINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_VARINST') drop table ACT_HI_VARINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_TASKINST') drop table ACT_HI_TASKINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_DETAIL') drop table ACT_HI_DETAIL; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_COMMENT') drop table ACT_HI_COMMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ATTACHMENT') drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mssql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mssql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..baf49c6f41ca8948ad9addeec7f2def9370fc14d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mssql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_INFO') drop table ACT_ID_INFO; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_MEMBERSHIP') drop table ACT_ID_MEMBERSHIP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_GROUP') drop table ACT_ID_GROUP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_USER') drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mysql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mysql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..d860130536eb7c3ffab6f3f6632f607d76943300 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mysql.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; +drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; +drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE; + +alter table ACT_GE_BYTEARRAY + drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop FOREIGN KEY ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR; + +drop table if exists ACT_GE_PROPERTY; +drop table if exists ACT_RU_VARIABLE; +drop table if exists ACT_GE_BYTEARRAY; +drop table if exists ACT_RE_DEPLOYMENT; +drop table if exists ACT_RU_IDENTITYLINK; +drop table if exists ACT_RU_TASK; +drop table if exists ACT_RE_PROCDEF; +drop table if exists ACT_RU_EXECUTION; +drop table if exists ACT_RU_JOB; +drop table if exists ACT_RU_EVENT_SUBSCR; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mysql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mysql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..4acf18eaac067552d0e77926cc03285a1737303d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mysql.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; +drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; +drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; +drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; +drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL; +drop index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST; +drop index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST; + +drop table if exists ACT_HI_PROCINST; +drop table if exists ACT_HI_ACTINST; +drop table if exists ACT_HI_VARINST; +drop table if exists ACT_HI_TASKINST; +drop table if exists ACT_HI_DETAIL; +drop table if exists ACT_HI_COMMENT; +drop table if exists ACT_HI_ATTACHMENT; + \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mysql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mysql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3b404c4db48bf4fe75817d7112e6873aca90b998 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.mysql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_USER; + +drop table if exists ACT_ID_INFO; +drop table if exists ACT_ID_MEMBERSHIP; +drop table if exists ACT_ID_GROUP; +drop table if exists ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.oracle.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.oracle.drop.engine.sql similarity index 64% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.oracle.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.oracle.drop.engine.sql index e747f1da6239490fe3f986a35367489b565e52ac..2f4c52a1a294a0ae71981c1438413737f82e8758 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.oracle.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.oracle.drop.engine.sql @@ -1,9 +1,7 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; +drop index ACT_IDX_BYTEAR_DEPL; +drop index ACT_IDX_EXE_PROCINST; +drop index ACT_IDX_EXE_PARENT; drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; drop index ACT_IDX_TSKASS_TASK; drop index ACT_IDX_TASK_EXEC; drop index ACT_IDX_TASK_PROCINST; @@ -17,14 +15,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop CONSTRAINT ACT_FK_BYTEARR_DEPL; @@ -37,16 +28,16 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop CONSTRAINT ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_USER; + +alter table ACT_RU_EXECUTION + drop CONSTRAINT ACT_FK_EXE_PROCDEF; alter table ACT_RU_IDENTITYLINK drop CONSTRAINT ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK + drop CONSTRAINT ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop CONSTRAINT ACT_FK_TASK_EXE; @@ -67,19 +58,24 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop CONSTRAINT ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop CONSTRAINT ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; drop table ACT_GE_PROPERTY; -drop table ACT_RU_VARIABLE; drop table ACT_GE_BYTEARRAY; drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_VARIABLE; drop table ACT_RU_TASK; -drop table ACT_RE_PROCDEF; drop table ACT_RU_EXECUTION; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_GROUP; -drop table ACT_ID_USER; drop table ACT_RU_JOB; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_DETAIL; \ No newline at end of file +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.oracle.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.oracle.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..284ae4af9f368b75b361315801a216b3a981c6ed --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.oracle.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.oracle.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.oracle.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..f54f10c642b4600eddab5922d037443ac13717c7 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.oracle.drop.identity.sql @@ -0,0 +1,13 @@ +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_USER; + +drop index ACT_IDX_MEMB_GROUP; +drop index ACT_IDX_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.postgres.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.postgres.drop.engine.sql similarity index 71% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.postgres.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.postgres.drop.engine.sql index 89c1c4fa477333ea5c54c725451b52cf09e09ffb..c69c43343eb8df18d55c9b0c3edac49c6b1e9676 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.0/drop/activiti.postgres.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.postgres.drop.engine.sql @@ -17,14 +17,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; @@ -37,16 +30,16 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; @@ -68,18 +61,23 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; + drop table ACT_GE_PROPERTY; drop table ACT_GE_BYTEARRAY; drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; drop table ACT_RU_EXECUTION; -drop table ACT_ID_GROUP; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_USER; drop table ACT_RU_JOB; -drop table ACT_RE_PROCDEF; drop table ACT_RU_TASK; drop table ACT_RU_IDENTITYLINK; drop table ACT_RU_VARIABLE; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_DETAIL; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.postgres.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.postgres.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.postgres.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.postgres.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.postgres.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..10ca22af87a7659a398cb616e113ae9f7ac97e2c --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/drop/activiti.postgres.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_GROUP; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_USER; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.engine.sql similarity index 72% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.engine.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.engine.sql index 3044af9d4225ebb71092d9be07308a9662b428d1..9d3fbabf14195e65461ca1d9973330f5003b2d95 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.engine.sql @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY ( ); insert into ACT_GE_PROPERTY -values ('schema.version', '5.6', 1); +values ('schema.version', '5.11-SNAPSHOT', 1); insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.6)', 1); +values ('schema.history', 'create(5.11-SNAPSHOT)', 1); insert into ACT_GE_PROPERTY values ('next.dbid', '1', 1); @@ -20,12 +20,14 @@ create table ACT_GE_BYTEARRAY ( NAME_ varchar(255), DEPLOYMENT_ID_ varchar(64), BYTES_ BLOB, + GENERATED_ smallint check(GENERATED_ in (1,0)), primary key (ID_) ); create table ACT_RE_DEPLOYMENT ( ID_ varchar(64) not null, NAME_ varchar(255), + CATEGORY_ varchar(255), DEPLOY_TIME_ timestamp, primary key (ID_) ); @@ -42,8 +44,11 @@ create table ACT_RU_EXECUTION ( IS_ACTIVE_ smallint check(IS_ACTIVE_ in (1,0)), IS_CONCURRENT_ smallint check(IS_CONCURRENT_ in (1,0)), IS_SCOPE_ smallint check(IS_SCOPE_ in (1,0)), + IS_EVENT_SCOPE_ smallint check(IS_EVENT_SCOPE_ in (1,0)), UNI_BUSINESS_KEY varchar (255) not null generated always as (case when "BUSINESS_KEY_" is null then "ID_" else "BUSINESS_KEY_" end), UNI_PROC_DEF_ID varchar (64) not null generated always as (case when "PROC_DEF_ID_" is null then "ID_" else "PROC_DEF_ID_" end), + SUSPENSION_STATE_ integer, + CACHED_ENT_STATE_ integer, primary key (ID_) ); @@ -59,7 +64,7 @@ create table ACT_RU_JOB ( RETRIES_ integer, EXCEPTION_STACK_ID_ varchar(64), EXCEPTION_MSG_ varchar(4000), - DUEDATE_ timestamp null, + DUEDATE_ timestamp, REPEAT_ varchar(255), HANDLER_TYPE_ varchar(255), HANDLER_CFG_ varchar(4000), @@ -68,14 +73,17 @@ create table ACT_RU_JOB ( create table ACT_RE_PROCDEF ( ID_ varchar(64) not null, + REV_ integer, CATEGORY_ varchar(255), NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, + KEY_ varchar(255) not null, + VERSION_ integer not null, DEPLOYMENT_ID_ varchar(64), RESOURCE_NAME_ varchar(4000), DGRM_RESOURCE_NAME_ varchar(4000), + DESCRIPTION_ varchar(4000), HAS_START_FORM_KEY_ smallint check(HAS_START_FORM_KEY_ in (1,0)), + SUSPENSION_STATE_ integer, primary key (ID_) ); @@ -89,8 +97,8 @@ create table ACT_RU_TASK ( PARENT_TASK_ID_ varchar(64), DESCRIPTION_ varchar(4000), TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), + OWNER_ varchar(255), + ASSIGNEE_ varchar(255), DELEGATION_ varchar(64), PRIORITY_ integer, CREATE_TIME_ timestamp, @@ -101,10 +109,11 @@ create table ACT_RU_TASK ( create table ACT_RU_IDENTITYLINK ( ID_ varchar(64) not null, REV_ integer, - GROUP_ID_ varchar(64), + GROUP_ID_ varchar(255), TYPE_ varchar(255), - USER_ID_ varchar(64), + USER_ID_ varchar(255), TASK_ID_ varchar(64), + PROC_DEF_ID_ varchar(64), primary key (ID_) ); @@ -124,17 +133,37 @@ create table ACT_RU_VARIABLE ( primary key (ID_) ); +create table ACT_RU_EVENT_SUBSCR ( + ID_ varchar(64) not null, + REV_ integer, + EVENT_TYPE_ varchar(255) not null, + EVENT_NAME_ varchar(255), + EXECUTION_ID_ varchar(64), + PROC_INST_ID_ varchar(64), + ACTIVITY_ID_ varchar(64), + CONFIGURATION_ varchar(255), + CREATED_ timestamp not null, + primary key (ID_) +); + create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION(UNI_PROC_DEF_ID, UNI_BUSINESS_KEY); create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); +create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_); +create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_); +create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_); alter table ACT_GE_BYTEARRAY add constraint ACT_FK_BYTEARR_DEPL foreign key (DEPLOYMENT_ID_) references ACT_RE_DEPLOYMENT (ID_); +alter table ACT_RE_PROCDEF + add constraint ACT_UNIQ_PROCDEF + unique (KEY_,VERSION_); + alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_PROCINST foreign key (PROC_INST_ID_) @@ -150,11 +179,21 @@ alter table ACT_RU_EXECUTION foreign key (SUPER_EXEC_) references ACT_RU_EXECUTION (ID_); +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + alter table ACT_RU_IDENTITYLINK add constraint ACT_FK_TSKASS_TASK foreign key (TASK_ID_) references ACT_RU_TASK (ID_); - + +alter table ACT_RU_IDENTITYLINK + add constraint ACT_FK_ATHRZ_PROCEDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + alter table ACT_RU_TASK add constraint ACT_FK_TASK_EXE foreign key (EXECUTION_ID_) @@ -189,3 +228,8 @@ alter table ACT_RU_JOB add constraint ACT_FK_JOB_EXCEPTION foreign key (EXCEPTION_STACK_ID_) references ACT_GE_BYTEARRAY (ID_); + +alter table ACT_RU_EVENT_SUBSCR + add constraint ACT_FK_EVENT_EXEC + foreign key (EXECUTION_ID_) + references ACT_RU_EXECUTION(ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.history.sql similarity index 66% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.history.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.history.sql index 4a8c6fa99617a8e16b2242f55f7ba3de9abfe36e..2752568f61bfb459329d256e5ec1cad746c93b6b 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.history.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.history.sql @@ -9,18 +9,23 @@ create table ACT_HI_PROCINST ( START_USER_ID_ varchar(255), START_ACT_ID_ varchar(255), END_ACT_ID_ varchar(255), - UNI_BUSINESS_KEY varchar (255) not null generated always as (case when "BUSINESS_KEY_" is null then "ID_" else "BUSINESS_KEY_" end), - UNI_PROC_DEF_ID varchar (64) not null generated always as (case when "PROC_DEF_ID_" is null then "ID_" else "PROC_DEF_ID_" end), - primary key (ID_), - unique (PROC_INST_ID_) + SUPER_PROCESS_INSTANCE_ID_ varchar(64), + UNI_BUSINESS_KEY varchar (255) not null generated always as (case when "BUSINESS_KEY_" is null then "ID_" else "BUSINESS_KEY_" end), + UNI_PROC_DEF_ID varchar (64) not null generated always as (case when "PROC_DEF_ID_" is null then "ID_" else "PROC_DEF_ID_" end), + DELETE_REASON_ varchar(4000), + primary key (ID_) ); +alter table ACT_HI_PROCINST add constraint PROC_INST_ID_ unique(PROC_INST_ID_); + create table ACT_HI_ACTINST ( ID_ varchar(64) not null, PROC_DEF_ID_ varchar(64) not null, PROC_INST_ID_ varchar(64) not null, EXECUTION_ID_ varchar(64) not null, ACT_ID_ varchar(255) not null, + TASK_ID_ varchar(64), + CALL_PROC_INST_ID_ varchar(64), ACT_NAME_ varchar(255), ACT_TYPE_ varchar(255) not null, OWNER_ varchar(64), @@ -40,7 +45,8 @@ create table ACT_HI_TASKINST ( NAME_ varchar(255), PARENT_TASK_ID_ varchar(64), DESCRIPTION_ varchar(4000), - ASSIGNEE_ varchar(64), + OWNER_ varchar(255), + ASSIGNEE_ varchar(255), START_TIME_ timestamp not null, END_TIME_ timestamp, DURATION_ bigint, @@ -50,11 +56,27 @@ create table ACT_HI_TASKINST ( primary key (ID_) ); +create table ACT_HI_VARINST ( + ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), + TASK_ID_ varchar(64), + NAME_ varchar(255) not null, + VAR_TYPE_ varchar(100), + REV_ integer, + BYTEARRAY_ID_ varchar(64), + DOUBLE_ double precision, + LONG_ bigint, + TEXT_ varchar(4000), + TEXT2_ varchar(4000), + primary key (ID_) +); + create table ACT_HI_DETAIL ( ID_ varchar(64) not null, TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), TASK_ID_ varchar(64), ACT_INST_ID_ varchar(64), NAME_ varchar(255) not null, @@ -105,3 +127,7 @@ create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); +create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_); +create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); +create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); +create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.identity.sql similarity index 100% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.identity.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.db2.create.identity.sql diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.engine.sql similarity index 73% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.engine.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.engine.sql index 8ae0878fc0140d2d571284cad7925c1848afad79..fe224d320e63ea256a6ddd8452ec05713572acc4 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.engine.sql @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY ( ); insert into ACT_GE_PROPERTY -values ('schema.version', '5.6', 1); +values ('schema.version', '5.11-SNAPSHOT', 1); insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.6)', 1); +values ('schema.history', 'create(5.11-SNAPSHOT)', 1); insert into ACT_GE_PROPERTY values ('next.dbid', '1', 1); @@ -20,12 +20,14 @@ create table ACT_GE_BYTEARRAY ( NAME_ varchar(255), DEPLOYMENT_ID_ varchar(64), BYTES_ longvarbinary, + GENERATED_ bit, primary key (ID_) ); create table ACT_RE_DEPLOYMENT ( ID_ varchar(64), NAME_ varchar(255), + CATEGORY_ varchar(255), DEPLOY_TIME_ timestamp, primary key (ID_) ); @@ -42,6 +44,9 @@ create table ACT_RU_EXECUTION ( IS_ACTIVE_ bit, IS_CONCURRENT_ bit, IS_SCOPE_ bit, + IS_EVENT_SCOPE_ bit, + SUSPENSION_STATE_ integer, + CACHED_ENT_STATE_ integer, primary key (ID_) ); @@ -65,15 +70,18 @@ create table ACT_RU_JOB ( ); create table ACT_RE_PROCDEF ( - ID_ varchar(64), + ID_ varchar(64) NOT NULL, + REV_ integer, CATEGORY_ varchar(255), NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, + KEY_ varchar(255) NOT NULL, + VERSION_ integer NOT NULL, DEPLOYMENT_ID_ varchar(64), RESOURCE_NAME_ varchar(4000), DGRM_RESOURCE_NAME_ varchar(4000), + DESCRIPTION_ varchar(4000), HAS_START_FORM_KEY_ bit, + SUSPENSION_STATE_ integer, primary key (ID_) ); @@ -87,8 +95,8 @@ create table ACT_RU_TASK ( PARENT_TASK_ID_ varchar(64), DESCRIPTION_ varchar(4000), TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), + OWNER_ varchar(255), + ASSIGNEE_ varchar(255), DELEGATION_ varchar(64), PRIORITY_ integer, CREATE_TIME_ timestamp, @@ -99,10 +107,11 @@ create table ACT_RU_TASK ( create table ACT_RU_IDENTITYLINK ( ID_ varchar(64), REV_ integer, - GROUP_ID_ varchar(64), + GROUP_ID_ varchar(255), TYPE_ varchar(255), - USER_ID_ varchar(64), + USER_ID_ varchar(255), TASK_ID_ varchar(64), + PROC_DEF_ID_ varchar(64), primary key (ID_) ); @@ -122,16 +131,36 @@ create table ACT_RU_VARIABLE ( primary key (ID_) ); +create table ACT_RU_EVENT_SUBSCR ( + ID_ varchar(64) not null, + REV_ integer, + EVENT_TYPE_ varchar(255) not null, + EVENT_NAME_ varchar(255), + EXECUTION_ID_ varchar(64), + PROC_INST_ID_ varchar(64), + ACTIVITY_ID_ varchar(64), + CONFIGURATION_ varchar(255), + CREATED_ timestamp not null, + primary key (ID_) +); + create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); +create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_); +create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_); +create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_); alter table ACT_GE_BYTEARRAY add constraint ACT_FK_BYTEARR_DEPL foreign key (DEPLOYMENT_ID_) references ACT_RE_DEPLOYMENT; +alter table ACT_RE_PROCDEF + add constraint ACT_UNIQ_PROCDEF + unique (KEY_,VERSION_); + alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_PROCINST foreign key (PROC_INST_ID_) @@ -147,6 +176,11 @@ alter table ACT_RU_EXECUTION foreign key (SUPER_EXEC_) references ACT_RU_EXECUTION; +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + alter table ACT_RU_EXECUTION add constraint ACT_UNIQ_RU_BUS_KEY unique(PROC_DEF_ID_, BUSINESS_KEY_); @@ -156,6 +190,11 @@ alter table ACT_RU_IDENTITYLINK foreign key (TASK_ID_) references ACT_RU_TASK; +alter table ACT_RU_IDENTITYLINK + add constraint ACT_FK_ATHRZ_PROCEDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF; + alter table ACT_RU_TASK add constraint ACT_FK_TASK_EXE foreign key (EXECUTION_ID_) @@ -190,3 +229,8 @@ alter table ACT_RU_JOB add constraint ACT_FK_JOB_EXCEPTION foreign key (EXCEPTION_STACK_ID_) references ACT_GE_BYTEARRAY; + +alter table ACT_RU_EVENT_SUBSCR + add constraint ACT_FK_EVENT_EXEC + foreign key (EXECUTION_ID_) + references ACT_RU_EXECUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.history.sql similarity index 77% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.history.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.history.sql index 2d7dfb4b0a6f7bd887879d57435d1370754fa474..7fbdf40fabcd255768c482e4f53300d18c7041dd 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.history.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.history.sql @@ -9,6 +9,8 @@ create table ACT_HI_PROCINST ( START_USER_ID_ varchar(255), START_ACT_ID_ varchar(255), END_ACT_ID_ varchar(255), + SUPER_PROCESS_INSTANCE_ID_ varchar(64), + DELETE_REASON_ varchar(4000), primary key (ID_), unique (PROC_INST_ID_) ); @@ -19,6 +21,8 @@ create table ACT_HI_ACTINST ( PROC_INST_ID_ varchar(64) not null, EXECUTION_ID_ varchar(64) not null, ACT_ID_ varchar(255) not null, + TASK_ID_ varchar(64), + CALL_PROC_INST_ID_ varchar(64), ACT_NAME_ varchar(255), ACT_TYPE_ varchar(255) not null, ASSIGNEE_ varchar(64), @@ -37,8 +41,8 @@ create table ACT_HI_TASKINST ( NAME_ varchar(255), PARENT_TASK_ID_ varchar(64), DESCRIPTION_ varchar(4000), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), + OWNER_ varchar(255), + ASSIGNEE_ varchar(255), START_TIME_ timestamp not null, END_TIME_ timestamp, DURATION_ bigint, @@ -48,6 +52,22 @@ create table ACT_HI_TASKINST ( primary key (ID_) ); +create table ACT_HI_VARINST ( + ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), + TASK_ID_ varchar(64), + NAME_ varchar(255) not null, + VAR_TYPE_ varchar(100), + REV_ integer, + BYTEARRAY_ID_ varchar(64), + DOUBLE_ double, + LONG_ bigint, + TEXT_ varchar(4000), + TEXT2_ varchar(4000), + primary key (ID_) +); + create table ACT_HI_DETAIL ( ID_ varchar(64) not null, TYPE_ varchar(255) not null, @@ -102,6 +122,10 @@ create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); +create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_); +create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); +create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); +create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_); alter table ACT_HI_PROCINST add constraint ACT_UNIQ_HI_BUS_KEY diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.identity.sql similarity index 100% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.identity.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.h2.create.identity.sql diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.engine.sql similarity index 70% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.engine.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.engine.sql index 395ec713fa4d7683f2728f49080d87a56d9a8936..c77aee38264f7693b89e8acc8fcdc0f82339f246 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.engine.sql @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY ( ); insert into ACT_GE_PROPERTY -values ('schema.version', '5.6', 1); +values ('schema.version', '5.11-SNAPSHOT', 1); insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.6)', 1); +values ('schema.history', 'create(5.11-SNAPSHOT)', 1); insert into ACT_GE_PROPERTY values ('next.dbid', '1', 1); @@ -20,12 +20,14 @@ create table ACT_GE_BYTEARRAY ( NAME_ nvarchar(255), DEPLOYMENT_ID_ nvarchar(64), BYTES_ image, + GENERATED_ tinyint, primary key (ID_) ); create table ACT_RE_DEPLOYMENT ( ID_ nvarchar(64), NAME_ nvarchar(255), + CATEGORY_ nvarchar(255), DEPLOY_TIME_ datetime, primary key (ID_) ); @@ -42,6 +44,9 @@ create table ACT_RU_EXECUTION ( IS_ACTIVE_ tinyint, IS_CONCURRENT_ tinyint, IS_SCOPE_ tinyint, + IS_EVENT_SCOPE_ tinyint, + SUSPENSION_STATE_ tinyint, + CACHED_ENT_STATE_ int, primary key (ID_) ); @@ -65,15 +70,18 @@ create table ACT_RU_JOB ( ); create table ACT_RE_PROCDEF ( - ID_ nvarchar(64), + ID_ nvarchar(64) not null, + REV_ int, CATEGORY_ nvarchar(255), NAME_ nvarchar(255), - KEY_ nvarchar(255), - VERSION_ int, + KEY_ nvarchar(255) not null, + VERSION_ int not null, DEPLOYMENT_ID_ nvarchar(64), RESOURCE_NAME_ nvarchar(4000), DGRM_RESOURCE_NAME_ nvarchar(4000), + DESCRIPTION_ nvarchar(4000), HAS_START_FORM_KEY_ tinyint, + SUSPENSION_STATE_ tinyint, primary key (ID_) ); @@ -87,8 +95,8 @@ create table ACT_RU_TASK ( PARENT_TASK_ID_ nvarchar(64), DESCRIPTION_ nvarchar(4000), TASK_DEF_KEY_ nvarchar(255), - OWNER_ nvarchar(64), - ASSIGNEE_ nvarchar(64), + OWNER_ nvarchar(255), + ASSIGNEE_ nvarchar(255), DELEGATION_ nvarchar(64), PRIORITY_ int, CREATE_TIME_ datetime, @@ -99,10 +107,11 @@ create table ACT_RU_TASK ( create table ACT_RU_IDENTITYLINK ( ID_ nvarchar(64), REV_ int, - GROUP_ID_ nvarchar(64), + GROUP_ID_ nvarchar(255), TYPE_ nvarchar(255), - USER_ID_ nvarchar(64), + USER_ID_ nvarchar(255), TASK_ID_ nvarchar(64), + PROC_DEF_ID_ nvarchar(64), primary key (ID_) ); @@ -122,17 +131,37 @@ create table ACT_RU_VARIABLE ( primary key (ID_) ); +create table ACT_RU_EVENT_SUBSCR ( + ID_ nvarchar(64) not null, + REV_ int, + EVENT_TYPE_ nvarchar(255) not null, + EVENT_NAME_ nvarchar(255), + EXECUTION_ID_ nvarchar(64), + PROC_INST_ID_ nvarchar(64), + ACTIVITY_ID_ nvarchar(64), + CONFIGURATION_ nvarchar(255), + CREATED_ datetime not null, + primary key (ID_) +); + create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); +create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_); +create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_); create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; +create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_); alter table ACT_GE_BYTEARRAY add constraint ACT_FK_BYTEARR_DEPL foreign key (DEPLOYMENT_ID_) references ACT_RE_DEPLOYMENT (ID_); +alter table ACT_RE_PROCDEF + add constraint ACT_UNIQ_PROCDEF + unique (KEY_,VERSION_); + alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_PARENT foreign key (PARENT_ID_) @@ -142,12 +171,22 @@ alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_SUPER foreign key (SUPER_EXEC_) references ACT_RU_EXECUTION (ID_); - + +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + alter table ACT_RU_IDENTITYLINK add constraint ACT_FK_TSKASS_TASK foreign key (TASK_ID_) references ACT_RU_TASK (ID_); +alter table ACT_RU_IDENTITYLINK + add constraint ACT_FK_ATHRZ_PROCEDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + alter table ACT_RU_TASK add constraint ACT_FK_TASK_EXE foreign key (EXECUTION_ID_) @@ -181,4 +220,9 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB add constraint ACT_FK_JOB_EXCEPTION foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file + references ACT_GE_BYTEARRAY (ID_); + +alter table ACT_RU_EVENT_SUBSCR + add constraint ACT_FK_EVENT_EXEC + foreign key (EXECUTION_ID_) + references ACT_RU_EXECUTION(ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.history.sql similarity index 72% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.history.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.history.sql index 65fe20eb341823a19877ae2f88c1270c67eba09e..3303b39288a22cc5d2e44d85bd3fb769ee3cc260 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.history.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.history.sql @@ -9,6 +9,8 @@ create table ACT_HI_PROCINST ( START_USER_ID_ nvarchar(255), START_ACT_ID_ nvarchar(255), END_ACT_ID_ nvarchar(255), + SUPER_PROCESS_INSTANCE_ID_ nvarchar(64), + DELETE_REASON_ nvarchar(4000), primary key (ID_), unique (PROC_INST_ID_) ); @@ -19,6 +21,8 @@ create table ACT_HI_ACTINST ( PROC_INST_ID_ nvarchar(64) not null, EXECUTION_ID_ nvarchar(64) not null, ACT_ID_ nvarchar(255) not null, + TASK_ID_ nvarchar(64), + CALL_PROC_INST_ID_ nvarchar(64), ACT_NAME_ nvarchar(255), ACT_TYPE_ nvarchar(255) not null, ASSIGNEE_ nvarchar(64), @@ -37,8 +41,8 @@ create table ACT_HI_TASKINST ( NAME_ nvarchar(255), PARENT_TASK_ID_ nvarchar(64), DESCRIPTION_ nvarchar(4000), - OWNER_ nvarchar(64), - ASSIGNEE_ nvarchar(64), + OWNER_ nvarchar(255), + ASSIGNEE_ nvarchar(255), START_TIME_ datetime not null, END_TIME_ datetime, DURATION_ numeric(19,0), @@ -48,11 +52,27 @@ create table ACT_HI_TASKINST ( primary key (ID_) ); +create table ACT_HI_VARINST ( + ID_ nvarchar(64) not null, + PROC_INST_ID_ nvarchar(64), + EXECUTION_ID_ nvarchar(64), + TASK_ID_ nvarchar(64), + NAME_ nvarchar(255) not null, + VAR_TYPE_ nvarchar(100), + REV_ int, + BYTEARRAY_ID_ nvarchar(64), + DOUBLE_ double precision, + LONG_ numeric(19,0), + TEXT_ nvarchar(4000), + TEXT2_ nvarchar(4000), + primary key (ID_) +); + create table ACT_HI_DETAIL ( ID_ nvarchar(64) not null, TYPE_ nvarchar(255) not null, - PROC_INST_ID_ nvarchar(64) not null, - EXECUTION_ID_ nvarchar(64) not null, + PROC_INST_ID_ nvarchar(64), + EXECUTION_ID_ nvarchar(64), TASK_ID_ nvarchar(64), ACT_INST_ID_ nvarchar(64), NAME_ nvarchar(255) not null, @@ -102,4 +122,8 @@ create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; \ No newline at end of file +create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_); +create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); +create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); +create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; +create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.identity.sql similarity index 100% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.identity.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mssql.create.identity.sql diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.engine.sql similarity index 71% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.engine.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.engine.sql index 1f7b6e7384b833b42fa23a14c8bcf0bec02d81cc..73f2105ee0343086eaee8bc84d61e97240824961 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.engine.sql @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; insert into ACT_GE_PROPERTY -values ('schema.version', '5.6', 1); +values ('schema.version', '5.11-SNAPSHOT', 1); insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.6)', 1); +values ('schema.history', 'create(5.11-SNAPSHOT)', 1); insert into ACT_GE_PROPERTY values ('next.dbid', '1', 1); @@ -20,12 +20,14 @@ create table ACT_GE_BYTEARRAY ( NAME_ varchar(255), DEPLOYMENT_ID_ varchar(64), BYTES_ LONGBLOB, + GENERATED_ TINYINT, primary key (ID_) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; create table ACT_RE_DEPLOYMENT ( ID_ varchar(64), NAME_ varchar(255), + CATEGORY_ varchar(255), DEPLOY_TIME_ timestamp, primary key (ID_) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; @@ -42,15 +44,18 @@ create table ACT_RU_EXECUTION ( IS_ACTIVE_ TINYINT, IS_CONCURRENT_ TINYINT, IS_SCOPE_ TINYINT, + IS_EVENT_SCOPE_ TINYINT, + SUSPENSION_STATE_ integer, + CACHED_ENT_STATE_ integer, primary key (ID_), unique ACT_UNIQ_RU_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; create table ACT_RU_JOB ( ID_ varchar(64) NOT NULL, - REV_ integer, + REV_ integer, TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, + LOCK_EXP_TIME_ timestamp NULL, LOCK_OWNER_ varchar(255), EXCLUSIVE_ boolean, EXECUTION_ID_ varchar(64), @@ -66,15 +71,18 @@ create table ACT_RU_JOB ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; create table ACT_RE_PROCDEF ( - ID_ varchar(64), + ID_ varchar(64) not null, + REV_ integer, CATEGORY_ varchar(255), NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, + KEY_ varchar(255) not null, + VERSION_ integer not null, DEPLOYMENT_ID_ varchar(64), RESOURCE_NAME_ varchar(4000), DGRM_RESOURCE_NAME_ varchar(4000), + DESCRIPTION_ varchar(4000), HAS_START_FORM_KEY_ TINYINT, + SUSPENSION_STATE_ integer, primary key (ID_) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; @@ -88,8 +96,8 @@ create table ACT_RU_TASK ( PARENT_TASK_ID_ varchar(64), DESCRIPTION_ varchar(4000), TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), + OWNER_ varchar(255), + ASSIGNEE_ varchar(255), DELEGATION_ varchar(64), PRIORITY_ integer, CREATE_TIME_ timestamp, @@ -100,10 +108,11 @@ create table ACT_RU_TASK ( create table ACT_RU_IDENTITYLINK ( ID_ varchar(64), REV_ integer, - GROUP_ID_ varchar(64), + GROUP_ID_ varchar(255), TYPE_ varchar(255), - USER_ID_ varchar(64), + USER_ID_ varchar(255), TASK_ID_ varchar(64), + PROC_DEF_ID_ varchar(64), primary key (ID_) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; @@ -123,16 +132,36 @@ create table ACT_RU_VARIABLE ( primary key (ID_) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; +create table ACT_RU_EVENT_SUBSCR ( + ID_ varchar(64) not null, + REV_ integer, + EVENT_TYPE_ varchar(255) not null, + EVENT_NAME_ varchar(255), + EXECUTION_ID_ varchar(64), + PROC_INST_ID_ varchar(64), + ACTIVITY_ID_ varchar(64), + CONFIGURATION_ varchar(255), + CREATED_ timestamp not null, + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); +create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_); +create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_); +create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_); alter table ACT_GE_BYTEARRAY add constraint ACT_FK_BYTEARR_DEPL foreign key (DEPLOYMENT_ID_) references ACT_RE_DEPLOYMENT (ID_); +alter table ACT_RE_PROCDEF + add constraint ACT_UNIQ_PROCDEF + unique (KEY_,VERSION_); + alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_PROCINST foreign key (PROC_INST_ID_) @@ -147,12 +176,22 @@ alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_SUPER foreign key (SUPER_EXEC_) references ACT_RU_EXECUTION (ID_); + +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); alter table ACT_RU_IDENTITYLINK add constraint ACT_FK_TSKASS_TASK foreign key (TASK_ID_) references ACT_RU_TASK (ID_); +alter table ACT_RU_IDENTITYLINK + add constraint ACT_FK_ATHRZ_PROCEDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF(ID_); + alter table ACT_RU_TASK add constraint ACT_FK_TASK_EXE foreign key (EXECUTION_ID_) @@ -186,4 +225,9 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB add constraint ACT_FK_JOB_EXCEPTION foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file + references ACT_GE_BYTEARRAY (ID_); + +alter table ACT_RU_EVENT_SUBSCR + add constraint ACT_FK_EVENT_EXEC + foreign key (EXECUTION_ID_) + references ACT_RU_EXECUTION(ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.history.sql similarity index 72% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.history.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.history.sql index cd05dcb7a0401fc5c6cb2882b06f091fc1e065ac..327be5d3851791e92a489e5895a9d6f70e7c0735 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.history.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.history.sql @@ -9,6 +9,8 @@ create table ACT_HI_PROCINST ( START_USER_ID_ varchar(255), START_ACT_ID_ varchar(255), END_ACT_ID_ varchar(255), + SUPER_PROCESS_INSTANCE_ID_ varchar(64), + DELETE_REASON_ varchar(4000), primary key (ID_), unique (PROC_INST_ID_), unique ACT_UNIQ_HI_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) @@ -20,6 +22,8 @@ create table ACT_HI_ACTINST ( PROC_INST_ID_ varchar(64) not null, EXECUTION_ID_ varchar(64) not null, ACT_ID_ varchar(255) not null, + TASK_ID_ varchar(64), + CALL_PROC_INST_ID_ varchar(64), ACT_NAME_ varchar(255), ACT_TYPE_ varchar(255) not null, ASSIGNEE_ varchar(64), @@ -38,8 +42,8 @@ create table ACT_HI_TASKINST ( NAME_ varchar(255), PARENT_TASK_ID_ varchar(64), DESCRIPTION_ varchar(4000), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), + OWNER_ varchar(255), + ASSIGNEE_ varchar(255), START_TIME_ datetime not null, END_TIME_ datetime, DURATION_ bigint, @@ -49,11 +53,27 @@ create table ACT_HI_TASKINST ( primary key (ID_) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; +create table ACT_HI_VARINST ( + ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), + TASK_ID_ varchar(64), + NAME_ varchar(255) not null, + VAR_TYPE_ varchar(100), + REV_ integer, + BYTEARRAY_ID_ varchar(64), + DOUBLE_ double, + LONG_ bigint, + TEXT_ varchar(4000), + TEXT2_ varchar(4000), + primary key (ID_) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; + create table ACT_HI_DETAIL ( ID_ varchar(64) not null, TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), TASK_ID_ varchar(64), ACT_INST_ID_ varchar(64), NAME_ varchar(255) not null, @@ -102,4 +122,8 @@ create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); \ No newline at end of file +create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); +create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_); +create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); +create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); +create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.identity.sql similarity index 100% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.identity.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.mysql.create.identity.sql diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.engine.sql similarity index 75% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.engine.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.engine.sql index fac6c87f38a7c77ad767d4708741863c85ef8470..f78f954896520e237ed4fd18d4e1e3fe66350b77 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.engine.sql @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY ( ); insert into ACT_GE_PROPERTY -values ('schema.version', '5.6', 1); +values ('schema.version', '5.11-SNAPSHOT', 1); insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.6)', 1); +values ('schema.history', 'create(5.11-SNAPSHOT)', 1); insert into ACT_GE_PROPERTY values ('next.dbid', '1', 1); @@ -20,12 +20,14 @@ create table ACT_GE_BYTEARRAY ( NAME_ NVARCHAR2(255), DEPLOYMENT_ID_ NVARCHAR2(64), BYTES_ BLOB, + GENERATED_ NUMBER(1,0) CHECK (GENERATED_ IN (1,0)), primary key (ID_) ); create table ACT_RE_DEPLOYMENT ( ID_ NVARCHAR2(64), NAME_ NVARCHAR2(255), + CATEGORY_ NVARCHAR2(255), DEPLOY_TIME_ TIMESTAMP(6), primary key (ID_) ); @@ -42,6 +44,9 @@ create table ACT_RU_EXECUTION ( IS_ACTIVE_ NUMBER(1,0) CHECK (IS_ACTIVE_ IN (1,0)), IS_CONCURRENT_ NUMBER(1,0) CHECK (IS_CONCURRENT_ IN (1,0)), IS_SCOPE_ NUMBER(1,0) CHECK (IS_SCOPE_ IN (1,0)), + IS_EVENT_SCOPE_ NUMBER(1,0) CHECK (IS_EVENT_SCOPE_ IN (1,0)), + SUSPENSION_STATE_ INTEGER, + CACHED_ENT_STATE_ INTEGER, primary key (ID_) ); @@ -65,15 +70,18 @@ create table ACT_RU_JOB ( ); create table ACT_RE_PROCDEF ( - ID_ NVARCHAR2(64), + ID_ NVARCHAR2(64) NOT NULL, + REV_ INTEGER, CATEGORY_ NVARCHAR2(255), NAME_ NVARCHAR2(255), - KEY_ NVARCHAR2(255), - VERSION_ INTEGER, + KEY_ NVARCHAR2(255) NOT NULL, + VERSION_ INTEGER NOT NULL, DEPLOYMENT_ID_ NVARCHAR2(64), RESOURCE_NAME_ NVARCHAR2(2000), DGRM_RESOURCE_NAME_ varchar(4000), + DESCRIPTION_ NVARCHAR2(2000), HAS_START_FORM_KEY_ NUMBER(1,0) CHECK (HAS_START_FORM_KEY_ IN (1,0)), + SUSPENSION_STATE_ INTEGER, primary key (ID_) ); @@ -87,8 +95,8 @@ create table ACT_RU_TASK ( PARENT_TASK_ID_ NVARCHAR2(64), DESCRIPTION_ NVARCHAR2(2000), TASK_DEF_KEY_ NVARCHAR2(255), - OWNER_ NVARCHAR2(64), - ASSIGNEE_ NVARCHAR2(64), + OWNER_ NVARCHAR2(255), + ASSIGNEE_ NVARCHAR2(255), DELEGATION_ NVARCHAR2(64), PRIORITY_ INTEGER, CREATE_TIME_ TIMESTAMP(6), @@ -99,10 +107,11 @@ create table ACT_RU_TASK ( create table ACT_RU_IDENTITYLINK ( ID_ NVARCHAR2(64), REV_ INTEGER, - GROUP_ID_ NVARCHAR2(64), + GROUP_ID_ NVARCHAR2(255), TYPE_ NVARCHAR2(255), - USER_ID_ NVARCHAR2(64), + USER_ID_ NVARCHAR2(255), TASK_ID_ NVARCHAR2(64), + PROC_DEF_ID_ NVARCHAR2(64), primary key (ID_) ); @@ -122,10 +131,25 @@ create table ACT_RU_VARIABLE ( primary key (ID_) ); +create table ACT_RU_EVENT_SUBSCR ( + ID_ NVARCHAR2(64) not null, + REV_ integer, + EVENT_TYPE_ NVARCHAR2(255) not null, + EVENT_NAME_ NVARCHAR2(255), + EXECUTION_ID_ NVARCHAR2(64), + PROC_INST_ID_ NVARCHAR2(64), + ACTIVITY_ID_ NVARCHAR2(64), + CONFIGURATION_ NVARCHAR2(255), + CREATED_ TIMESTAMP(6) not null, + primary key (ID_) +); + create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); +create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_); +create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_); create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); alter table ACT_GE_BYTEARRAY @@ -133,6 +157,10 @@ alter table ACT_GE_BYTEARRAY foreign key (DEPLOYMENT_ID_) references ACT_RE_DEPLOYMENT (ID_); +alter table ACT_RE_PROCDEF + add constraint ACT_UNIQ_PROCDEF + unique (KEY_,VERSION_); + create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_PROCINST @@ -150,13 +178,25 @@ alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_SUPER foreign key (SUPER_EXEC_) references ACT_RU_EXECUTION (ID_); + +create index ACT_IDX_EXE_PROCDEF on ACT_RU_EXECUTION(PROC_DEF_ID_); +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); alter table ACT_RU_IDENTITYLINK add constraint ACT_FK_TSKASS_TASK foreign key (TASK_ID_) references ACT_RU_TASK (ID_); - + +create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_); +alter table ACT_RU_IDENTITYLINK + add constraint ACT_FK_ATHRZ_PROCEDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); alter table ACT_RU_TASK add constraint ACT_FK_TASK_EXE @@ -199,6 +239,12 @@ alter table ACT_RU_JOB foreign key (EXCEPTION_STACK_ID_) references ACT_GE_BYTEARRAY (ID_); +create index ACT_IDX_EVENT_SUBSCR on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_); +alter table ACT_RU_EVENT_SUBSCR + add constraint ACT_FK_EVENT_EXEC + foreign key (EXECUTION_ID_) + references ACT_RU_EXECUTION(ID_); + -- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.history.sql similarity index 76% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.history.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.history.sql index 623e4ef0387b97662755bbfc7a0ef3dc5ff1cc64..f30d8ca9897c275c59d992510a44a04eb391edb1 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.history.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.history.sql @@ -9,6 +9,8 @@ create table ACT_HI_PROCINST ( START_USER_ID_ NVARCHAR2(255), START_ACT_ID_ NVARCHAR2(255), END_ACT_ID_ NVARCHAR2(255), + SUPER_PROCESS_INSTANCE_ID_ NVARCHAR2(64), + DELETE_REASON_ NVARCHAR2(2000), primary key (ID_), unique (PROC_INST_ID_) ); @@ -19,6 +21,8 @@ create table ACT_HI_ACTINST ( PROC_INST_ID_ NVARCHAR2(64) not null, EXECUTION_ID_ NVARCHAR2(64) not null, ACT_ID_ NVARCHAR2(255) not null, + TASK_ID_ NVARCHAR2(64), + CALL_PROC_INST_ID_ NVARCHAR2(64), ACT_NAME_ NVARCHAR2(255), ACT_TYPE_ NVARCHAR2(255) not null, ASSIGNEE_ NVARCHAR2(64), @@ -37,8 +41,8 @@ create table ACT_HI_TASKINST ( PARENT_TASK_ID_ NVARCHAR2(64), NAME_ NVARCHAR2(255), DESCRIPTION_ NVARCHAR2(2000), - OWNER_ NVARCHAR2(64), - ASSIGNEE_ NVARCHAR2(64), + OWNER_ NVARCHAR2(255), + ASSIGNEE_ NVARCHAR2(255), START_TIME_ TIMESTAMP(6) not null, END_TIME_ TIMESTAMP(6), DURATION_ NUMBER(19,0), @@ -48,11 +52,27 @@ create table ACT_HI_TASKINST ( primary key (ID_) ); +create table ACT_HI_VARINST ( + ID_ NVARCHAR2(64) not null, + PROC_INST_ID_ NVARCHAR2(64), + EXECUTION_ID_ NVARCHAR2(64), + TASK_ID_ NVARCHAR2(64), + NAME_ NVARCHAR2(255) not null, + VAR_TYPE_ NVARCHAR2(100), + REV_ INTEGER, + BYTEARRAY_ID_ NVARCHAR2(64), + DOUBLE_ NUMBER(*,10), + LONG_ NUMBER(19,0), + TEXT_ NVARCHAR2(2000), + TEXT2_ NVARCHAR2(2000), + primary key (ID_) +); + create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, + ID_ NVARCHAR2(64) not null, TYPE_ NVARCHAR2(255) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, + PROC_INST_ID_ NVARCHAR2(64), + EXECUTION_ID_ NVARCHAR2(64), TASK_ID_ NVARCHAR2(64), ACT_INST_ID_ NVARCHAR2(64), NAME_ NVARCHAR2(255) not null, @@ -102,8 +122,13 @@ create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); +create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_); +create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); +create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); -- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); + +create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.identity.sql similarity index 100% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.identity.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.oracle.create.identity.sql diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.engine.sql similarity index 72% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.engine.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.engine.sql index 38d069466be54036abae34d1c5e02093b293cd33..fb580e1169331d8649b898a7c017809850b37f60 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.engine.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.engine.sql @@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY ( ); insert into ACT_GE_PROPERTY -values ('schema.version', '5.6', 1); +values ('schema.version', '5.11-SNAPSHOT', 1); insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.6)', 1); +values ('schema.history', 'create(5.11-SNAPSHOT)', 1); insert into ACT_GE_PROPERTY values ('next.dbid', '1', 1); @@ -20,12 +20,14 @@ create table ACT_GE_BYTEARRAY ( NAME_ varchar(255), DEPLOYMENT_ID_ varchar(64), BYTES_ bytea, + GENERATED_ boolean, primary key (ID_) ); create table ACT_RE_DEPLOYMENT ( ID_ varchar(64), NAME_ varchar(255), + CATEGORY_ varchar(255), DEPLOY_TIME_ timestamp, primary key (ID_) ); @@ -42,6 +44,9 @@ create table ACT_RU_EXECUTION ( IS_ACTIVE_ boolean, IS_CONCURRENT_ boolean, IS_SCOPE_ boolean, + IS_EVENT_SCOPE_ boolean, + SUSPENSION_STATE_ integer, + CACHED_ENT_STATE_ integer, primary key (ID_), unique (PROC_DEF_ID_, BUSINESS_KEY_) ); @@ -66,15 +71,18 @@ create table ACT_RU_JOB ( ); create table ACT_RE_PROCDEF ( - ID_ varchar(64), + ID_ varchar(64) NOT NULL, + REV_ integer, CATEGORY_ varchar(255), NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, + KEY_ varchar(255) NOT NULL, + VERSION_ integer NOT NULL, DEPLOYMENT_ID_ varchar(64), RESOURCE_NAME_ varchar(4000), DGRM_RESOURCE_NAME_ varchar(4000), + DESCRIPTION_ varchar(4000), HAS_START_FORM_KEY_ boolean, + SUSPENSION_STATE_ integer, primary key (ID_) ); @@ -88,8 +96,8 @@ create table ACT_RU_TASK ( PARENT_TASK_ID_ varchar(64), DESCRIPTION_ varchar(4000), TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), + OWNER_ varchar(255), + ASSIGNEE_ varchar(255), DELEGATION_ varchar(64), PRIORITY_ integer, CREATE_TIME_ timestamp, @@ -100,10 +108,11 @@ create table ACT_RU_TASK ( create table ACT_RU_IDENTITYLINK ( ID_ varchar(64), REV_ integer, - GROUP_ID_ varchar(64), + GROUP_ID_ varchar(255), TYPE_ varchar(255), - USER_ID_ varchar(64), + USER_ID_ varchar(255), TASK_ID_ varchar(64), + PROC_DEF_ID_ varchar (64), primary key (ID_) ); @@ -123,10 +132,25 @@ create table ACT_RU_VARIABLE ( primary key (ID_) ); +create table ACT_RU_EVENT_SUBSCR ( + ID_ varchar(64) not null, + REV_ integer, + EVENT_TYPE_ varchar(255) not null, + EVENT_NAME_ varchar(255), + EXECUTION_ID_ varchar(64), + PROC_INST_ID_ varchar(64), + ACTIVITY_ID_ varchar(64), + CONFIGURATION_ varchar(255), + CREATED_ timestamp not null, + primary key (ID_) +); + create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); +create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_); +create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_); create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); alter table ACT_GE_BYTEARRAY @@ -134,6 +158,10 @@ alter table ACT_GE_BYTEARRAY foreign key (DEPLOYMENT_ID_) references ACT_RE_DEPLOYMENT (ID_); +alter table ACT_RE_PROCDEF + add constraint ACT_UNIQ_PROCDEF + unique (KEY_,VERSION_); + create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); alter table ACT_RU_EXECUTION add constraint ACT_FK_EXE_PROCINST @@ -152,12 +180,25 @@ alter table ACT_RU_EXECUTION foreign key (SUPER_EXEC_) references ACT_RU_EXECUTION (ID_); +create index ACT_IDX_EXE_PROCDEF on ACT_RU_EXECUTION(PROC_DEF_ID_); +alter table ACT_RU_EXECUTION + add constraint ACT_FK_EXE_PROCDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + + create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); alter table ACT_RU_IDENTITYLINK add constraint ACT_FK_TSKASS_TASK foreign key (TASK_ID_) references ACT_RU_TASK (ID_); +create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_); +alter table ACT_RU_IDENTITYLINK + add constraint ACT_FK_ATHRZ_PROCEDEF + foreign key (PROC_DEF_ID_) + references ACT_RE_PROCDEF (ID_); + create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); alter table ACT_RU_TASK add constraint ACT_FK_TASK_EXE @@ -198,4 +239,10 @@ create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); alter table ACT_RU_JOB add constraint ACT_FK_JOB_EXCEPTION foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file + references ACT_GE_BYTEARRAY (ID_); + +create index ACT_IDX_EVENT_SUBSCR on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_); +alter table ACT_RU_EVENT_SUBSCR + add constraint ACT_FK_EVENT_EXEC + foreign key (EXECUTION_ID_) + references ACT_RU_EXECUTION(ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.history.sql similarity index 71% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.history.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.history.sql index 3040421423e6c0f560bc73eef7b2dc038d93a2d3..4d3201bddb02e435c400eddce81cd2f6d0504575 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.history.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.history.sql @@ -9,6 +9,8 @@ create table ACT_HI_PROCINST ( START_USER_ID_ varchar(255), START_ACT_ID_ varchar(255), END_ACT_ID_ varchar(255), + SUPER_PROCESS_INSTANCE_ID_ varchar(64), + DELETE_REASON_ varchar(4000), primary key (ID_), unique (PROC_INST_ID_), unique (PROC_DEF_ID_, BUSINESS_KEY_) @@ -20,6 +22,8 @@ create table ACT_HI_ACTINST ( PROC_INST_ID_ varchar(64) not null, EXECUTION_ID_ varchar(64) not null, ACT_ID_ varchar(255) not null, + TASK_ID_ varchar(64), + CALL_PROC_INST_ID_ varchar(64), ACT_NAME_ varchar(255), ACT_TYPE_ varchar(255) not null, ASSIGNEE_ varchar(64), @@ -38,8 +42,8 @@ create table ACT_HI_TASKINST ( NAME_ varchar(255), PARENT_TASK_ID_ varchar(64), DESCRIPTION_ varchar(4000), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), + OWNER_ varchar(255), + ASSIGNEE_ varchar(255), START_TIME_ timestamp not null, END_TIME_ timestamp, DURATION_ bigint, @@ -49,11 +53,27 @@ create table ACT_HI_TASKINST ( primary key (ID_) ); +create table ACT_HI_VARINST ( + ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), + TASK_ID_ varchar(64), + NAME_ varchar(255) not null, + VAR_TYPE_ varchar(100), + REV_ integer, + BYTEARRAY_ID_ varchar(64), + DOUBLE_ double precision, + LONG_ bigint, + TEXT_ varchar(4000), + TEXT2_ varchar(4000), + primary key (ID_) +); + create table ACT_HI_DETAIL ( ID_ varchar(64) not null, TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, + PROC_INST_ID_ varchar(64), + EXECUTION_ID_ varchar(64), TASK_ID_ varchar(64), ACT_INST_ID_ varchar(64), NAME_ varchar(255) not null, @@ -103,4 +123,8 @@ create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); \ No newline at end of file +create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); +create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_); +create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_); +create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_); +create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.identity.sql similarity index 100% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.identity.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/create/activiti.postgres.create.identity.sql diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/data/mysql.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/data/mysql.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..15a93386c8a1933f3c160747b17ecf81c4ce8b9b --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/data/mysql.data.sql @@ -0,0 +1,588 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, CATEGORY_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', null, '2012-11-13 16:42:38'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', 0x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3eaa3c646566696e6974696f6e732069643d227461736b41737369676e65654578616d706c652220a20202020202020202020202020786d6c6e733d22687474703a2f2f7777772e6f6d672e6f72672f737065632f42504d4e2f32303130303532342f4d4f44454c22a20202020202020202020202020786d6c6e733a61637469766974693d22687474703a2f2f61637469766974692e6f72672f62706d6e22a202020202020202020202020207461726765744e616d6573706163653d2255706772616465223ea2020a20203c70726f636573732069643d2273696d706c655461736b50726f63657373223ea2020a202020203c73746172744576656e742069643d227374617274222f3ea20202020a202020203c73657175656e6365466c6f772069643d22666c6f77312220736f757263655265663d22737461727422207461726765745265663d2273696d706c655461736b3122202f3eaa202020203c757365725461736b2069643d2273696d706c655461736b3122206e616d653d2273696d706c655461736b222061637469766974693a61737369676e65653d226b65726d6974222f3ea20202020a202020203c73657175656e6365466c6f772069643d22666c6f77322220736f757263655265663d2273696d706c655461736b3122207461726765745265663d2273696d706c655461736b3222202f3ea20202020a202020203c757365725461736b2069643d2273696d706c655461736b3222206e616d653d2273696d706c655461736b32222061637469766974693a61737369676e65653d227377656469736863686566223ea2020202020203c646f63756d656e746174696f6e3e73706963792073617563653c2f646f63756d656e746174696f6e3ea202020203c2f757365725461736b3ea20202020a202020203c73657175656e6365466c6f772069643d22666c6f77332220736f757263655265663d2273696d706c655461736b3222207461726765745265663d2273696d706c655461736b3322202f3ea20202020a202020203c757365725461736b2069643d2273696d706c655461736b3322206e616d653d2273696d706c655461736b3322202f3ea20202020a202020203c73657175656e6365466c6f772069643d22666c6f77342220736f757263655265663d2273696d706c655461736b3322207461726765745265663d22656e6422202f3ea20202020a202020203c656e644576656e742069643d22656e6422202f3ea20202020a20203c2f70726f636573733eaa3c2f646566696e6974696f6e733e, '1', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, DESCRIPTION_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-13 16:42:38', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + TASK_ID_, + CALL_PROC_INST_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + null, + null, + 'startEvent', + null, + '2012-11-13 16:42:38', + '2012-11-13 16:42:38', + 4 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + TASK_ID_, + CALL_PROC_INST_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + '7', + null, + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-13 16:42:38', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-13 16:42:38', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-13 16:42:38', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + TASK_ID_, + CALL_PROC_INST_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + '9', + null, + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-13 16:42:39', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-13 16:42:39', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-13 16:42:39', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-13 16:42:39', + DURATION_ = 1055, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-13 16:42:39', + DURATION_ = 1064 + where ID_ = '6'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + IS_EVENT_SCOPE_ = false, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1, + CACHED_ENT_STATE_ = 2 + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7' and REV_ = 1; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, CATEGORY_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', null, '2012-11-13 16:42:39'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', 0x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3eaa3c646566696e6974696f6e732069643d227461736b41737369676e65654578616d706c652220a20202020202020202020202020786d6c6e733d22687474703a2f2f7777772e6f6d672e6f72672f737065632f42504d4e2f32303130303532342f4d4f44454c22a20202020202020202020202020786d6c6e733a61637469766974693d22687474703a2f2f61637469766974692e6f72672f62706d6e22a202020202020202020202020207461726765744e616d6573706163653d2255706772616465223ea2020a20203c70726f636573732069643d227461736b57697468457865637574696f6e5661726961626c657350726f63657373223ea2020a202020203c73746172744576656e742069643d227374617274222f3ea20202020a202020203c73657175656e6365466c6f772069643d22666c6f77312220736f757263655265663d22737461727422207461726765745265663d227461736b57697468457865637574696f6e5661726961626c657322202f3eaa202020203c757365725461736b2069643d227461736b57697468457865637574696f6e5661726961626c657322206e616d653d227461736b57697468457865637574696f6e5661726961626c657322202f3ea20202020a202020203c73657175656e6365466c6f772069643d22666c6f77322220736f757263655265663d227461736b57697468457865637574696f6e5661726961626c657322207461726765745265663d22656e6422202f3ea20202020a202020203c656e644576656e742069643d22656e6422202f3ea20202020a20203c2f70726f636573733eaa3c2f646566696e6974696f6e733e, '10', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, DESCRIPTION_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-13 16:42:39', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + TASK_ID_, + CALL_PROC_INST_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + null, + null, + 'startEvent', + null, + '2012-11-13 16:42:39', + '2012-11-13 16:42:39', + 0 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-13 16:42:39', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_VARINST (ID_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + '13', + '13', + null, + 'player', + 0, + 'string', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-13 16:42:39', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_VARINST (ID_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + '13', + '13', + null, + 'instrument', + 0, + 'string', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + TASK_ID_, + CALL_PROC_INST_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + '20', + null, + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-13 16:42:39', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-13 16:42:39', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-13 16:42:39', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/data/oracle.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/data/oracle.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..7836a4235cf26cdd6efe0eae94d60968e7e61d35 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/data/oracle.data.sql @@ -0,0 +1,534 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', to_timestamp('2012-11-21 09:07:04.612', 'YYYY-MM-DD HH:MI:SS.FFF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '1', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + to_timestamp('2012-11-21 09:07:05.287', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 09:07:05.288', 'YYYY-MM-DD HH:MI:SS.FFF'), + to_timestamp('2012-11-21 09:07:05.294', 'YYYY-MM-DD HH:MI:SS.FFF'), + 6 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + to_timestamp('2012-11-21 09:07:05.295', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + to_timestamp('2012-11-21 09:07:05.295', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + to_timestamp('2012-11-21 09:07:05.295', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + to_timestamp('2012-11-21 09:07:06.192', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + to_timestamp('2012-11-21 09:07:06.193', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + to_timestamp('2012-11-21 09:07:06.193', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + IS_EVENT_SCOPE_ = false, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1, + CACHED_ENT_STATE_ = 2 + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 09:07:06.192', 'YYYY-MM-DD HH:MI:SS.FFF'), + DURATION_ = 897 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 09:07:06.090', 'YYYY-MM-DD HH:MI:SS.FFF'), + DURATION_ = 795, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', to_timestamp('2012-11-21 09:07:06.796', 'YYYY-MM-DD HH:MI:SS.FFF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '10', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_, CACHED_ENT_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + false, + null, + null, + 1, + 2 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + to_timestamp('2012-11-21 09:07:07.065', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 09:07:07.065', 'YYYY-MM-DD HH:MI:SS.FFF'), + to_timestamp('2012-11-21 09:07:07.066', 'YYYY-MM-DD HH:MI:SS.FFF'), + 1 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + to_timestamp('2012-11-21 09:07:07.065', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + to_timestamp('2012-11-21 09:07:07.065', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + to_timestamp('2012-11-21 09:07:07.066', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + to_timestamp('2012-11-21 09:07:07.066', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + to_timestamp('2012-11-21 09:07:07.066', 'YYYY-MM-DD HH:MI:SS.FFF'), + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.db2.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.db2.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..b560a9d5fb331bcca2444ff36550223fbf4bc4b8 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.db2.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY; +drop index ACT_IDX_TASK_CREATE; +drop index ACT_IDX_IDENT_LNK_USER; +drop index ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_IDX_VARIABLE_TASK_ID; + +alter table ACT_GE_BYTEARRAY + drop foreign key ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop foreign key ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop foreign key ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + +drop table ACT_GE_PROPERTY; +drop table ACT_GE_BYTEARRAY; +drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; +drop table ACT_RU_VARIABLE; +drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_TASK; +drop table ACT_RU_EXECUTION; +drop table ACT_RU_JOB; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.db2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.db2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.db2.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.db2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.db2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3f62284e91860884790d0082da24806977886eb1 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.db2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.h2.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.h2.drop.engine.sql similarity index 62% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.h2.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.h2.drop.engine.sql index 256fe5c87ada4951a01ff2b6c61f2db14915711a..ef00e7be1b0520cffbbf34253ee9f159155bc465 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.h2.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.h2.drop.engine.sql @@ -2,14 +2,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; @@ -23,21 +16,18 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - alter table ACT_RU_EXECUTION - drop constraint ACT_UNIQ_RU_BUS_KEY; - -alter table ACT_HI_PROCINST - drop constraint ACT_UNIQ_HI_BUS_KEY; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_UNIQ_RU_BUS_KEY; + alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; - + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; @@ -59,19 +49,22 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop constraint ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + drop table ACT_GE_PROPERTY if exists; drop table ACT_GE_BYTEARRAY if exists; drop table ACT_RE_DEPLOYMENT if exists; drop table ACT_RU_EXECUTION if exists; -drop table ACT_ID_GROUP if exists; -drop table ACT_ID_MEMBERSHIP if exists; -drop table ACT_ID_USER if exists; drop table ACT_RU_JOB if exists; drop table ACT_RE_PROCDEF if exists; drop table ACT_RU_TASK if exists; drop table ACT_RU_IDENTITYLINK if exists; drop table ACT_RU_VARIABLE if exists; -drop table ACT_HI_PROCINST if exists; -drop table ACT_HI_ACTINST if exists; -drop table ACT_HI_TASKINST if exists; -drop table ACT_HI_DETAIL if exists; +drop table ACT_RU_EVENT_SUBSCR if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.h2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.h2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..936591335ea20d3541a1869460ca7fe591b7daeb --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.h2.drop.history.sql @@ -0,0 +1,23 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +alter table ACT_HI_PROCINST + drop constraint ACT_UNIQ_HI_BUS_KEY; + +drop table ACT_HI_PROCINST if exists; +drop table ACT_HI_ACTINST if exists; +drop table ACT_HI_VARINST if exists; +drop table ACT_HI_TASKINST if exists; +drop table ACT_HI_DETAIL if exists; +drop table ACT_HI_COMMENT if exists; +drop table ACT_HI_ATTACHMENT if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.h2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.h2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..8290d1d16811b7d0fd03b15139f781f76ed35a2d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.h2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO if exists; +drop table ACT_ID_GROUP if exists; +drop table ACT_ID_MEMBERSHIP if exists; +drop table ACT_ID_USER if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mssql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mssql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..4e3ee2e43f12bc0edeceb038e0ae1e44d7e4c889 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mssql.drop.engine.sql @@ -0,0 +1,61 @@ +drop index ACT_RU_EXECUTION.ACT_IDX_EXEC_BUSKEY; +drop index ACT_RU_TASK.ACT_IDX_TASK_CREATE; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_USER; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_RU_VARIABLE.ACT_IDX_VARIABLE_TASK_ID; +drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_CONFIG_; + +alter table ACT_GE_BYTEARRAY + drop constraint ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_SUPER; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop constraint ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +drop index ACT_RU_IDENTITYLINK.ACT_IDX_ATHRZ_PROCEDEF; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_PROPERTY') drop table ACT_GE_PROPERTY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_BYTEARRAY') drop table ACT_GE_BYTEARRAY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_PROCDEF') drop table ACT_RE_PROCDEF; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_DEPLOYMENT') drop table ACT_RE_DEPLOYMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_IDENTITYLINK') drop table ACT_RU_IDENTITYLINK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TASK') drop table ACT_RU_TASK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') drop table ACT_RU_VARIABLE; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXECUTION') drop table ACT_RU_EXECUTION; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EVENT_SUBSCR') drop table ACT_RU_EVENT_SUBSCR; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') drop table ACT_RU_JOB; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mssql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mssql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..486b61f9c68e0ca595f67c64869753bbe2bb7933 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mssql.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_INST_END; +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_START; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_END; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TIME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_NAME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_PROCINST') drop table ACT_HI_PROCINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ACTINST') drop table ACT_HI_ACTINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_VARINST') drop table ACT_HI_VARINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_TASKINST') drop table ACT_HI_TASKINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_DETAIL') drop table ACT_HI_DETAIL; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_COMMENT') drop table ACT_HI_COMMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ATTACHMENT') drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mssql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mssql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..baf49c6f41ca8948ad9addeec7f2def9370fc14d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mssql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_INFO') drop table ACT_ID_INFO; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_MEMBERSHIP') drop table ACT_ID_MEMBERSHIP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_GROUP') drop table ACT_ID_GROUP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_USER') drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mysql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mysql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..d860130536eb7c3ffab6f3f6632f607d76943300 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mysql.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; +drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; +drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE; + +alter table ACT_GE_BYTEARRAY + drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop FOREIGN KEY ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR; + +drop table if exists ACT_GE_PROPERTY; +drop table if exists ACT_RU_VARIABLE; +drop table if exists ACT_GE_BYTEARRAY; +drop table if exists ACT_RE_DEPLOYMENT; +drop table if exists ACT_RU_IDENTITYLINK; +drop table if exists ACT_RU_TASK; +drop table if exists ACT_RE_PROCDEF; +drop table if exists ACT_RU_EXECUTION; +drop table if exists ACT_RU_JOB; +drop table if exists ACT_RU_EVENT_SUBSCR; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mysql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mysql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..4acf18eaac067552d0e77926cc03285a1737303d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mysql.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; +drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; +drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; +drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; +drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL; +drop index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST; +drop index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST; + +drop table if exists ACT_HI_PROCINST; +drop table if exists ACT_HI_ACTINST; +drop table if exists ACT_HI_VARINST; +drop table if exists ACT_HI_TASKINST; +drop table if exists ACT_HI_DETAIL; +drop table if exists ACT_HI_COMMENT; +drop table if exists ACT_HI_ATTACHMENT; + \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mysql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mysql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3b404c4db48bf4fe75817d7112e6873aca90b998 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.mysql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_USER; + +drop table if exists ACT_ID_INFO; +drop table if exists ACT_ID_MEMBERSHIP; +drop table if exists ACT_ID_GROUP; +drop table if exists ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.oracle.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.oracle.drop.engine.sql similarity index 63% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.oracle.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.oracle.drop.engine.sql index 94cc9bee4a73871453850f088e5f8238b7f16ff8..2f4c52a1a294a0ae71981c1438413737f82e8758 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.oracle.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.oracle.drop.engine.sql @@ -1,9 +1,7 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; +drop index ACT_IDX_BYTEAR_DEPL; +drop index ACT_IDX_EXE_PROCINST; +drop index ACT_IDX_EXE_PARENT; drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; drop index ACT_IDX_TSKASS_TASK; drop index ACT_IDX_TASK_EXEC; drop index ACT_IDX_TASK_PROCINST; @@ -17,14 +15,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop CONSTRAINT ACT_FK_BYTEARR_DEPL; @@ -37,16 +28,16 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop CONSTRAINT ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_USER; + +alter table ACT_RU_EXECUTION + drop CONSTRAINT ACT_FK_EXE_PROCDEF; alter table ACT_RU_IDENTITYLINK drop CONSTRAINT ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK + drop CONSTRAINT ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop CONSTRAINT ACT_FK_TASK_EXE; @@ -67,20 +58,24 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop CONSTRAINT ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop CONSTRAINT ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; drop table ACT_GE_PROPERTY; -drop table ACT_RU_VARIABLE; drop table ACT_GE_BYTEARRAY; drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_VARIABLE; drop table ACT_RU_TASK; -drop table ACT_RE_PROCDEF; drop table ACT_RU_EXECUTION; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_GROUP; -drop table ACT_ID_USER; drop table ACT_RU_JOB; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; \ No newline at end of file +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.oracle.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.oracle.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..284ae4af9f368b75b361315801a216b3a981c6ed --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.oracle.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.oracle.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.oracle.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..f54f10c642b4600eddab5922d037443ac13717c7 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.oracle.drop.identity.sql @@ -0,0 +1,13 @@ +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_USER; + +drop index ACT_IDX_MEMB_GROUP; +drop index ACT_IDX_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.postgres.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.postgres.drop.engine.sql similarity index 70% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.postgres.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.postgres.drop.engine.sql index 51111fea940251dbf93c3eebb66cadc9bd973da9..c69c43343eb8df18d55c9b0c3edac49c6b1e9676 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.postgres.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.postgres.drop.engine.sql @@ -17,14 +17,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; @@ -37,16 +30,16 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; @@ -68,19 +61,23 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; + drop table ACT_GE_PROPERTY; drop table ACT_GE_BYTEARRAY; drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; drop table ACT_RU_EXECUTION; -drop table ACT_ID_GROUP; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_USER; drop table ACT_RU_JOB; -drop table ACT_RE_PROCDEF; drop table ACT_RU_TASK; drop table ACT_RU_IDENTITYLINK; drop table ACT_RU_VARIABLE; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.postgres.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.postgres.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.postgres.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.postgres.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.postgres.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..10ca22af87a7659a398cb616e113ae9f7ac97e2c --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.11/drop/activiti.postgres.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_GROUP; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_USER; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.h2.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.h2.create.sql deleted file mode 100644 index 23506440a8467ffb30150d1fd401e6f722f700fa..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.h2.create.sql +++ /dev/null @@ -1,299 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.2', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.2)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ longvarbinary, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ bit, - IS_CONCURRENT_ bit, - IS_SCOPE_ bit, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ bit, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_UNIQ_RU_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); - -alter table ACT_HI_PROCINST - add constraint ACT_UNIQ_HI_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP; - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER; - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY; - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.mssql.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.mssql.create.sql deleted file mode 100644 index ad6914f639667f8875a08eb9dc0c154c00a90377..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.mssql.create.sql +++ /dev/null @@ -1,288 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ nvarchar(64), - VALUE_ nvarchar(300), - REV_ int, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.1', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.1)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ nvarchar(64), - REV_ int, - NAME_ nvarchar(255), - DEPLOYMENT_ID_ nvarchar(64), - BYTES_ image, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ nvarchar(64), - NAME_ nvarchar(255), - DEPLOY_TIME_ datetime, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ nvarchar(64), - REV_ int, - PROC_INST_ID_ nvarchar(64), - BUSINESS_KEY_ nvarchar(255), - PARENT_ID_ nvarchar(64), - PROC_DEF_ID_ nvarchar(64), - SUPER_EXEC_ nvarchar(64), - ACT_ID_ nvarchar(255), - IS_ACTIVE_ tinyint, - IS_CONCURRENT_ tinyint, - IS_SCOPE_ tinyint, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ nvarchar(64) NOT NULL, - REV_ int, - TYPE_ nvarchar(255) NOT NULL, - LOCK_EXP_TIME_ datetime, - LOCK_OWNER_ nvarchar(255), - EXCLUSIVE_ bit, - EXECUTION_ID_ nvarchar(64), - PROCESS_INSTANCE_ID_ nvarchar(64), - RETRIES_ int, - EXCEPTION_STACK_ID_ nvarchar(64), - EXCEPTION_MSG_ nvarchar(255), - DUEDATE_ datetime NULL, - REPEAT_ nvarchar(255), - HANDLER_TYPE_ nvarchar(255), - HANDLER_CFG_ nvarchar(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ nvarchar(64), - REV_ int, - NAME_ nvarchar(255), - TYPE_ nvarchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ nvarchar(64), - GROUP_ID_ nvarchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ nvarchar(64), - REV_ int, - FIRST_ nvarchar(255), - LAST_ nvarchar(255), - EMAIL_ nvarchar(255), - PWD_ nvarchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ nvarchar(64), - CATEGORY_ nvarchar(255), - NAME_ nvarchar(255), - KEY_ nvarchar(255), - VERSION_ int, - DEPLOYMENT_ID_ nvarchar(64), - RESOURCE_NAME_ nvarchar(255), - DGRM_RESOURCE_NAME_ nvarchar(255), - HAS_START_FORM_KEY_ tinyint, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ nvarchar(64), - REV_ int, - EXECUTION_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - PROC_DEF_ID_ nvarchar(64), - NAME_ nvarchar(255), - DESCRIPTION_ nvarchar(255), - TASK_DEF_KEY_ nvarchar(255), - ASSIGNEE_ nvarchar(64), - PRIORITY_ int, - CREATE_TIME_ datetime, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ nvarchar(64), - REV_ int, - GROUP_ID_ nvarchar(64), - TYPE_ nvarchar(255), - USER_ID_ nvarchar(64), - TASK_ID_ nvarchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ nvarchar(64) not null, - REV_ int, - TYPE_ nvarchar(255) not null, - NAME_ nvarchar(255) not null, - EXECUTION_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - TASK_ID_ nvarchar(64), - BYTEARRAY_ID_ nvarchar(64), - DOUBLE_ double precision, - LONG_ numeric(19,0), - TEXT_ nvarchar(255), - TEXT2_ nvarchar(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ nvarchar(64) not null, - PROC_INST_ID_ nvarchar(64) not null, - BUSINESS_KEY_ nvarchar(255), - PROC_DEF_ID_ nvarchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - START_USER_ID_ nvarchar(255), - START_ACT_ID_ nvarchar(255), - END_ACT_ID_ nvarchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ nvarchar(64) not null, - PROC_DEF_ID_ nvarchar(64) not null, - PROC_INST_ID_ nvarchar(64) not null, - EXECUTION_ID_ nvarchar(64) not null, - ACT_ID_ nvarchar(255) not null, - ACT_NAME_ nvarchar(255), - ACT_TYPE_ nvarchar(255) not null, - ASSIGNEE_ nvarchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ nvarchar(64) not null, - PROC_DEF_ID_ nvarchar(64), - TASK_DEF_KEY_ nvarchar(255), - PROC_INST_ID_ nvarchar(64), - EXECUTION_ID_ nvarchar(64), - NAME_ nvarchar(255), - DESCRIPTION_ nvarchar(255), - ASSIGNEE_ nvarchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - DELETE_REASON_ nvarchar(255), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ nvarchar(64) not null, - TYPE_ nvarchar(255) not null, - PROC_INST_ID_ nvarchar(64) not null, - EXECUTION_ID_ nvarchar(64) not null, - TASK_ID_ nvarchar(64), - ACT_INST_ID_ nvarchar(64), - NAME_ nvarchar(255) not null, - VAR_TYPE_ nvarchar(255), - REV_ int, - TIME_ datetime not null, - BYTEARRAY_ID_ nvarchar(64), - DOUBLE_ double precision, - LONG_ numeric(19,0), - TEXT_ nvarchar(255), - TEXT2_ nvarchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.mysql.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.mysql.create.sql deleted file mode 100644 index 16fbd68c05ff24b28ed1f3303d17f066646c5fff..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.mysql.create.sql +++ /dev/null @@ -1,293 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.2', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.2)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ LONGBLOB, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ TINYINT, - IS_CONCURRENT_ TINYINT, - IS_SCOPE_ TINYINT, - primary key (ID_), - unique ACT_UNIQ_RU_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp NULL, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ TINYINT, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique ACT_UNIQ_HI_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ datetime not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.oracle.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.oracle.create.sql deleted file mode 100644 index 0ae30432bc78af75550a9d4fd911eeb192338e26..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.oracle.create.sql +++ /dev/null @@ -1,315 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ NVARCHAR2(64), - VALUE_ NVARCHAR2(300), - REV_ INTEGER, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.2', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.2)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - DEPLOYMENT_ID_ NVARCHAR2(64), - BYTES_ BLOB, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DEPLOY_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - PROC_INST_ID_ NVARCHAR2(64), - BUSINESS_KEY_ NVARCHAR2(255), - PARENT_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - SUPER_EXEC_ NVARCHAR2(64), - ACT_ID_ NVARCHAR2(255), - IS_ACTIVE_ NUMBER(1,0) CHECK (IS_ACTIVE_ IN (1,0)), - IS_CONCURRENT_ NUMBER(1,0) CHECK (IS_CONCURRENT_ IN (1,0)), - IS_SCOPE_ NUMBER(1,0) CHECK (IS_SCOPE_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ NVARCHAR2(64) NOT NULL, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) NOT NULL, - LOCK_EXP_TIME_ TIMESTAMP(6), - LOCK_OWNER_ NVARCHAR2(255), - EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)), - EXECUTION_ID_ NVARCHAR2(64), - PROCESS_INSTANCE_ID_ NVARCHAR2(64), - RETRIES_ INTEGER, - EXCEPTION_STACK_ID_ NVARCHAR2(64), - EXCEPTION_MSG_ NVARCHAR2(255), - DUEDATE_ TIMESTAMP(6), - REPEAT_ NVARCHAR2(255), - HANDLER_TYPE_ NVARCHAR2(255), - HANDLER_CFG_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - TYPE_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ NVARCHAR2(64), - GROUP_ID_ NVARCHAR2(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - FIRST_ NVARCHAR2(255), - LAST_ NVARCHAR2(255), - EMAIL_ NVARCHAR2(255), - PWD_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ NVARCHAR2(64), - CATEGORY_ NVARCHAR2(255), - NAME_ NVARCHAR2(255), - KEY_ NVARCHAR2(255), - VERSION_ INTEGER, - DEPLOYMENT_ID_ NVARCHAR2(64), - RESOURCE_NAME_ NVARCHAR2(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ NUMBER(1,0) CHECK (HAS_START_FORM_KEY_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - TASK_DEF_KEY_ NVARCHAR2(255), - ASSIGNEE_ NVARCHAR2(64), - PRIORITY_ INTEGER, - CREATE_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - GROUP_ID_ NVARCHAR2(64), - TYPE_ NVARCHAR2(255), - USER_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ NVARCHAR2(64) not null, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) not null, - NAME_ NVARCHAR2(255) not null, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - BUSINESS_KEY_ NVARCHAR2(255), - PROC_DEF_ID_ NVARCHAR2(64) not null, - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - START_USER_ID_ NVARCHAR2(255), - START_ACT_ID_ NVARCHAR2(255), - END_ACT_ID_ NVARCHAR2(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - ACT_ID_ NVARCHAR2(255) not null, - ACT_NAME_ NVARCHAR2(255), - ACT_TYPE_ NVARCHAR2(255) not null, - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64), - TASK_DEF_KEY_ NVARCHAR2(255), - PROC_INST_ID_ NVARCHAR2(64), - EXECUTION_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - DELETE_REASON_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ NVARCHAR2(255) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - TASK_ID_ NVARCHAR2(64), - ACT_INST_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255) not null, - VAR_TYPE_ NVARCHAR2(64), - REV_ INTEGER, - TIME_ TIMESTAMP(6) not null, - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.postgres.create.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.postgres.create.sql deleted file mode 100644 index 5b789b5e26e7c1e52387b700d76fbaa02ca82e55..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/create/activiti.postgres.create.sql +++ /dev/null @@ -1,307 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.2', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.2)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ bytea, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ boolean, - IS_CONCURRENT_ boolean, - IS_SCOPE_ boolean, - primary key (ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ boolean, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(64), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.mysql.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.mysql.drop.sql deleted file mode 100644 index 908af447abd1f9c9f945dca230d979572d745d96..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.mysql.drop.sql +++ /dev/null @@ -1,73 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; -drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; -drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; -drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; -drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; -drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; -drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; - - -alter table ACT_GE_BYTEARRAY - drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop FOREIGN KEY ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; - - drop table if exists ACT_GE_PROPERTY; - drop table if exists ACT_RU_VARIABLE; - drop table if exists ACT_GE_BYTEARRAY; - drop table if exists ACT_RE_DEPLOYMENT; - drop table if exists ACT_RU_IDENTITYLINK; - drop table if exists ACT_RU_TASK; - drop table if exists ACT_RE_PROCDEF; - drop table if exists ACT_RU_EXECUTION; - drop table if exists ACT_ID_MEMBERSHIP; - drop table if exists ACT_ID_GROUP; - drop table if exists ACT_ID_USER; - drop table if exists ACT_RU_JOB; - drop table if exists ACT_HI_PROCINST; - drop table if exists ACT_HI_ACTINST; - drop table if exists ACT_HI_TASKINST; - drop table if exists ACT_HI_DETAIL; - \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.cycle.sql deleted file mode 100644 index 9bf4ec8fcdea881bd706ea6e5f1d55662ce7ea67..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.cycle.sql +++ /dev/null @@ -1,75 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) not null, - PLUGIN_ID_ varchar(255) not null, - INSTANCE_NAME_ varchar(255) not null, - INSTANCE_ID_ varchar(255) not null, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ varchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) not null, - GROUP_ varchar(255) not null, - KEY_ varchar(255) not null, - VALUE_ varchar(255) not null, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) default null, - SOURCE_ELEMENT_NAME_ varchar(255) default null, - SOURCE_REVISION_ bigint default null, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) default null, - TARGET_ELEMENT_NAME_ varchar(255) default null, - TARGET_REVISION_ bigint default null, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ smallint check(LINKED_BOTH_WAYS_ in (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint default null, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255) not null, - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) not null, - CONNECTOR_ID_ varchar(255) not null, - NODE_ID_ varchar(550) not null, - ELEMENT_ID_ varchar(255) default null, - CONTENT_ varchar(1024) not null, - AUTHOR_ varchar(255), - DATE_ timestamp not null, - ANSWERED_COMMENT_ID_ varchar(255) default null, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.engine.sql deleted file mode 100644 index 920b59eb68e12857278a9b5ba11b4b09d275afb3..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.engine.sql +++ /dev/null @@ -1,187 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64) not null, - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.2-SNAPSHOT', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.2-SNAPSHOT)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64) not null, - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ BLOB, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64) not null, - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64) not null, - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ smallint check(IS_ACTIVE_ in (1,0)), - IS_CONCURRENT_ smallint check(IS_CONCURRENT_ in (1,0)), - IS_SCOPE_ smallint check(IS_SCOPE_ in (1,0)), - UNI_BUSINESS_KEY varchar (255) not null generated always as (case when "BUSINESS_KEY_" is null then "ID_" else "BUSINESS_KEY_" end), - UNI_PROC_DEF_ID varchar (64) not null generated always as (case when "PROC_DEF_ID_" is null then "ID_" else "PROC_DEF_ID_" end), - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)), - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp null, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64) not null, - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ smallint check(HAS_START_FORM_KEY_ in (1,0)), - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64) not null, - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64) not null, - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION(UNI_PROC_DEF_ID, UNI_BUSINESS_KEY); -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.history.sql deleted file mode 100644 index baab032fc5b3f1705d3ff4ba0863d6b41749f32e..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.history.sql +++ /dev/null @@ -1,77 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - UNI_BUSINESS_KEY varchar (255) not null generated always as (case when "BUSINESS_KEY_" is null then "ID_" else "BUSINESS_KEY_" end), - UNI_PROC_DEF_ID varchar (64) not null generated always as (case when "PROC_DEF_ID_" is null then "ID_" else "PROC_DEF_ID_" end), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST(UNI_PROC_DEF_ID, UNI_BUSINESS_KEY); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.identity.sql deleted file mode 100644 index 02ba8897120df4c10d3cfbd260a7af3fabb6da9f..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.db2.create.identity.sql +++ /dev/null @@ -1,33 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64) not null, - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64) not null, - GROUP_ID_ varchar(64) not null, - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64) not null, - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.cycle.sql deleted file mode 100644 index 4d8ca0bdcda7f6e1f7a9c99b764fa62306fd8272..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.cycle.sql +++ /dev/null @@ -1,75 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar NOT NULL, - PLUGIN_ID_ varchar NOT NULL, - INSTANCE_NAME_ varchar NOT NULL, - INSTANCE_ID_ varchar NOT NULL, - USER_ varchar, - GROUP_ varchar, - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar NOT NULL, - GROUP_ varchar NOT NULL, - KEY_ varchar NOT NULL, - VALUE_ varchar, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_ELEMENT_ID_ varchar DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar, - TARGET_ARTIFACT_ID_ varchar, - TARGET_ELEMENT_ID_ varchar DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar, - COMMENT_ varchar, - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar, - GROUP_ID_ varchar, - LINK_TYPE_ varchar, - COMMENT_ varchar, - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar NOT NULL, - NAME_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - ARTIFACT_ID_ varchar NOT NULL, - ALIAS_ varchar DEFAULT NULL, - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - NODE_ID_ varchar NOT NULL, - ELEMENT_ID_ varchar DEFAULT NULL, - CONTENT_ varchar NOT NULL, - AUTHOR_ varchar, - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.engine.sql deleted file mode 100644 index e7a0b0355391ec90b9956198f5b659ca9f1e1fcf..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.engine.sql +++ /dev/null @@ -1,188 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.3', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.3)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ longvarbinary, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ bit, - IS_CONCURRENT_ bit, - IS_SCOPE_ bit, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ bit, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_UNIQ_RU_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY; - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.history.sql deleted file mode 100644 index ff1b41ed3db8281961608ddb1e47426bf905df07..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.history.sql +++ /dev/null @@ -1,78 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - TIME_ timestamp not null, - NAME_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - VAR_TYPE_ varchar(255), - REV_ integer, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -alter table ACT_HI_PROCINST - add constraint ACT_UNIQ_HI_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.identity.sql deleted file mode 100644 index 6ec744bb7c75a0541c6135107c5f570695f13953..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.h2.create.identity.sql +++ /dev/null @@ -1,33 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP; - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.cycle.sql deleted file mode 100644 index 036626feb7d6b837000f01b4bd7d62f859d40704..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.cycle.sql +++ /dev/null @@ -1,63 +0,0 @@ -create table ACT_CY_CONFIG ( - ID_ nvarchar(64), - VALUE_ nvarchar(1024), - REV_ int, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - TARGET_CONNECTOR_ID_ nvarchar(255), - TARGET_ARTIFACT_ID_ nvarchar(550), - TARGET_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - TARGET_REVISION_ numeric(19,0) DEFAULT NULL, - LINK_TYPE_ nvarchar(255) , - COMMENT_ nvarchar(1000), - LINKED_BOTH_WAYS_ bit, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - USER_ID_ nvarchar(255), - GROUP_ID_ nvarchar(255), - LINK_TYPE_ nvarchar(255), - COMMENT_ nvarchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ nvarchar(255), - NAME_ nvarchar(255), - CONNECTOR_ID_ nvarchar(255), - ARTIFACT_ID_ nvarchar(550), - ALIAS_ nvarchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - NODE_ID_ nvarchar(550) NOT NULL, - ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - CONTENT_ nvarchar(1024) NOT NULL, - AUTHOR_ nvarchar(255), - DATE_ datetime NOT NULL, - ANSWERED_COMMENT_ID_ nvarchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.engine.sql deleted file mode 100644 index 4f7339330b49749ab5a6c0609a7eec57ecb518a8..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.engine.sql +++ /dev/null @@ -1,180 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ nvarchar(64), - VALUE_ nvarchar(300), - REV_ int, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.1', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.1)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ nvarchar(64), - REV_ int, - NAME_ nvarchar(255), - DEPLOYMENT_ID_ nvarchar(64), - BYTES_ image, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ nvarchar(64), - NAME_ nvarchar(255), - DEPLOY_TIME_ datetime, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ nvarchar(64), - REV_ int, - PROC_INST_ID_ nvarchar(64), - BUSINESS_KEY_ nvarchar(255), - PARENT_ID_ nvarchar(64), - PROC_DEF_ID_ nvarchar(64), - SUPER_EXEC_ nvarchar(64), - ACT_ID_ nvarchar(255), - IS_ACTIVE_ tinyint, - IS_CONCURRENT_ tinyint, - IS_SCOPE_ tinyint, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ nvarchar(64) NOT NULL, - REV_ int, - TYPE_ nvarchar(255) NOT NULL, - LOCK_EXP_TIME_ datetime, - LOCK_OWNER_ nvarchar(255), - EXCLUSIVE_ bit, - EXECUTION_ID_ nvarchar(64), - PROCESS_INSTANCE_ID_ nvarchar(64), - RETRIES_ int, - EXCEPTION_STACK_ID_ nvarchar(64), - EXCEPTION_MSG_ nvarchar(255), - DUEDATE_ datetime NULL, - REPEAT_ nvarchar(255), - HANDLER_TYPE_ nvarchar(255), - HANDLER_CFG_ nvarchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ nvarchar(64), - CATEGORY_ nvarchar(255), - NAME_ nvarchar(255), - KEY_ nvarchar(255), - VERSION_ int, - DEPLOYMENT_ID_ nvarchar(64), - RESOURCE_NAME_ nvarchar(255), - DGRM_RESOURCE_NAME_ nvarchar(255), - HAS_START_FORM_KEY_ tinyint, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ nvarchar(64), - REV_ int, - EXECUTION_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - PROC_DEF_ID_ nvarchar(64), - NAME_ nvarchar(255), - DESCRIPTION_ nvarchar(255), - TASK_DEF_KEY_ nvarchar(255), - ASSIGNEE_ nvarchar(64), - PRIORITY_ int, - CREATE_TIME_ datetime, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ nvarchar(64), - REV_ int, - GROUP_ID_ nvarchar(64), - TYPE_ nvarchar(255), - USER_ID_ nvarchar(64), - TASK_ID_ nvarchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ nvarchar(64) not null, - REV_ int, - TYPE_ nvarchar(255) not null, - NAME_ nvarchar(255) not null, - EXECUTION_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - TASK_ID_ nvarchar(64), - BYTEARRAY_ID_ nvarchar(64), - DOUBLE_ double precision, - LONG_ numeric(19,0), - TEXT_ nvarchar(255), - TEXT2_ nvarchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.history.sql deleted file mode 100644 index f05b8138c00a1a91d929685a07a835881d2d9267..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.history.sql +++ /dev/null @@ -1,75 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ nvarchar(64) not null, - PROC_INST_ID_ nvarchar(64) not null, - BUSINESS_KEY_ nvarchar(255), - PROC_DEF_ID_ nvarchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - START_USER_ID_ nvarchar(255), - START_ACT_ID_ nvarchar(255), - END_ACT_ID_ nvarchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ nvarchar(64) not null, - PROC_DEF_ID_ nvarchar(64) not null, - PROC_INST_ID_ nvarchar(64) not null, - EXECUTION_ID_ nvarchar(64) not null, - ACT_ID_ nvarchar(255) not null, - ACT_NAME_ nvarchar(255), - ACT_TYPE_ nvarchar(255) not null, - ASSIGNEE_ nvarchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ nvarchar(64) not null, - PROC_DEF_ID_ nvarchar(64), - TASK_DEF_KEY_ nvarchar(255), - PROC_INST_ID_ nvarchar(64), - EXECUTION_ID_ nvarchar(64), - NAME_ nvarchar(255), - DESCRIPTION_ nvarchar(255), - ASSIGNEE_ nvarchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - DELETE_REASON_ nvarchar(255), - PRIORITY_ int, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ nvarchar(64) not null, - TYPE_ nvarchar(255) not null, - PROC_INST_ID_ nvarchar(64) not null, - EXECUTION_ID_ nvarchar(64) not null, - TASK_ID_ nvarchar(64), - ACT_INST_ID_ nvarchar(64), - NAME_ nvarchar(255) not null, - VAR_TYPE_ nvarchar(255), - REV_ int, - TIME_ datetime not null, - BYTEARRAY_ID_ nvarchar(64), - DOUBLE_ double precision, - LONG_ numeric(19,0), - TEXT_ nvarchar(255), - TEXT2_ nvarchar(255), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.identity.sql deleted file mode 100644 index 8293441736befe112ea1123d13169a0c213bc98c..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mssql.create.identity.sql +++ /dev/null @@ -1,33 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ nvarchar(64), - REV_ int, - NAME_ nvarchar(255), - TYPE_ nvarchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ nvarchar(64), - GROUP_ID_ nvarchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ nvarchar(64), - REV_ int, - FIRST_ nvarchar(255), - LAST_ nvarchar(255), - EMAIL_ nvarchar(255), - PWD_ nvarchar(255), - primary key (ID_) -); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.cycle.sql deleted file mode 100644 index 6adec0253dd2c7b2afcdb2c2b725cac2f9f575f8..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.cycle.sql +++ /dev/null @@ -1,76 +0,0 @@ - -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ varchar(255) NOT NULL, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ text NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.engine.sql deleted file mode 100644 index 29b4cac8aab0dec8d331eeef4118c665dced04f3..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.engine.sql +++ /dev/null @@ -1,185 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.3', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.3)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ LONGBLOB, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ TINYINT, - IS_CONCURRENT_ TINYINT, - IS_SCOPE_ TINYINT, - primary key (ID_), - unique ACT_UNIQ_RU_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp NULL, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ TINYINT, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.history.sql deleted file mode 100644 index 70ecbc8c70695f14f07c6d162d965dca7c457851..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.history.sql +++ /dev/null @@ -1,75 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique ACT_UNIQ_HI_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ datetime not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.identity.sql deleted file mode 100644 index 32c7eaee3007c95e5426c80f6e5abff9a9fb7ae1..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.mysql.create.identity.sql +++ /dev/null @@ -1,33 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.cycle.sql deleted file mode 100644 index 8390bc5ed759a6eb460656cce97fe263d0363ff4..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.cycle.sql +++ /dev/null @@ -1,75 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - PLUGIN_ID_ NVARCHAR2(255) NOT NULL, - INSTANCE_NAME_ NVARCHAR2(255) NOT NULL, - INSTANCE_ID_ NVARCHAR2(255) NOT NULL, - USER_ NVARCHAR2(255), - GROUP_ NVARCHAR2(255), - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - GROUP_ NVARCHAR2(255) NOT NULL, - KEY_ NVARCHAR2(255) NOT NULL, - VALUE_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_REVISION_ INTEGER DEFAULT NULL, - TARGET_CONNECTOR_ID_ NVARCHAR2(255), - TARGET_ARTIFACT_ID_ NVARCHAR2(550), - TARGET_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - TARGET_REVISION_ INTEGER DEFAULT NULL, - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - LINKED_BOTH_WAYS_ NUMBER(1,0) CHECK (LINKED_BOTH_WAYS_ IN (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_REVISION_ NUMBER(19) DEFAULT NULL, - USER_ID_ NVARCHAR2(255), - GROUP_ID_ NVARCHAR2(255), - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ NVARCHAR2(255), - NAME_ NVARCHAR2(700), - CONNECTOR_ID_ NVARCHAR2(255), - ARTIFACT_ID_ NVARCHAR2(550), - ALIAS_ NVARCHAR2(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(255) NOT NULL, - NODE_ID_ NVARCHAR2(550) NOT NULL, - ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - CONTENT_ NVARCHAR2(2000) NOT NULL, - AUTHOR_ NVARCHAR2(255), - DATE_ TIMESTAMP(6) NOT NULL, - ANSWERED_COMMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.engine.sql deleted file mode 100644 index 136d25b27417705e399f6cd945706623d3f56fe6..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.engine.sql +++ /dev/null @@ -1,201 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ NVARCHAR2(64), - VALUE_ NVARCHAR2(300), - REV_ INTEGER, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.3', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.3)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - DEPLOYMENT_ID_ NVARCHAR2(64), - BYTES_ BLOB, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DEPLOY_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - PROC_INST_ID_ NVARCHAR2(64), - BUSINESS_KEY_ NVARCHAR2(255), - PARENT_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - SUPER_EXEC_ NVARCHAR2(64), - ACT_ID_ NVARCHAR2(255), - IS_ACTIVE_ NUMBER(1,0) CHECK (IS_ACTIVE_ IN (1,0)), - IS_CONCURRENT_ NUMBER(1,0) CHECK (IS_CONCURRENT_ IN (1,0)), - IS_SCOPE_ NUMBER(1,0) CHECK (IS_SCOPE_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ NVARCHAR2(64) NOT NULL, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) NOT NULL, - LOCK_EXP_TIME_ TIMESTAMP(6), - LOCK_OWNER_ NVARCHAR2(255), - EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)), - EXECUTION_ID_ NVARCHAR2(64), - PROCESS_INSTANCE_ID_ NVARCHAR2(64), - RETRIES_ INTEGER, - EXCEPTION_STACK_ID_ NVARCHAR2(64), - EXCEPTION_MSG_ NVARCHAR2(255), - DUEDATE_ TIMESTAMP(6), - REPEAT_ NVARCHAR2(255), - HANDLER_TYPE_ NVARCHAR2(255), - HANDLER_CFG_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ NVARCHAR2(64), - CATEGORY_ NVARCHAR2(255), - NAME_ NVARCHAR2(255), - KEY_ NVARCHAR2(255), - VERSION_ INTEGER, - DEPLOYMENT_ID_ NVARCHAR2(64), - RESOURCE_NAME_ NVARCHAR2(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ NUMBER(1,0) CHECK (HAS_START_FORM_KEY_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - TASK_DEF_KEY_ NVARCHAR2(255), - ASSIGNEE_ NVARCHAR2(64), - PRIORITY_ INTEGER, - CREATE_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - GROUP_ID_ NVARCHAR2(64), - TYPE_ NVARCHAR2(255), - USER_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ NVARCHAR2(64) not null, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) not null, - NAME_ NVARCHAR2(255) not null, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.history.sql deleted file mode 100644 index a77b855bf8f7bd7c875d89a07509148276c31f76..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.history.sql +++ /dev/null @@ -1,79 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - BUSINESS_KEY_ NVARCHAR2(255), - PROC_DEF_ID_ NVARCHAR2(64) not null, - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - START_USER_ID_ NVARCHAR2(255), - START_ACT_ID_ NVARCHAR2(255), - END_ACT_ID_ NVARCHAR2(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - ACT_ID_ NVARCHAR2(255) not null, - ACT_NAME_ NVARCHAR2(255), - ACT_TYPE_ NVARCHAR2(255) not null, - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64), - TASK_DEF_KEY_ NVARCHAR2(255), - PROC_INST_ID_ NVARCHAR2(64), - EXECUTION_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - DELETE_REASON_ NVARCHAR2(255), - PRIORITY_ INTEGER, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ NVARCHAR2(255) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - TASK_ID_ NVARCHAR2(64), - ACT_INST_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255) not null, - VAR_TYPE_ NVARCHAR2(64), - REV_ INTEGER, - TIME_ TIMESTAMP(6) not null, - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.identity.sql deleted file mode 100644 index 786ec3aa217c8463e72e2725da7c7a4f41b4bcf6..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.oracle.create.identity.sql +++ /dev/null @@ -1,35 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - TYPE_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ NVARCHAR2(64), - GROUP_ID_ NVARCHAR2(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - FIRST_ NVARCHAR2(255), - LAST_ NVARCHAR2(255), - EMAIL_ NVARCHAR2(255), - PWD_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.cycle.sql deleted file mode 100644 index 11b896a1247aed417833f9c789dbfe11c864470a..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.cycle.sql +++ /dev/null @@ -1,76 +0,0 @@ - -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ varchar(255), - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(700), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ varchar(5000) NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.engine.sql deleted file mode 100644 index 0c8cf2232414a16c4c568234cad59df4355c102d..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.engine.sql +++ /dev/null @@ -1,197 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.3', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.3)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ bytea, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ boolean, - IS_CONCURRENT_ boolean, - IS_SCOPE_ boolean, - primary key (ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ boolean, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - ASSIGNEE_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.history.sql deleted file mode 100644 index 0e2ed72efe2170ad9a755d593e0e52050d917825..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.history.sql +++ /dev/null @@ -1,75 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(64), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.identity.sql deleted file mode 100644 index 611de72268b7afe0200e2c86d99e00233c1b86d4..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/create/activiti.postgres.create.identity.sql +++ /dev/null @@ -1,35 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.mysql.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.mysql.drop.sql deleted file mode 100644 index 908af447abd1f9c9f945dca230d979572d745d96..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.mysql.drop.sql +++ /dev/null @@ -1,73 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; -drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; -drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; -drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; -drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; -drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; -drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; - - -alter table ACT_GE_BYTEARRAY - drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop FOREIGN KEY ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; - - drop table if exists ACT_GE_PROPERTY; - drop table if exists ACT_RU_VARIABLE; - drop table if exists ACT_GE_BYTEARRAY; - drop table if exists ACT_RE_DEPLOYMENT; - drop table if exists ACT_RU_IDENTITYLINK; - drop table if exists ACT_RU_TASK; - drop table if exists ACT_RE_PROCDEF; - drop table if exists ACT_RU_EXECUTION; - drop table if exists ACT_ID_MEMBERSHIP; - drop table if exists ACT_ID_GROUP; - drop table if exists ACT_ID_USER; - drop table if exists ACT_RU_JOB; - drop table if exists ACT_HI_PROCINST; - drop table if exists ACT_HI_ACTINST; - drop table if exists ACT_HI_TASKINST; - drop table if exists ACT_HI_DETAIL; - \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.cycle.sql deleted file mode 100644 index 85379b78091699a60cd04b76476e2117960aa553..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.cycle.sql +++ /dev/null @@ -1,97 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) not null, - PLUGIN_ID_ varchar(255) not null, - INSTANCE_NAME_ varchar(255) not null, - INSTANCE_ID_ varchar(255) not null, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ varchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) not null, - GROUP_ varchar(255) not null, - KEY_ varchar(255) not null, - VALUE_ varchar(1024) not null, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) default null, - SOURCE_ELEMENT_NAME_ varchar(255) default null, - SOURCE_REVISION_ bigint default null, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) default null, - TARGET_ELEMENT_NAME_ varchar(255) default null, - TARGET_REVISION_ bigint default null, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ smallint check(LINKED_BOTH_WAYS_ in (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint default null, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255) not null, - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) not null, - CONNECTOR_ID_ varchar(255) not null, - NODE_ID_ varchar(550) not null, - ELEMENT_ID_ varchar(255) default null, - CONTENT_ varchar(1024) not null, - AUTHOR_ varchar(255), - DATE_ timestamp not null, - ANSWERED_COMMENT_ID_ varchar(255) default null, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ v(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.engine.sql deleted file mode 100644 index 014d3fbc5d9a7b19a69229caf5a740b7e5ae12a0..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.engine.sql +++ /dev/null @@ -1,190 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64) not null, - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.4', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.4)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64) not null, - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ BLOB, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64) not null, - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64) not null, - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ smallint check(IS_ACTIVE_ in (1,0)), - IS_CONCURRENT_ smallint check(IS_CONCURRENT_ in (1,0)), - IS_SCOPE_ smallint check(IS_SCOPE_ in (1,0)), - UNI_BUSINESS_KEY varchar (255) not null generated always as (case when "BUSINESS_KEY_" is null then "ID_" else "BUSINESS_KEY_" end), - UNI_PROC_DEF_ID varchar (64) not null generated always as (case when "PROC_DEF_ID_" is null then "ID_" else "PROC_DEF_ID_" end), - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)), - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp null, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64) not null, - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ smallint check(HAS_START_FORM_KEY_ in (1,0)), - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64) not null, - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - DELEGATION_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64) not null, - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION(UNI_PROC_DEF_ID, UNI_BUSINESS_KEY); -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.history.sql deleted file mode 100644 index 2a142886229d3c71f718871114a9c13261a2cd28..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.history.sql +++ /dev/null @@ -1,102 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - UNI_BUSINESS_KEY varchar (255) not null generated always as (case when "BUSINESS_KEY_" is null then "ID_" else "BUSINESS_KEY_" end), - UNI_PROC_DEF_ID varchar (64) not null generated always as (case when "PROC_DEF_ID_" is null then "ID_" else "PROC_DEF_ID_" end), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ varchar(64) not null, - TIME_ timestamp not null, - USER_ID_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - MESSAGE_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ varchar(64) not null, - REV_ integer, - USER_ID_ varchar(255), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TYPE_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - URL_ varchar(255), - CONTENT_ID_ varchar(64), - primary key (ID_) -); - -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST(UNI_PROC_DEF_ID, UNI_BUSINESS_KEY); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.identity.sql deleted file mode 100644 index 8b96768c23e9dd3e4d78f4608b289a96c0a0bd0a..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.db2.create.identity.sql +++ /dev/null @@ -1,46 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64) not null, - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64) not null, - GROUP_ID_ varchar(64) not null, - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64) not null, - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - PICTURE_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ varchar(64), - REV_ integer, - USER_ID_ varchar(64), - TYPE_ varchar(64), - KEY_ varchar(255), - VALUE_ varchar(255), - PASSWORD_ BLOB, - PARENT_ID_ varchar(255), - primary key (ID_) -); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.cycle.sql deleted file mode 100644 index c6cd75832f258346603e40dcbbda0df5aaf4191c..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar NOT NULL, - PLUGIN_ID_ varchar NOT NULL, - INSTANCE_NAME_ varchar NOT NULL, - INSTANCE_ID_ varchar NOT NULL, - USER_ varchar, - GROUP_ varchar, - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar NOT NULL, - GROUP_ varchar NOT NULL, - KEY_ varchar NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_ELEMENT_ID_ varchar DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar, - TARGET_ARTIFACT_ID_ varchar, - TARGET_ELEMENT_ID_ varchar DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar, - COMMENT_ varchar, - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar, - GROUP_ID_ varchar, - LINK_TYPE_ varchar, - COMMENT_ varchar, - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar NOT NULL, - NAME_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - ARTIFACT_ID_ varchar NOT NULL, - ALIAS_ varchar DEFAULT NULL, - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - NODE_ID_ varchar NOT NULL, - ELEMENT_ID_ varchar DEFAULT NULL, - CONTENT_ varchar NOT NULL, - AUTHOR_ varchar, - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT; - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - STATE_ varchar NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - REFERENCED_NODE_ID_ varchar NOT NULL, - PROCESS_SOLUTION_ID_ varchar NOT NULL, - TYPE_ varchar NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.engine.sql deleted file mode 100644 index f46290c46974c31a9079be41666e976f42b5fd9a..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.engine.sql +++ /dev/null @@ -1,191 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.4', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.4)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ longvarbinary, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ bit, - IS_CONCURRENT_ bit, - IS_SCOPE_ bit, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ bit, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - DELEGATION_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_UNIQ_RU_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY; - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.history.sql deleted file mode 100644 index 963cfc4ec0394f787b9338d95e879a27a7dba8db..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.h2.create.history.sql +++ /dev/null @@ -1,103 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - TIME_ timestamp not null, - NAME_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - VAR_TYPE_ varchar(255), - REV_ integer, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ varchar(64) not null, - TIME_ timestamp not null, - USER_ID_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - MESSAGE_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ varchar(64) not null, - REV_ integer, - USER_ID_ varchar(255), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TYPE_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - URL_ varchar(255), - CONTENT_ID_ varchar(64), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -alter table ACT_HI_PROCINST - add constraint ACT_UNIQ_HI_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.cycle.sql deleted file mode 100644 index ac8b328a98e571bdeeb3d142b01f889f9d6c0c5f..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ nvarchar(255), - PLUGIN_ID_ nvarchar(255), - INSTANCE_NAME_ nvarchar(255), - INSTANCE_ID_ nvarchar(255), - USER_ nvarchar(255), - GROUP_ nvarchar(255), - VALUES_ nvarchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ nvarchar(255), - GROUP_ nvarchar(255), - KEY_ nvarchar(255), - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - TARGET_CONNECTOR_ID_ nvarchar(255), - TARGET_ARTIFACT_ID_ nvarchar(550), - TARGET_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - TARGET_REVISION_ numeric(19,0) DEFAULT NULL, - LINK_TYPE_ nvarchar(255) , - COMMENT_ nvarchar(1000), - LINKED_BOTH_WAYS_ bit, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - USER_ID_ nvarchar(255), - GROUP_ID_ nvarchar(255), - LINK_TYPE_ nvarchar(255), - COMMENT_ nvarchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ nvarchar(255), - NAME_ nvarchar(255), - CONNECTOR_ID_ nvarchar(255), - ARTIFACT_ID_ nvarchar(550), - ALIAS_ nvarchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - NODE_ID_ nvarchar(550) NOT NULL, - ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - CONTENT_ nvarchar(1024) NOT NULL, - AUTHOR_ nvarchar(255), - DATE_ datetime NOT NULL, - ANSWERED_COMMENT_ID_ nvarchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - STATE_ nvarchar(255) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - REFERENCED_NODE_ID_ nvarchar(255) NOT NULL, - PROCESS_SOLUTION_ID_ nvarchar(255) NOT NULL, - TYPE_ nvarchar(255) NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.engine.sql deleted file mode 100644 index f3757ad39e9f41cfd0344a56c2163f16df9b5ac7..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.engine.sql +++ /dev/null @@ -1,183 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ nvarchar(64), - VALUE_ nvarchar(300), - REV_ int, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.4', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.4)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ nvarchar(64), - REV_ int, - NAME_ nvarchar(255), - DEPLOYMENT_ID_ nvarchar(64), - BYTES_ image, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ nvarchar(64), - NAME_ nvarchar(255), - DEPLOY_TIME_ datetime, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ nvarchar(64), - REV_ int, - PROC_INST_ID_ nvarchar(64), - BUSINESS_KEY_ nvarchar(255), - PARENT_ID_ nvarchar(64), - PROC_DEF_ID_ nvarchar(64), - SUPER_EXEC_ nvarchar(64), - ACT_ID_ nvarchar(255), - IS_ACTIVE_ tinyint, - IS_CONCURRENT_ tinyint, - IS_SCOPE_ tinyint, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ nvarchar(64) NOT NULL, - REV_ int, - TYPE_ nvarchar(255) NOT NULL, - LOCK_EXP_TIME_ datetime, - LOCK_OWNER_ nvarchar(255), - EXCLUSIVE_ bit, - EXECUTION_ID_ nvarchar(64), - PROCESS_INSTANCE_ID_ nvarchar(64), - RETRIES_ int, - EXCEPTION_STACK_ID_ nvarchar(64), - EXCEPTION_MSG_ nvarchar(255), - DUEDATE_ datetime NULL, - REPEAT_ nvarchar(255), - HANDLER_TYPE_ nvarchar(255), - HANDLER_CFG_ nvarchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ nvarchar(64), - CATEGORY_ nvarchar(255), - NAME_ nvarchar(255), - KEY_ nvarchar(255), - VERSION_ int, - DEPLOYMENT_ID_ nvarchar(64), - RESOURCE_NAME_ nvarchar(255), - DGRM_RESOURCE_NAME_ nvarchar(255), - HAS_START_FORM_KEY_ tinyint, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ nvarchar(64), - REV_ int, - EXECUTION_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - PROC_DEF_ID_ nvarchar(64), - NAME_ nvarchar(255), - DESCRIPTION_ nvarchar(255), - TASK_DEF_KEY_ nvarchar(255), - OWNER_ nvarchar(64), - ASSIGNEE_ nvarchar(64), - DELEGATION_ nvarchar(64), - PRIORITY_ int, - CREATE_TIME_ datetime, - DUE_DATE_ datetime, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ nvarchar(64), - REV_ int, - GROUP_ID_ nvarchar(64), - TYPE_ nvarchar(255), - USER_ID_ nvarchar(64), - TASK_ID_ nvarchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ nvarchar(64) not null, - REV_ int, - TYPE_ nvarchar(255) not null, - NAME_ nvarchar(255) not null, - EXECUTION_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - TASK_ID_ nvarchar(64), - BYTEARRAY_ID_ nvarchar(64), - DOUBLE_ double precision, - LONG_ numeric(19,0), - TEXT_ nvarchar(255), - TEXT2_ nvarchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.history.sql deleted file mode 100644 index d0e4854933c0e0bb62c58fa24ca93f50ea86bc8a..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mssql.create.history.sql +++ /dev/null @@ -1,100 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ nvarchar(64) not null, - PROC_INST_ID_ nvarchar(64) not null, - BUSINESS_KEY_ nvarchar(255), - PROC_DEF_ID_ nvarchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - START_USER_ID_ nvarchar(255), - START_ACT_ID_ nvarchar(255), - END_ACT_ID_ nvarchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ nvarchar(64) not null, - PROC_DEF_ID_ nvarchar(64) not null, - PROC_INST_ID_ nvarchar(64) not null, - EXECUTION_ID_ nvarchar(64) not null, - ACT_ID_ nvarchar(255) not null, - ACT_NAME_ nvarchar(255), - ACT_TYPE_ nvarchar(255) not null, - ASSIGNEE_ nvarchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ nvarchar(64) not null, - PROC_DEF_ID_ nvarchar(64), - TASK_DEF_KEY_ nvarchar(255), - PROC_INST_ID_ nvarchar(64), - EXECUTION_ID_ nvarchar(64), - NAME_ nvarchar(255), - DESCRIPTION_ nvarchar(255), - ASSIGNEE_ nvarchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - DELETE_REASON_ nvarchar(255), - PRIORITY_ int, - DUE_DATE_ datetime, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ nvarchar(64) not null, - TYPE_ nvarchar(255) not null, - PROC_INST_ID_ nvarchar(64) not null, - EXECUTION_ID_ nvarchar(64) not null, - TASK_ID_ nvarchar(64), - ACT_INST_ID_ nvarchar(64), - NAME_ nvarchar(255) not null, - VAR_TYPE_ nvarchar(255), - REV_ int, - TIME_ datetime not null, - BYTEARRAY_ID_ nvarchar(64), - DOUBLE_ double precision, - LONG_ numeric(19,0), - TEXT_ nvarchar(255), - TEXT2_ nvarchar(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ nvarchar(64) not null, - TIME_ datetime not null, - USER_ID_ nvarchar(255), - TASK_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - MESSAGE_ nvarchar(255), - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ nvarchar(64) not null, - REV_ integer, - USER_ID_ nvarchar(255), - NAME_ nvarchar(255), - DESCRIPTION_ nvarchar(255), - TYPE_ nvarchar(255), - TASK_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - URL_ nvarchar(255), - CONTENT_ID_ nvarchar(64), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.cycle.sql deleted file mode 100644 index a0d17b291cd94ebf17a1ce1f0bc8c632f76636e5..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ text NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.engine.sql deleted file mode 100644 index 7defe3ab991d4f3ab0570141f276362f64729214..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.engine.sql +++ /dev/null @@ -1,188 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.4', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.4)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ LONGBLOB, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ TINYINT, - IS_CONCURRENT_ TINYINT, - IS_SCOPE_ TINYINT, - primary key (ID_), - unique ACT_UNIQ_RU_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp NULL, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ TINYINT, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - DELEGATION_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - DUE_DATE_ datetime, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.history.sql deleted file mode 100644 index 81e78939075a864318a47ffbdf4b7c9b4c90c1dc..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.mysql.create.history.sql +++ /dev/null @@ -1,100 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique ACT_UNIQ_HI_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - DUE_DATE_ datetime, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ datetime not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_COMMENT ( - ID_ varchar(64) not null, - TIME_ datetime not null, - USER_ID_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - MESSAGE_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_ATTACHMENT ( - ID_ varchar(64) not null, - REV_ integer, - USER_ID_ varchar(255), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TYPE_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - URL_ varchar(255), - CONTENT_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.cycle.sql deleted file mode 100644 index 77a7fc22ab55e8f8efd5ea2e24115544bc75ecd3..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - PLUGIN_ID_ NVARCHAR2(255) NOT NULL, - INSTANCE_NAME_ NVARCHAR2(255) NOT NULL, - INSTANCE_ID_ NVARCHAR2(255) NOT NULL, - USER_ NVARCHAR2(255), - GROUP_ NVARCHAR2(255), - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - GROUP_ NVARCHAR2(255) NOT NULL, - KEY_ NVARCHAR2(255) NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_REVISION_ INTEGER DEFAULT NULL, - TARGET_CONNECTOR_ID_ NVARCHAR2(255), - TARGET_ARTIFACT_ID_ NVARCHAR2(550), - TARGET_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - TARGET_REVISION_ INTEGER DEFAULT NULL, - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - LINKED_BOTH_WAYS_ NUMBER(1,0) CHECK (LINKED_BOTH_WAYS_ IN (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_REVISION_ NUMBER(19) DEFAULT NULL, - USER_ID_ NVARCHAR2(255), - GROUP_ID_ NVARCHAR2(255), - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ NVARCHAR2(255), - NAME_ NVARCHAR2(700), - CONNECTOR_ID_ NVARCHAR2(255), - ARTIFACT_ID_ NVARCHAR2(550), - ALIAS_ NVARCHAR2(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(255) NOT NULL, - NODE_ID_ NVARCHAR2(550) NOT NULL, - ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - CONTENT_ NVARCHAR2(2000) NOT NULL, - AUTHOR_ NVARCHAR2(255), - DATE_ TIMESTAMP(6) NOT NULL, - ANSWERED_COMMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - STATE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(128) NOT NULL, - REFERENCED_NODE_ID_ NVARCHAR2(550) NOT NULL, - PROCESS_SOLUTION_ID_ NVARCHAR2(128) NOT NULL, - TYPE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.engine.sql deleted file mode 100644 index 1d8768b5ff4c83cb902583c5162c5a52a91b7052..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.engine.sql +++ /dev/null @@ -1,204 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ NVARCHAR2(64), - VALUE_ NVARCHAR2(300), - REV_ INTEGER, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.4', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.4)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - DEPLOYMENT_ID_ NVARCHAR2(64), - BYTES_ BLOB, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DEPLOY_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - PROC_INST_ID_ NVARCHAR2(64), - BUSINESS_KEY_ NVARCHAR2(255), - PARENT_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - SUPER_EXEC_ NVARCHAR2(64), - ACT_ID_ NVARCHAR2(255), - IS_ACTIVE_ NUMBER(1,0) CHECK (IS_ACTIVE_ IN (1,0)), - IS_CONCURRENT_ NUMBER(1,0) CHECK (IS_CONCURRENT_ IN (1,0)), - IS_SCOPE_ NUMBER(1,0) CHECK (IS_SCOPE_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ NVARCHAR2(64) NOT NULL, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) NOT NULL, - LOCK_EXP_TIME_ TIMESTAMP(6), - LOCK_OWNER_ NVARCHAR2(255), - EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)), - EXECUTION_ID_ NVARCHAR2(64), - PROCESS_INSTANCE_ID_ NVARCHAR2(64), - RETRIES_ INTEGER, - EXCEPTION_STACK_ID_ NVARCHAR2(64), - EXCEPTION_MSG_ NVARCHAR2(255), - DUEDATE_ TIMESTAMP(6), - REPEAT_ NVARCHAR2(255), - HANDLER_TYPE_ NVARCHAR2(255), - HANDLER_CFG_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ NVARCHAR2(64), - CATEGORY_ NVARCHAR2(255), - NAME_ NVARCHAR2(255), - KEY_ NVARCHAR2(255), - VERSION_ INTEGER, - DEPLOYMENT_ID_ NVARCHAR2(64), - RESOURCE_NAME_ NVARCHAR2(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ NUMBER(1,0) CHECK (HAS_START_FORM_KEY_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - TASK_DEF_KEY_ NVARCHAR2(255), - OWNER_ NVARCHAR2(64), - ASSIGNEE_ NVARCHAR2(64), - DELEGATION_ NVARCHAR2(64), - PRIORITY_ INTEGER, - CREATE_TIME_ TIMESTAMP(6), - DUE_DATE_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - GROUP_ID_ NVARCHAR2(64), - TYPE_ NVARCHAR2(255), - USER_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ NVARCHAR2(64) not null, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) not null, - NAME_ NVARCHAR2(255) not null, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.history.sql deleted file mode 100644 index a5bdc9f9e7036fa6be80a8deb17738f735f1cdc7..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.oracle.create.history.sql +++ /dev/null @@ -1,104 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - BUSINESS_KEY_ NVARCHAR2(255), - PROC_DEF_ID_ NVARCHAR2(64) not null, - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - START_USER_ID_ NVARCHAR2(255), - START_ACT_ID_ NVARCHAR2(255), - END_ACT_ID_ NVARCHAR2(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - ACT_ID_ NVARCHAR2(255) not null, - ACT_NAME_ NVARCHAR2(255), - ACT_TYPE_ NVARCHAR2(255) not null, - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64), - TASK_DEF_KEY_ NVARCHAR2(255), - PROC_INST_ID_ NVARCHAR2(64), - EXECUTION_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - DELETE_REASON_ NVARCHAR2(255), - PRIORITY_ INTEGER, - DUE_DATE_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ NVARCHAR2(255) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - TASK_ID_ NVARCHAR2(64), - ACT_INST_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255) not null, - VAR_TYPE_ NVARCHAR2(64), - REV_ INTEGER, - TIME_ TIMESTAMP(6) not null, - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ NVARCHAR2(64) not null, - TIME_ TIMESTAMP(6) not null, - USER_ID_ NVARCHAR2(255), - TASK_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - MESSAGE_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ NVARCHAR2(64) not null, - REV_ INTEGER, - USER_ID_ NVARCHAR2(255), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - TYPE_ NVARCHAR2(255), - TASK_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - URL_ NVARCHAR2(255), - CONTENT_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.cycle.sql deleted file mode 100644 index ea0001337e90948f78eb1a146d86115236f263e2..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(700), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ varchar(5000) NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.engine.sql deleted file mode 100644 index ec70ccb5ba17644aedf3f4b1232cbbe5521e31f5..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.engine.sql +++ /dev/null @@ -1,200 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.4', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.4)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ bytea, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ boolean, - IS_CONCURRENT_ boolean, - IS_SCOPE_ boolean, - primary key (ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ boolean, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - DELEGATION_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.history.sql deleted file mode 100644 index 7030ee6d8222ff8bf9589b1175e6efc15a888b07..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/create/activiti.postgres.create.history.sql +++ /dev/null @@ -1,101 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(64), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ varchar(64) not null, - TIME_ timestamp not null, - USER_ID_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - MESSAGE_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ varchar(64) not null, - REV_ integer, - USER_ID_ varchar(255), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TYPE_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - URL_ varchar(255), - CONTENT_ID_ varchar(64), - primary key (ID_) -); - - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.h2.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.h2.drop.sql deleted file mode 100644 index 256fe5c87ada4951a01ff2b6c61f2db14915711a..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.h2.drop.sql +++ /dev/null @@ -1,77 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY; -drop index ACT_IDX_TASK_CREATE; -drop index ACT_IDX_IDENT_LNK_USER; -drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; - -alter table ACT_GE_BYTEARRAY - drop constraint ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_RU_EXECUTION - drop constraint ACT_UNIQ_RU_BUS_KEY; - -alter table ACT_HI_PROCINST - drop constraint ACT_UNIQ_HI_BUS_KEY; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop constraint ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop constraint ACT_FK_JOB_EXCEPTION; - -drop table ACT_GE_PROPERTY if exists; -drop table ACT_GE_BYTEARRAY if exists; -drop table ACT_RE_DEPLOYMENT if exists; -drop table ACT_RU_EXECUTION if exists; -drop table ACT_ID_GROUP if exists; -drop table ACT_ID_MEMBERSHIP if exists; -drop table ACT_ID_USER if exists; -drop table ACT_RU_JOB if exists; -drop table ACT_RE_PROCDEF if exists; -drop table ACT_RU_TASK if exists; -drop table ACT_RU_IDENTITYLINK if exists; -drop table ACT_RU_VARIABLE if exists; -drop table ACT_HI_PROCINST if exists; -drop table ACT_HI_ACTINST if exists; -drop table ACT_HI_TASKINST if exists; -drop table ACT_HI_DETAIL if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.mysql.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.mysql.drop.sql deleted file mode 100644 index 908af447abd1f9c9f945dca230d979572d745d96..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.mysql.drop.sql +++ /dev/null @@ -1,73 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; -drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; -drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; -drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; -drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; -drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; -drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; - - -alter table ACT_GE_BYTEARRAY - drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop FOREIGN KEY ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; - - drop table if exists ACT_GE_PROPERTY; - drop table if exists ACT_RU_VARIABLE; - drop table if exists ACT_GE_BYTEARRAY; - drop table if exists ACT_RE_DEPLOYMENT; - drop table if exists ACT_RU_IDENTITYLINK; - drop table if exists ACT_RU_TASK; - drop table if exists ACT_RE_PROCDEF; - drop table if exists ACT_RU_EXECUTION; - drop table if exists ACT_ID_MEMBERSHIP; - drop table if exists ACT_ID_GROUP; - drop table if exists ACT_ID_USER; - drop table if exists ACT_RU_JOB; - drop table if exists ACT_HI_PROCINST; - drop table if exists ACT_HI_ACTINST; - drop table if exists ACT_HI_TASKINST; - drop table if exists ACT_HI_DETAIL; - \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.oracle.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.oracle.drop.sql deleted file mode 100644 index 94cc9bee4a73871453850f088e5f8238b7f16ff8..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.oracle.drop.sql +++ /dev/null @@ -1,86 +0,0 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; -drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; -drop index ACT_IDX_TSKASS_TASK; -drop index ACT_IDX_TASK_EXEC; -drop index ACT_IDX_TASK_PROCINST; -drop index ACT_IDX_TASK_PROCDEF; -drop index ACT_IDX_VAR_EXE; -drop index ACT_IDX_VAR_PROCINST; -drop index ACT_IDX_VAR_BYTEARRAY; -drop index ACT_IDX_JOB_EXCEPTION; - -drop index ACT_IDX_EXEC_BUSKEY; -drop index ACT_IDX_TASK_CREATE; -drop index ACT_IDX_IDENT_LNK_USER; -drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; - -alter table ACT_GE_BYTEARRAY - drop CONSTRAINT ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop CONSTRAINT ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop CONSTRAINT ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop CONSTRAINT ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop CONSTRAINT ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop CONSTRAINT ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop CONSTRAINT ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop CONSTRAINT ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop CONSTRAINT ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop CONSTRAINT ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop CONSTRAINT ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop CONSTRAINT ACT_FK_JOB_EXCEPTION; - -drop table ACT_GE_PROPERTY; -drop table ACT_RU_VARIABLE; -drop table ACT_GE_BYTEARRAY; -drop table ACT_RE_DEPLOYMENT; -drop table ACT_RU_IDENTITYLINK; -drop table ACT_RU_TASK; -drop table ACT_RE_PROCDEF; -drop table ACT_RU_EXECUTION; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_GROUP; -drop table ACT_ID_USER; -drop table ACT_RU_JOB; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.postgres.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.postgres.drop.sql deleted file mode 100644 index 51111fea940251dbf93c3eebb66cadc9bd973da9..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.4/drop/activiti.postgres.drop.sql +++ /dev/null @@ -1,86 +0,0 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; -drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; -drop index ACT_IDX_TSKASS_TASK; -drop index ACT_IDX_TASK_EXEC; -drop index ACT_IDX_TASK_PROCINST; -drop index ACT_IDX_TASK_PROCDEF; -drop index ACT_IDX_VAR_EXE; -drop index ACT_IDX_VAR_PROCINST; -drop index ACT_IDX_VAR_BYTEARRAY; -drop index ACT_IDX_JOB_EXCEPTION; - -drop index ACT_IDX_EXEC_BUSKEY; -drop index ACT_IDX_TASK_CREATE; -drop index ACT_IDX_IDENT_LNK_USER; -drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; - -alter table ACT_GE_BYTEARRAY - drop constraint ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop constraint ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop constraint ACT_FK_JOB_EXCEPTION; - -drop table ACT_GE_PROPERTY; -drop table ACT_GE_BYTEARRAY; -drop table ACT_RE_DEPLOYMENT; -drop table ACT_RU_EXECUTION; -drop table ACT_ID_GROUP; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_USER; -drop table ACT_RU_JOB; -drop table ACT_RE_PROCDEF; -drop table ACT_RU_TASK; -drop table ACT_RU_IDENTITYLINK; -drop table ACT_RU_VARIABLE; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.cycle.sql deleted file mode 100644 index 85379b78091699a60cd04b76476e2117960aa553..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.cycle.sql +++ /dev/null @@ -1,97 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) not null, - PLUGIN_ID_ varchar(255) not null, - INSTANCE_NAME_ varchar(255) not null, - INSTANCE_ID_ varchar(255) not null, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ varchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) not null, - GROUP_ varchar(255) not null, - KEY_ varchar(255) not null, - VALUE_ varchar(1024) not null, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) default null, - SOURCE_ELEMENT_NAME_ varchar(255) default null, - SOURCE_REVISION_ bigint default null, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) default null, - TARGET_ELEMENT_NAME_ varchar(255) default null, - TARGET_REVISION_ bigint default null, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ smallint check(LINKED_BOTH_WAYS_ in (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint default null, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255) not null, - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) not null, - CONNECTOR_ID_ varchar(255) not null, - NODE_ID_ varchar(550) not null, - ELEMENT_ID_ varchar(255) default null, - CONTENT_ varchar(1024) not null, - AUTHOR_ varchar(255), - DATE_ timestamp not null, - ANSWERED_COMMENT_ID_ varchar(255) default null, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ v(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.engine.sql deleted file mode 100644 index d496cf3eeac5948bd7093f268a6d0b6913ec9a33..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.engine.sql +++ /dev/null @@ -1,191 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64) not null, - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.5', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.5)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64) not null, - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ BLOB, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64) not null, - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64) not null, - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ smallint check(IS_ACTIVE_ in (1,0)), - IS_CONCURRENT_ smallint check(IS_CONCURRENT_ in (1,0)), - IS_SCOPE_ smallint check(IS_SCOPE_ in (1,0)), - UNI_BUSINESS_KEY varchar (255) not null generated always as (case when "BUSINESS_KEY_" is null then "ID_" else "BUSINESS_KEY_" end), - UNI_PROC_DEF_ID varchar (64) not null generated always as (case when "PROC_DEF_ID_" is null then "ID_" else "PROC_DEF_ID_" end), - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)), - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp null, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64) not null, - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ smallint check(HAS_START_FORM_KEY_ in (1,0)), - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64) not null, - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - PARENT_TASK_ID_ varchar(64), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - DELEGATION_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64) not null, - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION(UNI_PROC_DEF_ID, UNI_BUSINESS_KEY); -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.history.sql deleted file mode 100644 index 2be6625f276deab796b58961cd3f39a9d408e915..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.db2.create.history.sql +++ /dev/null @@ -1,107 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - UNI_BUSINESS_KEY varchar (255) not null generated always as (case when "BUSINESS_KEY_" is null then "ID_" else "BUSINESS_KEY_" end), - UNI_PROC_DEF_ID varchar (64) not null generated always as (case when "PROC_DEF_ID_" is null then "ID_" else "PROC_DEF_ID_" end), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - PARENT_TASK_ID_ varchar(64), - DESCRIPTION_ varchar(255), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ varchar(64) not null, - TYPE_ varchar(255), - TIME_ timestamp not null, - USER_ID_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - ACTION_ varchar(255), - MESSAGE_ varchar(255), - FULL_MSG_ BLOB, - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ varchar(64) not null, - REV_ integer, - USER_ID_ varchar(255), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TYPE_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - URL_ varchar(255), - CONTENT_ID_ varchar(64), - primary key (ID_) -); - -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST(UNI_PROC_DEF_ID, UNI_BUSINESS_KEY); -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.cycle.sql deleted file mode 100644 index c6cd75832f258346603e40dcbbda0df5aaf4191c..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar NOT NULL, - PLUGIN_ID_ varchar NOT NULL, - INSTANCE_NAME_ varchar NOT NULL, - INSTANCE_ID_ varchar NOT NULL, - USER_ varchar, - GROUP_ varchar, - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar NOT NULL, - GROUP_ varchar NOT NULL, - KEY_ varchar NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_ELEMENT_ID_ varchar DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar, - TARGET_ARTIFACT_ID_ varchar, - TARGET_ELEMENT_ID_ varchar DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar, - COMMENT_ varchar, - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar, - GROUP_ID_ varchar, - LINK_TYPE_ varchar, - COMMENT_ varchar, - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar NOT NULL, - NAME_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - ARTIFACT_ID_ varchar NOT NULL, - ALIAS_ varchar DEFAULT NULL, - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - NODE_ID_ varchar NOT NULL, - ELEMENT_ID_ varchar DEFAULT NULL, - CONTENT_ varchar NOT NULL, - AUTHOR_ varchar, - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT; - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - STATE_ varchar NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - REFERENCED_NODE_ID_ varchar NOT NULL, - PROCESS_SOLUTION_ID_ varchar NOT NULL, - TYPE_ varchar NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.engine.sql deleted file mode 100644 index a33e8051c1f04433f749053dcfb29c0acfb45c2c..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.engine.sql +++ /dev/null @@ -1,192 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.5', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.5)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ longvarbinary, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ bit, - IS_CONCURRENT_ bit, - IS_SCOPE_ bit, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ bit, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - PARENT_TASK_ID_ varchar(64), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - DELEGATION_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_EXECUTION - add constraint ACT_UNIQ_RU_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION; - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY; - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.history.sql deleted file mode 100644 index f2df7c7fd1fec3eb5bd0e2e0d7717ced063b4dde..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.history.sql +++ /dev/null @@ -1,108 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - PARENT_TASK_ID_ varchar(64), - DESCRIPTION_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - TIME_ timestamp not null, - NAME_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - VAR_TYPE_ varchar(255), - REV_ integer, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ varchar(64) not null, - TYPE_ varchar(255), - TIME_ timestamp not null, - USER_ID_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - ACTION_ varchar(255), - MESSAGE_ varchar(255), - FULL_MSG_ longvarbinary, - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ varchar(64) not null, - REV_ integer, - USER_ID_ varchar(255), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TYPE_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - URL_ varchar(255), - CONTENT_ID_ varchar(64), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - -alter table ACT_HI_PROCINST - add constraint ACT_UNIQ_HI_BUS_KEY - unique(PROC_DEF_ID_, BUSINESS_KEY_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.identity.sql deleted file mode 100644 index 80c03fbe7d245f4d720b94e04e3d7c0fbb576db5..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.h2.create.identity.sql +++ /dev/null @@ -1,46 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - PICTURE_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ varchar(64), - REV_ integer, - USER_ID_ varchar(64), - TYPE_ varchar(64), - KEY_ varchar(255), - VALUE_ varchar(255), - PASSWORD_ longvarbinary, - PARENT_ID_ varchar(255), - primary key (ID_) -); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP; - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.cycle.sql deleted file mode 100644 index ac8b328a98e571bdeeb3d142b01f889f9d6c0c5f..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ nvarchar(255), - PLUGIN_ID_ nvarchar(255), - INSTANCE_NAME_ nvarchar(255), - INSTANCE_ID_ nvarchar(255), - USER_ nvarchar(255), - GROUP_ nvarchar(255), - VALUES_ nvarchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ nvarchar(255), - GROUP_ nvarchar(255), - KEY_ nvarchar(255), - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - TARGET_CONNECTOR_ID_ nvarchar(255), - TARGET_ARTIFACT_ID_ nvarchar(550), - TARGET_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - TARGET_REVISION_ numeric(19,0) DEFAULT NULL, - LINK_TYPE_ nvarchar(255) , - COMMENT_ nvarchar(1000), - LINKED_BOTH_WAYS_ bit, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - USER_ID_ nvarchar(255), - GROUP_ID_ nvarchar(255), - LINK_TYPE_ nvarchar(255), - COMMENT_ nvarchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ nvarchar(255), - NAME_ nvarchar(255), - CONNECTOR_ID_ nvarchar(255), - ARTIFACT_ID_ nvarchar(550), - ALIAS_ nvarchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - NODE_ID_ nvarchar(550) NOT NULL, - ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - CONTENT_ nvarchar(1024) NOT NULL, - AUTHOR_ nvarchar(255), - DATE_ datetime NOT NULL, - ANSWERED_COMMENT_ID_ nvarchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - STATE_ nvarchar(255) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - REFERENCED_NODE_ID_ nvarchar(255) NOT NULL, - PROCESS_SOLUTION_ID_ nvarchar(255) NOT NULL, - TYPE_ nvarchar(255) NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.engine.sql deleted file mode 100644 index 390870c3b3b60de9c4e6e8d8c90830598ccf4252..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.engine.sql +++ /dev/null @@ -1,184 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ nvarchar(64), - VALUE_ nvarchar(300), - REV_ int, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.5', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.5)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ nvarchar(64), - REV_ int, - NAME_ nvarchar(255), - DEPLOYMENT_ID_ nvarchar(64), - BYTES_ image, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ nvarchar(64), - NAME_ nvarchar(255), - DEPLOY_TIME_ datetime, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ nvarchar(64), - REV_ int, - PROC_INST_ID_ nvarchar(64), - BUSINESS_KEY_ nvarchar(255), - PARENT_ID_ nvarchar(64), - PROC_DEF_ID_ nvarchar(64), - SUPER_EXEC_ nvarchar(64), - ACT_ID_ nvarchar(255), - IS_ACTIVE_ tinyint, - IS_CONCURRENT_ tinyint, - IS_SCOPE_ tinyint, - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ nvarchar(64) NOT NULL, - REV_ int, - TYPE_ nvarchar(255) NOT NULL, - LOCK_EXP_TIME_ datetime, - LOCK_OWNER_ nvarchar(255), - EXCLUSIVE_ bit, - EXECUTION_ID_ nvarchar(64), - PROCESS_INSTANCE_ID_ nvarchar(64), - RETRIES_ int, - EXCEPTION_STACK_ID_ nvarchar(64), - EXCEPTION_MSG_ nvarchar(255), - DUEDATE_ datetime NULL, - REPEAT_ nvarchar(255), - HANDLER_TYPE_ nvarchar(255), - HANDLER_CFG_ nvarchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ nvarchar(64), - CATEGORY_ nvarchar(255), - NAME_ nvarchar(255), - KEY_ nvarchar(255), - VERSION_ int, - DEPLOYMENT_ID_ nvarchar(64), - RESOURCE_NAME_ nvarchar(255), - DGRM_RESOURCE_NAME_ nvarchar(255), - HAS_START_FORM_KEY_ tinyint, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ nvarchar(64), - REV_ int, - EXECUTION_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - PROC_DEF_ID_ nvarchar(64), - NAME_ nvarchar(255), - PARENT_TASK_ID_ nvarchar(64), - DESCRIPTION_ nvarchar(255), - TASK_DEF_KEY_ nvarchar(255), - OWNER_ nvarchar(64), - ASSIGNEE_ nvarchar(64), - DELEGATION_ nvarchar(64), - PRIORITY_ int, - CREATE_TIME_ datetime, - DUE_DATE_ datetime, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ nvarchar(64), - REV_ int, - GROUP_ID_ nvarchar(64), - TYPE_ nvarchar(255), - USER_ID_ nvarchar(64), - TASK_ID_ nvarchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ nvarchar(64) not null, - REV_ int, - TYPE_ nvarchar(255) not null, - NAME_ nvarchar(255) not null, - EXECUTION_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - TASK_ID_ nvarchar(64), - BYTEARRAY_ID_ nvarchar(64), - DOUBLE_ double precision, - LONG_ numeric(19,0), - TEXT_ nvarchar(255), - TEXT2_ nvarchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.history.sql deleted file mode 100644 index a671bbc33d32c60f538ee1818c9ccf300d021856..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.history.sql +++ /dev/null @@ -1,105 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ nvarchar(64) not null, - PROC_INST_ID_ nvarchar(64) not null, - BUSINESS_KEY_ nvarchar(255), - PROC_DEF_ID_ nvarchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - START_USER_ID_ nvarchar(255), - START_ACT_ID_ nvarchar(255), - END_ACT_ID_ nvarchar(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ nvarchar(64) not null, - PROC_DEF_ID_ nvarchar(64) not null, - PROC_INST_ID_ nvarchar(64) not null, - EXECUTION_ID_ nvarchar(64) not null, - ACT_ID_ nvarchar(255) not null, - ACT_NAME_ nvarchar(255), - ACT_TYPE_ nvarchar(255) not null, - ASSIGNEE_ nvarchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ nvarchar(64) not null, - PROC_DEF_ID_ nvarchar(64), - TASK_DEF_KEY_ nvarchar(255), - PROC_INST_ID_ nvarchar(64), - EXECUTION_ID_ nvarchar(64), - NAME_ nvarchar(255), - PARENT_TASK_ID_ nvarchar(64), - DESCRIPTION_ nvarchar(255), - OWNER_ nvarchar(64), - ASSIGNEE_ nvarchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ numeric(19,0), - DELETE_REASON_ nvarchar(255), - PRIORITY_ int, - DUE_DATE_ datetime, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ nvarchar(64) not null, - TYPE_ nvarchar(255) not null, - PROC_INST_ID_ nvarchar(64) not null, - EXECUTION_ID_ nvarchar(64) not null, - TASK_ID_ nvarchar(64), - ACT_INST_ID_ nvarchar(64), - NAME_ nvarchar(255) not null, - VAR_TYPE_ nvarchar(255), - REV_ int, - TIME_ datetime not null, - BYTEARRAY_ID_ nvarchar(64), - DOUBLE_ double precision, - LONG_ numeric(19,0), - TEXT_ nvarchar(255), - TEXT2_ nvarchar(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ nvarchar(64) not null, - TYPE_ nvarchar(255), - TIME_ datetime not null, - USER_ID_ nvarchar(255), - TASK_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - ACTION_ nvarchar(255), - MESSAGE_ nvarchar(255), - FULL_MSG_ image, - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ nvarchar(64) not null, - REV_ integer, - USER_ID_ nvarchar(255), - NAME_ nvarchar(255), - DESCRIPTION_ nvarchar(255), - TYPE_ nvarchar(255), - TASK_ID_ nvarchar(64), - PROC_INST_ID_ nvarchar(64), - URL_ nvarchar(255), - CONTENT_ID_ nvarchar(64), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST (PROC_DEF_ID_, BUSINESS_KEY_) where BUSINESS_KEY_ is not null; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.identity.sql deleted file mode 100644 index 424d484dd99cba08d2ed4ef00668304c559a905f..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mssql.create.identity.sql +++ /dev/null @@ -1,46 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ nvarchar(64), - REV_ int, - NAME_ nvarchar(255), - TYPE_ nvarchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ nvarchar(64), - GROUP_ID_ nvarchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ nvarchar(64), - REV_ int, - FIRST_ nvarchar(255), - LAST_ nvarchar(255), - EMAIL_ nvarchar(255), - PWD_ nvarchar(255), - PICTURE_ID_ nvarchar(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ nvarchar(64), - REV_ int, - USER_ID_ nvarchar(64), - TYPE_ nvarchar(64), - KEY_ nvarchar(255), - VALUE_ nvarchar(255), - PASSWORD_ image, - PARENT_ID_ nvarchar(255), - primary key (ID_) -); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.cycle.sql deleted file mode 100644 index a0d17b291cd94ebf17a1ce1f0bc8c632f76636e5..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ text NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.engine.sql deleted file mode 100644 index 9d525174e9659eed1fb18b3f9eaab76c6c086be1..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.engine.sql +++ /dev/null @@ -1,189 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.5', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.5)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ LONGBLOB, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ TINYINT, - IS_CONCURRENT_ TINYINT, - IS_SCOPE_ TINYINT, - primary key (ID_), - unique ACT_UNIQ_RU_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp NULL, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ TINYINT, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - PARENT_TASK_ID_ varchar(64), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - DELEGATION_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - DUE_DATE_ datetime, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade; - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.history.sql deleted file mode 100644 index eefa040b0ca244dcbca8063f69c16743a58e73e2..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.history.sql +++ /dev/null @@ -1,105 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique ACT_UNIQ_HI_BUS_KEY (PROC_DEF_ID_, BUSINESS_KEY_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - PARENT_TASK_ID_ varchar(64), - DESCRIPTION_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - START_TIME_ datetime not null, - END_TIME_ datetime, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - DUE_DATE_ datetime, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(255), - REV_ integer, - TIME_ datetime not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_COMMENT ( - ID_ varchar(64) not null, - TYPE_ varchar(255), - TIME_ datetime not null, - USER_ID_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - ACTION_ varchar(255), - MESSAGE_ varchar(255), - FULL_MSG_ LONGBLOB, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_HI_ATTACHMENT ( - ID_ varchar(64) not null, - REV_ integer, - USER_ID_ varchar(255), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TYPE_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - URL_ varchar(255), - CONTENT_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.identity.sql deleted file mode 100644 index b65e5abfc571f0d036a5be3da4f5c79b3d4dd006..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.mysql.create.identity.sql +++ /dev/null @@ -1,46 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - PICTURE_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_INFO ( - ID_ varchar(64), - REV_ integer, - USER_ID_ varchar(64), - TYPE_ varchar(64), - KEY_ varchar(255), - VALUE_ varchar(255), - PASSWORD_ LONGBLOB, - PARENT_ID_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.cycle.sql deleted file mode 100644 index 77a7fc22ab55e8f8efd5ea2e24115544bc75ecd3..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - PLUGIN_ID_ NVARCHAR2(255) NOT NULL, - INSTANCE_NAME_ NVARCHAR2(255) NOT NULL, - INSTANCE_ID_ NVARCHAR2(255) NOT NULL, - USER_ NVARCHAR2(255), - GROUP_ NVARCHAR2(255), - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - GROUP_ NVARCHAR2(255) NOT NULL, - KEY_ NVARCHAR2(255) NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_REVISION_ INTEGER DEFAULT NULL, - TARGET_CONNECTOR_ID_ NVARCHAR2(255), - TARGET_ARTIFACT_ID_ NVARCHAR2(550), - TARGET_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - TARGET_REVISION_ INTEGER DEFAULT NULL, - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - LINKED_BOTH_WAYS_ NUMBER(1,0) CHECK (LINKED_BOTH_WAYS_ IN (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_REVISION_ NUMBER(19) DEFAULT NULL, - USER_ID_ NVARCHAR2(255), - GROUP_ID_ NVARCHAR2(255), - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ NVARCHAR2(255), - NAME_ NVARCHAR2(700), - CONNECTOR_ID_ NVARCHAR2(255), - ARTIFACT_ID_ NVARCHAR2(550), - ALIAS_ NVARCHAR2(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(255) NOT NULL, - NODE_ID_ NVARCHAR2(550) NOT NULL, - ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - CONTENT_ NVARCHAR2(2000) NOT NULL, - AUTHOR_ NVARCHAR2(255), - DATE_ TIMESTAMP(6) NOT NULL, - ANSWERED_COMMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - STATE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(128) NOT NULL, - REFERENCED_NODE_ID_ NVARCHAR2(550) NOT NULL, - PROCESS_SOLUTION_ID_ NVARCHAR2(128) NOT NULL, - TYPE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.engine.sql deleted file mode 100644 index 688d33872df89fc03a3bf01294bfc52b5312e519..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.engine.sql +++ /dev/null @@ -1,205 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ NVARCHAR2(64), - VALUE_ NVARCHAR2(300), - REV_ INTEGER, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.5', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.5)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - DEPLOYMENT_ID_ NVARCHAR2(64), - BYTES_ BLOB, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DEPLOY_TIME_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - PROC_INST_ID_ NVARCHAR2(64), - BUSINESS_KEY_ NVARCHAR2(255), - PARENT_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - SUPER_EXEC_ NVARCHAR2(64), - ACT_ID_ NVARCHAR2(255), - IS_ACTIVE_ NUMBER(1,0) CHECK (IS_ACTIVE_ IN (1,0)), - IS_CONCURRENT_ NUMBER(1,0) CHECK (IS_CONCURRENT_ IN (1,0)), - IS_SCOPE_ NUMBER(1,0) CHECK (IS_SCOPE_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_JOB ( - ID_ NVARCHAR2(64) NOT NULL, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) NOT NULL, - LOCK_EXP_TIME_ TIMESTAMP(6), - LOCK_OWNER_ NVARCHAR2(255), - EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)), - EXECUTION_ID_ NVARCHAR2(64), - PROCESS_INSTANCE_ID_ NVARCHAR2(64), - RETRIES_ INTEGER, - EXCEPTION_STACK_ID_ NVARCHAR2(64), - EXCEPTION_MSG_ NVARCHAR2(255), - DUEDATE_ TIMESTAMP(6), - REPEAT_ NVARCHAR2(255), - HANDLER_TYPE_ NVARCHAR2(255), - HANDLER_CFG_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ NVARCHAR2(64), - CATEGORY_ NVARCHAR2(255), - NAME_ NVARCHAR2(255), - KEY_ NVARCHAR2(255), - VERSION_ INTEGER, - DEPLOYMENT_ID_ NVARCHAR2(64), - RESOURCE_NAME_ NVARCHAR2(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ NUMBER(1,0) CHECK (HAS_START_FORM_KEY_ IN (1,0)), - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - PROC_DEF_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - PARENT_TASK_ID_ NVARCHAR2(64), - DESCRIPTION_ NVARCHAR2(255), - TASK_DEF_KEY_ NVARCHAR2(255), - OWNER_ NVARCHAR2(64), - ASSIGNEE_ NVARCHAR2(64), - DELEGATION_ NVARCHAR2(64), - PRIORITY_ INTEGER, - CREATE_TIME_ TIMESTAMP(6), - DUE_DATE_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - GROUP_ID_ NVARCHAR2(64), - TYPE_ NVARCHAR2(255), - USER_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ NVARCHAR2(64) not null, - REV_ INTEGER, - TYPE_ NVARCHAR2(255) not null, - NAME_ NVARCHAR2(255) not null, - EXECUTION_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - TASK_ID_ NVARCHAR2(64), - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_RU_BUS_KEY on ACT_RU_EXECUTION - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.history.sql deleted file mode 100644 index 8782b973b05241bdef9c6b25879ee0e76e243049..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.history.sql +++ /dev/null @@ -1,109 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - BUSINESS_KEY_ NVARCHAR2(255), - PROC_DEF_ID_ NVARCHAR2(64) not null, - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - START_USER_ID_ NVARCHAR2(255), - START_ACT_ID_ NVARCHAR2(255), - END_ACT_ID_ NVARCHAR2(255), - primary key (ID_), - unique (PROC_INST_ID_) -); - -create table ACT_HI_ACTINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - ACT_ID_ NVARCHAR2(255) not null, - ACT_NAME_ NVARCHAR2(255), - ACT_TYPE_ NVARCHAR2(255) not null, - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ NVARCHAR2(64) not null, - PROC_DEF_ID_ NVARCHAR2(64), - TASK_DEF_KEY_ NVARCHAR2(255), - PROC_INST_ID_ NVARCHAR2(64), - EXECUTION_ID_ NVARCHAR2(64), - PARENT_TASK_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - OWNER_ NVARCHAR2(64), - ASSIGNEE_ NVARCHAR2(64), - START_TIME_ TIMESTAMP(6) not null, - END_TIME_ TIMESTAMP(6), - DURATION_ NUMBER(19,0), - DELETE_REASON_ NVARCHAR2(255), - PRIORITY_ INTEGER, - DUE_DATE_ TIMESTAMP(6), - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ NVARCHAR2(255) not null, - PROC_INST_ID_ NVARCHAR2(64) not null, - EXECUTION_ID_ NVARCHAR2(64) not null, - TASK_ID_ NVARCHAR2(64), - ACT_INST_ID_ NVARCHAR2(64), - NAME_ NVARCHAR2(255) not null, - VAR_TYPE_ NVARCHAR2(64), - REV_ INTEGER, - TIME_ TIMESTAMP(6) not null, - BYTEARRAY_ID_ NVARCHAR2(64), - DOUBLE_ NUMBER(*,10), - LONG_ NUMBER(19,0), - TEXT_ NVARCHAR2(255), - TEXT2_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ NVARCHAR2(64) not null, - TYPE_ NVARCHAR2(255), - TIME_ TIMESTAMP(6) not null, - USER_ID_ NVARCHAR2(255), - TASK_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - ACTION_ NVARCHAR2(255), - MESSAGE_ NVARCHAR2(255), - FULL_MSG_ BLOB, - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ NVARCHAR2(64) not null, - REV_ INTEGER, - USER_ID_ NVARCHAR2(255), - NAME_ NVARCHAR2(255), - DESCRIPTION_ NVARCHAR2(255), - TYPE_ NVARCHAR2(255), - TASK_ID_ NVARCHAR2(64), - PROC_INST_ID_ NVARCHAR2(64), - URL_ NVARCHAR2(255), - CONTENT_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); - --- see http://stackoverflow.com/questions/675398/how-can-i-constrain-multiple-columns-to-prevent-duplicates-but-ignore-null-value -create unique index ACT_UNIQ_HI_BUS_KEY on ACT_HI_PROCINST - (case when BUSINESS_KEY_ is null then null else PROC_DEF_ID_ end, - case when BUSINESS_KEY_ is null then null else BUSINESS_KEY_ end); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.identity.sql deleted file mode 100644 index d63bac36d2355bd34953d7c29f46a694cf8d6e72..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.oracle.create.identity.sql +++ /dev/null @@ -1,48 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - TYPE_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ NVARCHAR2(64), - GROUP_ID_ NVARCHAR2(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - FIRST_ NVARCHAR2(255), - LAST_ NVARCHAR2(255), - EMAIL_ NVARCHAR2(255), - PWD_ NVARCHAR2(255), - PICTURE_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - USER_ID_ NVARCHAR2(64), - TYPE_ NVARCHAR2(64), - KEY_ NVARCHAR2(255), - VALUE_ NVARCHAR2(255), - PASSWORD_ BLOB, - PARENT_ID_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.cycle.sql deleted file mode 100644 index ea0001337e90948f78eb1a146d86115236f263e2..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(700), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ varchar(5000) NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.engine.sql deleted file mode 100644 index 709f36713999d81a50a5cc34eccfcce9c04171cd..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.engine.sql +++ /dev/null @@ -1,201 +0,0 @@ -create table ACT_GE_PROPERTY ( - NAME_ varchar(64), - VALUE_ varchar(300), - REV_ integer, - primary key (NAME_) -); - -insert into ACT_GE_PROPERTY -values ('schema.version', '5.5', 1); - -insert into ACT_GE_PROPERTY -values ('schema.history', 'create(5.5)', 1); - -insert into ACT_GE_PROPERTY -values ('next.dbid', '1', 1); - -create table ACT_GE_BYTEARRAY ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - DEPLOYMENT_ID_ varchar(64), - BYTES_ bytea, - primary key (ID_) -); - -create table ACT_RE_DEPLOYMENT ( - ID_ varchar(64), - NAME_ varchar(255), - DEPLOY_TIME_ timestamp, - primary key (ID_) -); - -create table ACT_RU_EXECUTION ( - ID_ varchar(64), - REV_ integer, - PROC_INST_ID_ varchar(64), - BUSINESS_KEY_ varchar(255), - PARENT_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - SUPER_EXEC_ varchar(64), - ACT_ID_ varchar(255), - IS_ACTIVE_ boolean, - IS_CONCURRENT_ boolean, - IS_SCOPE_ boolean, - primary key (ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_RU_JOB ( - ID_ varchar(64) NOT NULL, - REV_ integer, - TYPE_ varchar(255) NOT NULL, - LOCK_EXP_TIME_ timestamp, - LOCK_OWNER_ varchar(255), - EXCLUSIVE_ boolean, - EXECUTION_ID_ varchar(64), - PROCESS_INSTANCE_ID_ varchar(64), - RETRIES_ integer, - EXCEPTION_STACK_ID_ varchar(64), - EXCEPTION_MSG_ varchar(255), - DUEDATE_ timestamp, - REPEAT_ varchar(255), - HANDLER_TYPE_ varchar(255), - HANDLER_CFG_ varchar(255), - primary key (ID_) -); - -create table ACT_RE_PROCDEF ( - ID_ varchar(64), - CATEGORY_ varchar(255), - NAME_ varchar(255), - KEY_ varchar(255), - VERSION_ integer, - DEPLOYMENT_ID_ varchar(64), - RESOURCE_NAME_ varchar(255), - DGRM_RESOURCE_NAME_ varchar(255), - HAS_START_FORM_KEY_ boolean, - primary key (ID_) -); - -create table ACT_RU_TASK ( - ID_ varchar(64), - REV_ integer, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - PROC_DEF_ID_ varchar(64), - NAME_ varchar(255), - PARENT_TASK_ID_ varchar(64), - DESCRIPTION_ varchar(255), - TASK_DEF_KEY_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - DELEGATION_ varchar(64), - PRIORITY_ integer, - CREATE_TIME_ timestamp, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_RU_IDENTITYLINK ( - ID_ varchar(64), - REV_ integer, - GROUP_ID_ varchar(64), - TYPE_ varchar(255), - USER_ID_ varchar(64), - TASK_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_RU_VARIABLE ( - ID_ varchar(64) not null, - REV_ integer, - TYPE_ varchar(255) not null, - NAME_ varchar(255) not null, - EXECUTION_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - TASK_ID_ varchar(64), - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_); -create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_); -create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_); -create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_); - -create index ACT_IDX_BYTEAR_DEPL on ACT_GE_BYTEARRAY(DEPLOYMENT_ID_); -alter table ACT_GE_BYTEARRAY - add constraint ACT_FK_BYTEARR_DEPL - foreign key (DEPLOYMENT_ID_) - references ACT_RE_DEPLOYMENT (ID_); - -create index ACT_IDX_EXE_PROCINST on ACT_RU_EXECUTION(PROC_INST_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_PARENT on ACT_RU_EXECUTION(PARENT_ID_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_PARENT - foreign key (PARENT_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_EXE_SUPER on ACT_RU_EXECUTION(SUPER_EXEC_); -alter table ACT_RU_EXECUTION - add constraint ACT_FK_EXE_SUPER - foreign key (SUPER_EXEC_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TSKASS_TASK on ACT_RU_IDENTITYLINK(TASK_ID_); -alter table ACT_RU_IDENTITYLINK - add constraint ACT_FK_TSKASS_TASK - foreign key (TASK_ID_) - references ACT_RU_TASK (ID_); - -create index ACT_IDX_TASK_EXEC on ACT_RU_TASK(EXECUTION_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCINST on ACT_RU_TASK(PROC_INST_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_TASK_PROCDEF on ACT_RU_TASK(PROC_DEF_ID_); -alter table ACT_RU_TASK - add constraint ACT_FK_TASK_PROCDEF - foreign key (PROC_DEF_ID_) - references ACT_RE_PROCDEF (ID_); - -create index ACT_IDX_VAR_EXE on ACT_RU_VARIABLE(EXECUTION_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_EXE - foreign key (EXECUTION_ID_) - references ACT_RU_EXECUTION (ID_); - -create index ACT_IDX_VAR_PROCINST on ACT_RU_VARIABLE(PROC_INST_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_PROCINST - foreign key (PROC_INST_ID_) - references ACT_RU_EXECUTION(ID_); - -create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_); -alter table ACT_RU_VARIABLE - add constraint ACT_FK_VAR_BYTEARRAY - foreign key (BYTEARRAY_ID_) - references ACT_GE_BYTEARRAY (ID_); - -create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_); -alter table ACT_RU_JOB - add constraint ACT_FK_JOB_EXCEPTION - foreign key (EXCEPTION_STACK_ID_) - references ACT_GE_BYTEARRAY (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.history.sql deleted file mode 100644 index 129e1e838ca4531a80b963d9c10b7de1f1609625..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.history.sql +++ /dev/null @@ -1,106 +0,0 @@ -create table ACT_HI_PROCINST ( - ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - BUSINESS_KEY_ varchar(255), - PROC_DEF_ID_ varchar(64) not null, - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - START_USER_ID_ varchar(255), - START_ACT_ID_ varchar(255), - END_ACT_ID_ varchar(255), - primary key (ID_), - unique (PROC_INST_ID_), - unique (PROC_DEF_ID_, BUSINESS_KEY_) -); - -create table ACT_HI_ACTINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - ACT_ID_ varchar(255) not null, - ACT_NAME_ varchar(255), - ACT_TYPE_ varchar(255) not null, - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - primary key (ID_) -); - -create table ACT_HI_TASKINST ( - ID_ varchar(64) not null, - PROC_DEF_ID_ varchar(64), - TASK_DEF_KEY_ varchar(255), - PROC_INST_ID_ varchar(64), - EXECUTION_ID_ varchar(64), - NAME_ varchar(255), - PARENT_TASK_ID_ varchar(64), - DESCRIPTION_ varchar(255), - OWNER_ varchar(64), - ASSIGNEE_ varchar(64), - START_TIME_ timestamp not null, - END_TIME_ timestamp, - DURATION_ bigint, - DELETE_REASON_ varchar(255), - PRIORITY_ integer, - DUE_DATE_ timestamp, - primary key (ID_) -); - -create table ACT_HI_DETAIL ( - ID_ varchar(64) not null, - TYPE_ varchar(255) not null, - PROC_INST_ID_ varchar(64) not null, - EXECUTION_ID_ varchar(64) not null, - TASK_ID_ varchar(64), - ACT_INST_ID_ varchar(64), - NAME_ varchar(255) not null, - VAR_TYPE_ varchar(64), - REV_ integer, - TIME_ timestamp not null, - BYTEARRAY_ID_ varchar(64), - DOUBLE_ double precision, - LONG_ bigint, - TEXT_ varchar(255), - TEXT2_ varchar(255), - primary key (ID_) -); - -create table ACT_HI_COMMENT ( - ID_ varchar(64) not null, - TYPE_ varchar(255), - TIME_ timestamp not null, - USER_ID_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - ACTION_ varchar(255), - MESSAGE_ varchar(255), - FULL_MSG_ bytea, - primary key (ID_) -); - -create table ACT_HI_ATTACHMENT ( - ID_ varchar(64) not null, - REV_ integer, - USER_ID_ varchar(255), - NAME_ varchar(255), - DESCRIPTION_ varchar(255), - TYPE_ varchar(255), - TASK_ID_ varchar(64), - PROC_INST_ID_ varchar(64), - URL_ varchar(255), - CONTENT_ID_ varchar(64), - primary key (ID_) -); - - -create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_); -create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_); -create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_); -create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_); -create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_); -create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_); -create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_); -create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.identity.sql deleted file mode 100644 index 04e4fa96940fb09ef5b1228147cd8e3e160f3dd2..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/create/activiti.postgres.create.identity.sql +++ /dev/null @@ -1,48 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - PICTURE_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ varchar(64), - REV_ integer, - USER_ID_ varchar(64), - TYPE_ varchar(64), - KEY_ varchar(255), - VALUE_ varchar(255), - PASSWORD_ bytea, - PARENT_ID_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.h2.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.h2.drop.sql deleted file mode 100644 index 256fe5c87ada4951a01ff2b6c61f2db14915711a..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.h2.drop.sql +++ /dev/null @@ -1,77 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY; -drop index ACT_IDX_TASK_CREATE; -drop index ACT_IDX_IDENT_LNK_USER; -drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; - -alter table ACT_GE_BYTEARRAY - drop constraint ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_RU_EXECUTION - drop constraint ACT_UNIQ_RU_BUS_KEY; - -alter table ACT_HI_PROCINST - drop constraint ACT_UNIQ_HI_BUS_KEY; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop constraint ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop constraint ACT_FK_JOB_EXCEPTION; - -drop table ACT_GE_PROPERTY if exists; -drop table ACT_GE_BYTEARRAY if exists; -drop table ACT_RE_DEPLOYMENT if exists; -drop table ACT_RU_EXECUTION if exists; -drop table ACT_ID_GROUP if exists; -drop table ACT_ID_MEMBERSHIP if exists; -drop table ACT_ID_USER if exists; -drop table ACT_RU_JOB if exists; -drop table ACT_RE_PROCDEF if exists; -drop table ACT_RU_TASK if exists; -drop table ACT_RU_IDENTITYLINK if exists; -drop table ACT_RU_VARIABLE if exists; -drop table ACT_HI_PROCINST if exists; -drop table ACT_HI_ACTINST if exists; -drop table ACT_HI_TASKINST if exists; -drop table ACT_HI_DETAIL if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.mysql.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.mysql.drop.sql deleted file mode 100644 index 908af447abd1f9c9f945dca230d979572d745d96..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.mysql.drop.sql +++ /dev/null @@ -1,73 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; -drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; -drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; -drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; -drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; -drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; -drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; - - -alter table ACT_GE_BYTEARRAY - drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop FOREIGN KEY ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; - - drop table if exists ACT_GE_PROPERTY; - drop table if exists ACT_RU_VARIABLE; - drop table if exists ACT_GE_BYTEARRAY; - drop table if exists ACT_RE_DEPLOYMENT; - drop table if exists ACT_RU_IDENTITYLINK; - drop table if exists ACT_RU_TASK; - drop table if exists ACT_RE_PROCDEF; - drop table if exists ACT_RU_EXECUTION; - drop table if exists ACT_ID_MEMBERSHIP; - drop table if exists ACT_ID_GROUP; - drop table if exists ACT_ID_USER; - drop table if exists ACT_RU_JOB; - drop table if exists ACT_HI_PROCINST; - drop table if exists ACT_HI_ACTINST; - drop table if exists ACT_HI_TASKINST; - drop table if exists ACT_HI_DETAIL; - \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.oracle.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.oracle.drop.sql deleted file mode 100644 index 94cc9bee4a73871453850f088e5f8238b7f16ff8..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.oracle.drop.sql +++ /dev/null @@ -1,86 +0,0 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; -drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; -drop index ACT_IDX_TSKASS_TASK; -drop index ACT_IDX_TASK_EXEC; -drop index ACT_IDX_TASK_PROCINST; -drop index ACT_IDX_TASK_PROCDEF; -drop index ACT_IDX_VAR_EXE; -drop index ACT_IDX_VAR_PROCINST; -drop index ACT_IDX_VAR_BYTEARRAY; -drop index ACT_IDX_JOB_EXCEPTION; - -drop index ACT_IDX_EXEC_BUSKEY; -drop index ACT_IDX_TASK_CREATE; -drop index ACT_IDX_IDENT_LNK_USER; -drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; - -alter table ACT_GE_BYTEARRAY - drop CONSTRAINT ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop CONSTRAINT ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop CONSTRAINT ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop CONSTRAINT ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop CONSTRAINT ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop CONSTRAINT ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop CONSTRAINT ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop CONSTRAINT ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop CONSTRAINT ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop CONSTRAINT ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop CONSTRAINT ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop CONSTRAINT ACT_FK_JOB_EXCEPTION; - -drop table ACT_GE_PROPERTY; -drop table ACT_RU_VARIABLE; -drop table ACT_GE_BYTEARRAY; -drop table ACT_RE_DEPLOYMENT; -drop table ACT_RU_IDENTITYLINK; -drop table ACT_RU_TASK; -drop table ACT_RE_PROCDEF; -drop table ACT_RU_EXECUTION; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_GROUP; -drop table ACT_ID_USER; -drop table ACT_RU_JOB; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.postgres.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.postgres.drop.sql deleted file mode 100644 index 51111fea940251dbf93c3eebb66cadc9bd973da9..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.5/drop/activiti.postgres.drop.sql +++ /dev/null @@ -1,86 +0,0 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; -drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; -drop index ACT_IDX_TSKASS_TASK; -drop index ACT_IDX_TASK_EXEC; -drop index ACT_IDX_TASK_PROCINST; -drop index ACT_IDX_TASK_PROCDEF; -drop index ACT_IDX_VAR_EXE; -drop index ACT_IDX_VAR_PROCINST; -drop index ACT_IDX_VAR_BYTEARRAY; -drop index ACT_IDX_JOB_EXCEPTION; - -drop index ACT_IDX_EXEC_BUSKEY; -drop index ACT_IDX_TASK_CREATE; -drop index ACT_IDX_IDENT_LNK_USER; -drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; - -alter table ACT_GE_BYTEARRAY - drop constraint ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop constraint ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop constraint ACT_FK_JOB_EXCEPTION; - -drop table ACT_GE_PROPERTY; -drop table ACT_GE_BYTEARRAY; -drop table ACT_RE_DEPLOYMENT; -drop table ACT_RU_EXECUTION; -drop table ACT_ID_GROUP; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_USER; -drop table ACT_RU_JOB; -drop table ACT_RE_PROCDEF; -drop table ACT_RU_TASK; -drop table ACT_RU_IDENTITYLINK; -drop table ACT_RU_VARIABLE; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.cycle.sql deleted file mode 100644 index 85379b78091699a60cd04b76476e2117960aa553..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.cycle.sql +++ /dev/null @@ -1,97 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) not null, - PLUGIN_ID_ varchar(255) not null, - INSTANCE_NAME_ varchar(255) not null, - INSTANCE_ID_ varchar(255) not null, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ varchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) not null, - GROUP_ varchar(255) not null, - KEY_ varchar(255) not null, - VALUE_ varchar(1024) not null, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) default null, - SOURCE_ELEMENT_NAME_ varchar(255) default null, - SOURCE_REVISION_ bigint default null, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) default null, - TARGET_ELEMENT_NAME_ varchar(255) default null, - TARGET_REVISION_ bigint default null, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ smallint check(LINKED_BOTH_WAYS_ in (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint default null, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255) not null, - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) not null, - CONNECTOR_ID_ varchar(255) not null, - NODE_ID_ varchar(550) not null, - ELEMENT_ID_ varchar(255) default null, - CONTENT_ varchar(1024) not null, - AUTHOR_ varchar(255), - DATE_ timestamp not null, - ANSWERED_COMMENT_ID_ varchar(255) default null, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ v(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.identity.sql deleted file mode 100644 index 9e5b67a23f15b7f0bb1bd3339a8b0d62a9fd93a2..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.db2.create.identity.sql +++ /dev/null @@ -1,46 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64) not null, - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64) not null, - GROUP_ID_ varchar(64) not null, - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64) not null, - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - PICTURE_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ varchar(64) not null, - REV_ integer, - USER_ID_ varchar(64), - TYPE_ varchar(64), - KEY_ varchar(255), - VALUE_ varchar(255), - PASSWORD_ BLOB, - PARENT_ID_ varchar(255), - primary key (ID_) -); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.cycle.sql deleted file mode 100644 index c6cd75832f258346603e40dcbbda0df5aaf4191c..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar NOT NULL, - PLUGIN_ID_ varchar NOT NULL, - INSTANCE_NAME_ varchar NOT NULL, - INSTANCE_ID_ varchar NOT NULL, - USER_ varchar, - GROUP_ varchar, - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar NOT NULL, - GROUP_ varchar NOT NULL, - KEY_ varchar NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_ELEMENT_ID_ varchar DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar, - TARGET_ARTIFACT_ID_ varchar, - TARGET_ELEMENT_ID_ varchar DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar, - COMMENT_ varchar, - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar, - GROUP_ID_ varchar, - LINK_TYPE_ varchar, - COMMENT_ varchar, - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar NOT NULL, - NAME_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - ARTIFACT_ID_ varchar NOT NULL, - ALIAS_ varchar DEFAULT NULL, - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - NODE_ID_ varchar NOT NULL, - ELEMENT_ID_ varchar DEFAULT NULL, - CONTENT_ varchar NOT NULL, - AUTHOR_ varchar, - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT; - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - STATE_ varchar NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - REFERENCED_NODE_ID_ varchar NOT NULL, - PROCESS_SOLUTION_ID_ varchar NOT NULL, - TYPE_ varchar NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.identity.sql deleted file mode 100644 index 80c03fbe7d245f4d720b94e04e3d7c0fbb576db5..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.h2.create.identity.sql +++ /dev/null @@ -1,46 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - PICTURE_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ varchar(64), - REV_ integer, - USER_ID_ varchar(64), - TYPE_ varchar(64), - KEY_ varchar(255), - VALUE_ varchar(255), - PASSWORD_ longvarbinary, - PARENT_ID_ varchar(255), - primary key (ID_) -); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP; - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.cycle.sql deleted file mode 100644 index ac8b328a98e571bdeeb3d142b01f889f9d6c0c5f..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ nvarchar(255), - PLUGIN_ID_ nvarchar(255), - INSTANCE_NAME_ nvarchar(255), - INSTANCE_ID_ nvarchar(255), - USER_ nvarchar(255), - GROUP_ nvarchar(255), - VALUES_ nvarchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ nvarchar(255), - GROUP_ nvarchar(255), - KEY_ nvarchar(255), - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - TARGET_CONNECTOR_ID_ nvarchar(255), - TARGET_ARTIFACT_ID_ nvarchar(550), - TARGET_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - TARGET_REVISION_ numeric(19,0) DEFAULT NULL, - LINK_TYPE_ nvarchar(255) , - COMMENT_ nvarchar(1000), - LINKED_BOTH_WAYS_ bit, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - USER_ID_ nvarchar(255), - GROUP_ID_ nvarchar(255), - LINK_TYPE_ nvarchar(255), - COMMENT_ nvarchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ nvarchar(255), - NAME_ nvarchar(255), - CONNECTOR_ID_ nvarchar(255), - ARTIFACT_ID_ nvarchar(550), - ALIAS_ nvarchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - NODE_ID_ nvarchar(550) NOT NULL, - ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - CONTENT_ nvarchar(1024) NOT NULL, - AUTHOR_ nvarchar(255), - DATE_ datetime NOT NULL, - ANSWERED_COMMENT_ID_ nvarchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - STATE_ nvarchar(255) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - REFERENCED_NODE_ID_ nvarchar(255) NOT NULL, - PROCESS_SOLUTION_ID_ nvarchar(255) NOT NULL, - TYPE_ nvarchar(255) NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.identity.sql deleted file mode 100644 index 424d484dd99cba08d2ed4ef00668304c559a905f..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mssql.create.identity.sql +++ /dev/null @@ -1,46 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ nvarchar(64), - REV_ int, - NAME_ nvarchar(255), - TYPE_ nvarchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ nvarchar(64), - GROUP_ID_ nvarchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ nvarchar(64), - REV_ int, - FIRST_ nvarchar(255), - LAST_ nvarchar(255), - EMAIL_ nvarchar(255), - PWD_ nvarchar(255), - PICTURE_ID_ nvarchar(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ nvarchar(64), - REV_ int, - USER_ID_ nvarchar(64), - TYPE_ nvarchar(64), - KEY_ nvarchar(255), - VALUE_ nvarchar(255), - PASSWORD_ image, - PARENT_ID_ nvarchar(255), - primary key (ID_) -); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.cycle.sql deleted file mode 100644 index a0d17b291cd94ebf17a1ce1f0bc8c632f76636e5..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ text NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.identity.sql deleted file mode 100644 index b65e5abfc571f0d036a5be3da4f5c79b3d4dd006..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.mysql.create.identity.sql +++ /dev/null @@ -1,46 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - PICTURE_ID_ varchar(64), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_ID_INFO ( - ID_ varchar(64), - REV_ integer, - USER_ID_ varchar(64), - TYPE_ varchar(64), - KEY_ varchar(255), - VALUE_ varchar(255), - PASSWORD_ LONGBLOB, - PARENT_ID_ varchar(255), - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.cycle.sql deleted file mode 100644 index 77a7fc22ab55e8f8efd5ea2e24115544bc75ecd3..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - PLUGIN_ID_ NVARCHAR2(255) NOT NULL, - INSTANCE_NAME_ NVARCHAR2(255) NOT NULL, - INSTANCE_ID_ NVARCHAR2(255) NOT NULL, - USER_ NVARCHAR2(255), - GROUP_ NVARCHAR2(255), - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - GROUP_ NVARCHAR2(255) NOT NULL, - KEY_ NVARCHAR2(255) NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_REVISION_ INTEGER DEFAULT NULL, - TARGET_CONNECTOR_ID_ NVARCHAR2(255), - TARGET_ARTIFACT_ID_ NVARCHAR2(550), - TARGET_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - TARGET_REVISION_ INTEGER DEFAULT NULL, - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - LINKED_BOTH_WAYS_ NUMBER(1,0) CHECK (LINKED_BOTH_WAYS_ IN (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_REVISION_ NUMBER(19) DEFAULT NULL, - USER_ID_ NVARCHAR2(255), - GROUP_ID_ NVARCHAR2(255), - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ NVARCHAR2(255), - NAME_ NVARCHAR2(700), - CONNECTOR_ID_ NVARCHAR2(255), - ARTIFACT_ID_ NVARCHAR2(550), - ALIAS_ NVARCHAR2(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(255) NOT NULL, - NODE_ID_ NVARCHAR2(550) NOT NULL, - ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - CONTENT_ NVARCHAR2(2000) NOT NULL, - AUTHOR_ NVARCHAR2(255), - DATE_ TIMESTAMP(6) NOT NULL, - ANSWERED_COMMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - STATE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(128) NOT NULL, - REFERENCED_NODE_ID_ NVARCHAR2(550) NOT NULL, - PROCESS_SOLUTION_ID_ NVARCHAR2(128) NOT NULL, - TYPE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.identity.sql deleted file mode 100644 index d63bac36d2355bd34953d7c29f46a694cf8d6e72..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.oracle.create.identity.sql +++ /dev/null @@ -1,48 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - NAME_ NVARCHAR2(255), - TYPE_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ NVARCHAR2(64), - GROUP_ID_ NVARCHAR2(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - FIRST_ NVARCHAR2(255), - LAST_ NVARCHAR2(255), - EMAIL_ NVARCHAR2(255), - PWD_ NVARCHAR2(255), - PICTURE_ID_ NVARCHAR2(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ NVARCHAR2(64), - REV_ INTEGER, - USER_ID_ NVARCHAR2(64), - TYPE_ NVARCHAR2(64), - KEY_ NVARCHAR2(255), - VALUE_ NVARCHAR2(255), - PASSWORD_ BLOB, - PARENT_ID_ NVARCHAR2(255), - primary key (ID_) -); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.cycle.sql deleted file mode 100644 index ea0001337e90948f78eb1a146d86115236f263e2..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(700), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ varchar(5000) NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.identity.sql deleted file mode 100644 index 04e4fa96940fb09ef5b1228147cd8e3e160f3dd2..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/create/activiti.postgres.create.identity.sql +++ /dev/null @@ -1,48 +0,0 @@ -create table ACT_ID_GROUP ( - ID_ varchar(64), - REV_ integer, - NAME_ varchar(255), - TYPE_ varchar(255), - primary key (ID_) -); - -create table ACT_ID_MEMBERSHIP ( - USER_ID_ varchar(64), - GROUP_ID_ varchar(64), - primary key (USER_ID_, GROUP_ID_) -); - -create table ACT_ID_USER ( - ID_ varchar(64), - REV_ integer, - FIRST_ varchar(255), - LAST_ varchar(255), - EMAIL_ varchar(255), - PWD_ varchar(255), - PICTURE_ID_ varchar(64), - primary key (ID_) -); - -create table ACT_ID_INFO ( - ID_ varchar(64), - REV_ integer, - USER_ID_ varchar(64), - TYPE_ varchar(64), - KEY_ varchar(255), - VALUE_ varchar(255), - PASSWORD_ bytea, - PARENT_ID_ varchar(255), - primary key (ID_) -); - -create index ACT_IDX_MEMB_GROUP on ACT_ID_MEMBERSHIP(GROUP_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_GROUP - foreign key (GROUP_ID_) - references ACT_ID_GROUP (ID_); - -create index ACT_IDX_MEMB_USER on ACT_ID_MEMBERSHIP(USER_ID_); -alter table ACT_ID_MEMBERSHIP - add constraint ACT_FK_MEMB_USER - foreign key (USER_ID_) - references ACT_ID_USER (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/drop/activiti.h2.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/drop/activiti.h2.drop.sql deleted file mode 100644 index 256fe5c87ada4951a01ff2b6c61f2db14915711a..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/drop/activiti.h2.drop.sql +++ /dev/null @@ -1,77 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY; -drop index ACT_IDX_TASK_CREATE; -drop index ACT_IDX_IDENT_LNK_USER; -drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; - -alter table ACT_GE_BYTEARRAY - drop constraint ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_RU_EXECUTION - drop constraint ACT_UNIQ_RU_BUS_KEY; - -alter table ACT_HI_PROCINST - drop constraint ACT_UNIQ_HI_BUS_KEY; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop constraint ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop constraint ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop constraint ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop constraint ACT_FK_JOB_EXCEPTION; - -drop table ACT_GE_PROPERTY if exists; -drop table ACT_GE_BYTEARRAY if exists; -drop table ACT_RE_DEPLOYMENT if exists; -drop table ACT_RU_EXECUTION if exists; -drop table ACT_ID_GROUP if exists; -drop table ACT_ID_MEMBERSHIP if exists; -drop table ACT_ID_USER if exists; -drop table ACT_RU_JOB if exists; -drop table ACT_RE_PROCDEF if exists; -drop table ACT_RU_TASK if exists; -drop table ACT_RU_IDENTITYLINK if exists; -drop table ACT_RU_VARIABLE if exists; -drop table ACT_HI_PROCINST if exists; -drop table ACT_HI_ACTINST if exists; -drop table ACT_HI_TASKINST if exists; -drop table ACT_HI_DETAIL if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/drop/activiti.mysql.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/drop/activiti.mysql.drop.sql deleted file mode 100644 index 908af447abd1f9c9f945dca230d979572d745d96..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/drop/activiti.mysql.drop.sql +++ /dev/null @@ -1,73 +0,0 @@ -drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; -drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; -drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; -drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; -drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; -drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; -drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; -drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; -drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; - - -alter table ACT_GE_BYTEARRAY - drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop FOREIGN KEY ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop FOREIGN KEY ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop FOREIGN KEY ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop FOREIGN KEY ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; - - drop table if exists ACT_GE_PROPERTY; - drop table if exists ACT_RU_VARIABLE; - drop table if exists ACT_GE_BYTEARRAY; - drop table if exists ACT_RE_DEPLOYMENT; - drop table if exists ACT_RU_IDENTITYLINK; - drop table if exists ACT_RU_TASK; - drop table if exists ACT_RE_PROCDEF; - drop table if exists ACT_RU_EXECUTION; - drop table if exists ACT_ID_MEMBERSHIP; - drop table if exists ACT_ID_GROUP; - drop table if exists ACT_ID_USER; - drop table if exists ACT_RU_JOB; - drop table if exists ACT_HI_PROCINST; - drop table if exists ACT_HI_ACTINST; - drop table if exists ACT_HI_TASKINST; - drop table if exists ACT_HI_DETAIL; - \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/drop/activiti.oracle.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/drop/activiti.oracle.drop.sql deleted file mode 100644 index 94cc9bee4a73871453850f088e5f8238b7f16ff8..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.6/drop/activiti.oracle.drop.sql +++ /dev/null @@ -1,86 +0,0 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; -drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; -drop index ACT_IDX_TSKASS_TASK; -drop index ACT_IDX_TASK_EXEC; -drop index ACT_IDX_TASK_PROCINST; -drop index ACT_IDX_TASK_PROCDEF; -drop index ACT_IDX_VAR_EXE; -drop index ACT_IDX_VAR_PROCINST; -drop index ACT_IDX_VAR_BYTEARRAY; -drop index ACT_IDX_JOB_EXCEPTION; - -drop index ACT_IDX_EXEC_BUSKEY; -drop index ACT_IDX_TASK_CREATE; -drop index ACT_IDX_IDENT_LNK_USER; -drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; - -alter table ACT_GE_BYTEARRAY - drop CONSTRAINT ACT_FK_BYTEARR_DEPL; - -alter table ACT_RU_EXECUTION - drop CONSTRAINT ACT_FK_EXE_PROCINST; - -alter table ACT_RU_EXECUTION - drop CONSTRAINT ACT_FK_EXE_PARENT; - -alter table ACT_RU_EXECUTION - drop CONSTRAINT ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_USER; - -alter table ACT_RU_IDENTITYLINK - drop CONSTRAINT ACT_FK_TSKASS_TASK; - -alter table ACT_RU_TASK - drop CONSTRAINT ACT_FK_TASK_EXE; - -alter table ACT_RU_TASK - drop CONSTRAINT ACT_FK_TASK_PROCINST; - -alter table ACT_RU_TASK - drop CONSTRAINT ACT_FK_TASK_PROCDEF; - -alter table ACT_RU_VARIABLE - drop CONSTRAINT ACT_FK_VAR_EXE; - -alter table ACT_RU_VARIABLE - drop CONSTRAINT ACT_FK_VAR_PROCINST; - -alter table ACT_RU_VARIABLE - drop CONSTRAINT ACT_FK_VAR_BYTEARRAY; - -alter table ACT_RU_JOB - drop CONSTRAINT ACT_FK_JOB_EXCEPTION; - -drop table ACT_GE_PROPERTY; -drop table ACT_RU_VARIABLE; -drop table ACT_GE_BYTEARRAY; -drop table ACT_RE_DEPLOYMENT; -drop table ACT_RU_IDENTITYLINK; -drop table ACT_RU_TASK; -drop table ACT_RE_PROCDEF; -drop table ACT_RU_EXECUTION; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_GROUP; -drop table ACT_ID_USER; -drop table ACT_RU_JOB; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.db2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.db2.create.cycle.sql deleted file mode 100644 index 85379b78091699a60cd04b76476e2117960aa553..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.db2.create.cycle.sql +++ /dev/null @@ -1,97 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) not null, - PLUGIN_ID_ varchar(255) not null, - INSTANCE_NAME_ varchar(255) not null, - INSTANCE_ID_ varchar(255) not null, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ varchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) not null, - GROUP_ varchar(255) not null, - KEY_ varchar(255) not null, - VALUE_ varchar(1024) not null, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) default null, - SOURCE_ELEMENT_NAME_ varchar(255) default null, - SOURCE_REVISION_ bigint default null, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) default null, - TARGET_ELEMENT_NAME_ varchar(255) default null, - TARGET_REVISION_ bigint default null, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ smallint check(LINKED_BOTH_WAYS_ in (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint default null, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255) not null, - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) not null, - CONNECTOR_ID_ varchar(255) not null, - NODE_ID_ varchar(550) not null, - ELEMENT_ID_ varchar(255) default null, - CONTENT_ varchar(1024) not null, - AUTHOR_ varchar(255), - DATE_ timestamp not null, - ANSWERED_COMMENT_ID_ varchar(255) default null, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ v(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.h2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.h2.create.cycle.sql deleted file mode 100644 index c6cd75832f258346603e40dcbbda0df5aaf4191c..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.h2.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar NOT NULL, - PLUGIN_ID_ varchar NOT NULL, - INSTANCE_NAME_ varchar NOT NULL, - INSTANCE_ID_ varchar NOT NULL, - USER_ varchar, - GROUP_ varchar, - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar NOT NULL, - GROUP_ varchar NOT NULL, - KEY_ varchar NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_ELEMENT_ID_ varchar DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar, - TARGET_ARTIFACT_ID_ varchar, - TARGET_ELEMENT_ID_ varchar DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar, - COMMENT_ varchar, - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar, - GROUP_ID_ varchar, - LINK_TYPE_ varchar, - COMMENT_ varchar, - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar NOT NULL, - NAME_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - ARTIFACT_ID_ varchar NOT NULL, - ALIAS_ varchar DEFAULT NULL, - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - NODE_ID_ varchar NOT NULL, - ELEMENT_ID_ varchar DEFAULT NULL, - CONTENT_ varchar NOT NULL, - AUTHOR_ varchar, - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT; - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - STATE_ varchar NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - REFERENCED_NODE_ID_ varchar NOT NULL, - PROCESS_SOLUTION_ID_ varchar NOT NULL, - TYPE_ varchar NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.mssql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.mssql.create.cycle.sql deleted file mode 100644 index ac8b328a98e571bdeeb3d142b01f889f9d6c0c5f..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.mssql.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ nvarchar(255), - PLUGIN_ID_ nvarchar(255), - INSTANCE_NAME_ nvarchar(255), - INSTANCE_ID_ nvarchar(255), - USER_ nvarchar(255), - GROUP_ nvarchar(255), - VALUES_ nvarchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ nvarchar(255), - GROUP_ nvarchar(255), - KEY_ nvarchar(255), - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - TARGET_CONNECTOR_ID_ nvarchar(255), - TARGET_ARTIFACT_ID_ nvarchar(550), - TARGET_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - TARGET_REVISION_ numeric(19,0) DEFAULT NULL, - LINK_TYPE_ nvarchar(255) , - COMMENT_ nvarchar(1000), - LINKED_BOTH_WAYS_ bit, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - USER_ID_ nvarchar(255), - GROUP_ID_ nvarchar(255), - LINK_TYPE_ nvarchar(255), - COMMENT_ nvarchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ nvarchar(255), - NAME_ nvarchar(255), - CONNECTOR_ID_ nvarchar(255), - ARTIFACT_ID_ nvarchar(550), - ALIAS_ nvarchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - NODE_ID_ nvarchar(550) NOT NULL, - ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - CONTENT_ nvarchar(1024) NOT NULL, - AUTHOR_ nvarchar(255), - DATE_ datetime NOT NULL, - ANSWERED_COMMENT_ID_ nvarchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - STATE_ nvarchar(255) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - REFERENCED_NODE_ID_ nvarchar(255) NOT NULL, - PROCESS_SOLUTION_ID_ nvarchar(255) NOT NULL, - TYPE_ nvarchar(255) NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.mysql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.mysql.create.cycle.sql deleted file mode 100644 index a0d17b291cd94ebf17a1ce1f0bc8c632f76636e5..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.mysql.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ text NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.oracle.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.oracle.create.cycle.sql deleted file mode 100644 index 77a7fc22ab55e8f8efd5ea2e24115544bc75ecd3..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.oracle.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - PLUGIN_ID_ NVARCHAR2(255) NOT NULL, - INSTANCE_NAME_ NVARCHAR2(255) NOT NULL, - INSTANCE_ID_ NVARCHAR2(255) NOT NULL, - USER_ NVARCHAR2(255), - GROUP_ NVARCHAR2(255), - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - GROUP_ NVARCHAR2(255) NOT NULL, - KEY_ NVARCHAR2(255) NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_REVISION_ INTEGER DEFAULT NULL, - TARGET_CONNECTOR_ID_ NVARCHAR2(255), - TARGET_ARTIFACT_ID_ NVARCHAR2(550), - TARGET_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - TARGET_REVISION_ INTEGER DEFAULT NULL, - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - LINKED_BOTH_WAYS_ NUMBER(1,0) CHECK (LINKED_BOTH_WAYS_ IN (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_REVISION_ NUMBER(19) DEFAULT NULL, - USER_ID_ NVARCHAR2(255), - GROUP_ID_ NVARCHAR2(255), - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ NVARCHAR2(255), - NAME_ NVARCHAR2(700), - CONNECTOR_ID_ NVARCHAR2(255), - ARTIFACT_ID_ NVARCHAR2(550), - ALIAS_ NVARCHAR2(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(255) NOT NULL, - NODE_ID_ NVARCHAR2(550) NOT NULL, - ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - CONTENT_ NVARCHAR2(2000) NOT NULL, - AUTHOR_ NVARCHAR2(255), - DATE_ TIMESTAMP(6) NOT NULL, - ANSWERED_COMMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - STATE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(128) NOT NULL, - REFERENCED_NODE_ID_ NVARCHAR2(550) NOT NULL, - PROCESS_SOLUTION_ID_ NVARCHAR2(128) NOT NULL, - TYPE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.postgres.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.postgres.create.cycle.sql deleted file mode 100644 index ea0001337e90948f78eb1a146d86115236f263e2..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/create/activiti.postgres.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(700), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ varchar(5000) NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/db2.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/db2.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..a8a604e6137cf355272c03b014618b38b77ce2c5 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/db2.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', TIMESTAMP ('2012-11-22 15:44:05')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', blob(X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + TIMESTAMP ('2012-11-22 15:44:06'), + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + TIMESTAMP ('2012-11-22 15:44:06'), + TIMESTAMP ('2012-11-22 15:44:06'), + 9 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + TIMESTAMP ('2012-11-22 15:44:06'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + TIMESTAMP ('2012-11-22 15:44:06'), + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + TIMESTAMP ('2012-11-22 15:44:06'), + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + TIMESTAMP ('2012-11-22 15:44:07'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + TIMESTAMP ('2012-11-22 15:44:07'), + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + TIMESTAMP ('2012-11-22 15:44:07'), + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = TIMESTAMP ('2012-11-22 15:44:07'), + DURATION_ = 547 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = TIMESTAMP ('2012-11-22 15:44:06'), + DURATION_ = 484, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', TIMESTAMP ('2012-11-22 15:44:07')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', blob(X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + TIMESTAMP ('2012-11-22 15:44:07'), + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + TIMESTAMP ('2012-11-22 15:44:07'), + TIMESTAMP ('2012-11-22 15:44:07'), + 27 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + TIMESTAMP ('2012-11-22 15:44:07'), + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + TIMESTAMP ('2012-11-22 15:44:07'), + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + TIMESTAMP ('2012-11-22 15:44:07'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + TIMESTAMP ('2012-11-22 15:44:07'), + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + TIMESTAMP ('2012-11-22 15:44:07'), + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/h2.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/h2.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..2a00c818baefcb9f0b42ec0934eb41aad0977377 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/h2.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-19 17:52:15'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-19 17:52:16', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-19 17:52:16', + '2012-11-19 17:52:16', + 24 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-19 17:52:16', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-19 17:52:16', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-19 17:52:16', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-19 17:52:16', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-19 17:52:16', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-19 17:52:16', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 17:52:16', + DURATION_ = 319 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 17:52:16', + DURATION_ = 277, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-19 17:52:16'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-19 17:52:17', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-19 17:52:17', + '2012-11-19 17:52:17', + 8 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-19 17:52:17', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-19 17:52:17', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-19 17:52:17', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-19 17:52:17', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-19 17:52:17', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/mssql.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/mssql.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..bf2f170acf5ac633f956ea3cc1b3ed6a4592cb42 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/mssql.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-21 16:31:10'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-21 16:31:11', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-21 16:31:11', + '2012-11-21 16:31:11', + 22 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-21 16:31:11', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-21 16:31:11', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-21 16:31:11', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-21 16:31:12', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-21 16:31:12', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-21 16:31:12', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-21 16:31:12', + DURATION_ = 884, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-21 16:31:12', + DURATION_ = 998 + where ID_ = '6'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-21 16:31:13'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-21 16:31:13', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-21 16:31:13', + '2012-11-21 16:31:13', + 52 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-21 16:31:13', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-21 16:31:13', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-21 16:31:13', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-21 16:31:13', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-21 16:31:13', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/mysql.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/mysql.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..134a12f91e922026771b60cbc432b9cc8883594b --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/mysql.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-19 15:42:53'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-19 15:42:54', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-19 15:42:54', + '2012-11-19 15:42:54', + 31 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-19 15:42:54', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-19 15:42:54', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-19 15:42:54', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-19 15:42:54', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-19 15:42:54', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-19 15:42:54', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 15:42:54', + DURATION_ = 400 + where ID_ = '6'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 15:42:54', + DURATION_ = 363, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-19 15:42:54'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-19 15:42:54', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-19 15:42:54', + '2012-11-19 15:42:54', + 6 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-19 15:42:54', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-19 15:42:54', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-19 15:42:54', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-19 15:42:54', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-19 15:42:54', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/oracle.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/oracle.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..2692374723f5ec7611eaedf6e86e1c2fdfd6e185 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/oracle.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', to_timestamp('2012-11-21 10:42:43.572', 'YYYY-MM-DD HH:MI:SS.FF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + to_timestamp('2012-11-21 10:42:44.441', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 10:42:44.441', 'YYYY-MM-DD HH:MI:SS.FF'), + to_timestamp('2012-11-21 10:42:44.448', 'YYYY-MM-DD HH:MI:SS.FF'), + 7 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + to_timestamp('2012-11-21 10:42:44.449', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + to_timestamp('2012-11-21 10:42:44.449', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + to_timestamp('2012-11-21 10:42:44.449', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + to_timestamp('2012-11-21 10:42:45.16', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + to_timestamp('2012-11-21 10:42:45.16', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + to_timestamp('2012-11-21 10:42:45.16', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 10:42:45.16', 'YYYY-MM-DD HH:MI:SS.FF'), + DURATION_ = 567 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 10:42:44.944', 'YYYY-MM-DD HH:MI:SS.FF'), + DURATION_ = 495, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', to_timestamp('2012-11-21 10:42:45.267', 'YYYY-MM-DD HH:MI:SS.FF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + to_timestamp('2012-11-21 10:42:45.535', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 10:42:45.535', 'YYYY-MM-DD HH:MI:SS.FF'), + to_timestamp('2012-11-21 10:42:45.559', 'YYYY-MM-DD HH:MI:SS.FF'), + 24 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + to_timestamp('2012-11-21 10:42:45.559', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + to_timestamp('2012-11-21 10:42:45.559', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + to_timestamp('2012-11-21 10:42:45.559', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + to_timestamp('2012-11-21 10:42:45.559', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + to_timestamp('2012-11-21 10:42:45.559', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/postgres.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/postgres.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..b75e48ef6b45c40f6ad389076cb4c1f36c5697b5 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/data/postgres.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-23 07:55:58'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', decode('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', 'hex'), '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-23 07:55:58', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-23 07:55:58', + '2012-11-23 07:55:58', + 7 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-23 07:55:58', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-23 07:55:58', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-23 07:55:58', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-23 07:55:58', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-23 07:55:58', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-23 07:55:58', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-23 07:55:58', + DURATION_ = 81, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-23 07:55:58', + DURATION_ = 89 + where ID_ = '6'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-23 07:55:58'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', decode('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', 'hex'), '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-23 07:55:58', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-23 07:55:58', + '2012-11-23 07:55:58', + 2 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-23 07:55:58', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-23 07:55:58', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-23 07:55:58', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-23 07:55:58', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-23 07:55:58', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.db2.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.db2.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..b560a9d5fb331bcca2444ff36550223fbf4bc4b8 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.db2.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY; +drop index ACT_IDX_TASK_CREATE; +drop index ACT_IDX_IDENT_LNK_USER; +drop index ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_IDX_VARIABLE_TASK_ID; + +alter table ACT_GE_BYTEARRAY + drop foreign key ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop foreign key ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop foreign key ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + +drop table ACT_GE_PROPERTY; +drop table ACT_GE_BYTEARRAY; +drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; +drop table ACT_RU_VARIABLE; +drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_TASK; +drop table ACT_RU_EXECUTION; +drop table ACT_RU_JOB; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.db2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.db2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.db2.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.db2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.db2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3f62284e91860884790d0082da24806977886eb1 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.db2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.h2.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.h2.drop.engine.sql similarity index 62% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.h2.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.h2.drop.engine.sql index 256fe5c87ada4951a01ff2b6c61f2db14915711a..ef00e7be1b0520cffbbf34253ee9f159155bc465 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.2/drop/activiti.h2.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.h2.drop.engine.sql @@ -2,14 +2,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; @@ -23,21 +16,18 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - alter table ACT_RU_EXECUTION - drop constraint ACT_UNIQ_RU_BUS_KEY; - -alter table ACT_HI_PROCINST - drop constraint ACT_UNIQ_HI_BUS_KEY; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_UNIQ_RU_BUS_KEY; + alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; - + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; @@ -59,19 +49,22 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop constraint ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + drop table ACT_GE_PROPERTY if exists; drop table ACT_GE_BYTEARRAY if exists; drop table ACT_RE_DEPLOYMENT if exists; drop table ACT_RU_EXECUTION if exists; -drop table ACT_ID_GROUP if exists; -drop table ACT_ID_MEMBERSHIP if exists; -drop table ACT_ID_USER if exists; drop table ACT_RU_JOB if exists; drop table ACT_RE_PROCDEF if exists; drop table ACT_RU_TASK if exists; drop table ACT_RU_IDENTITYLINK if exists; drop table ACT_RU_VARIABLE if exists; -drop table ACT_HI_PROCINST if exists; -drop table ACT_HI_ACTINST if exists; -drop table ACT_HI_TASKINST if exists; -drop table ACT_HI_DETAIL if exists; +drop table ACT_RU_EVENT_SUBSCR if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.h2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.h2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..936591335ea20d3541a1869460ca7fe591b7daeb --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.h2.drop.history.sql @@ -0,0 +1,23 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +alter table ACT_HI_PROCINST + drop constraint ACT_UNIQ_HI_BUS_KEY; + +drop table ACT_HI_PROCINST if exists; +drop table ACT_HI_ACTINST if exists; +drop table ACT_HI_VARINST if exists; +drop table ACT_HI_TASKINST if exists; +drop table ACT_HI_DETAIL if exists; +drop table ACT_HI_COMMENT if exists; +drop table ACT_HI_ATTACHMENT if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.h2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.h2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..8290d1d16811b7d0fd03b15139f781f76ed35a2d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.h2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO if exists; +drop table ACT_ID_GROUP if exists; +drop table ACT_ID_MEMBERSHIP if exists; +drop table ACT_ID_USER if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mssql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mssql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..4e3ee2e43f12bc0edeceb038e0ae1e44d7e4c889 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mssql.drop.engine.sql @@ -0,0 +1,61 @@ +drop index ACT_RU_EXECUTION.ACT_IDX_EXEC_BUSKEY; +drop index ACT_RU_TASK.ACT_IDX_TASK_CREATE; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_USER; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_RU_VARIABLE.ACT_IDX_VARIABLE_TASK_ID; +drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_CONFIG_; + +alter table ACT_GE_BYTEARRAY + drop constraint ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_SUPER; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop constraint ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +drop index ACT_RU_IDENTITYLINK.ACT_IDX_ATHRZ_PROCEDEF; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_PROPERTY') drop table ACT_GE_PROPERTY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_BYTEARRAY') drop table ACT_GE_BYTEARRAY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_PROCDEF') drop table ACT_RE_PROCDEF; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_DEPLOYMENT') drop table ACT_RE_DEPLOYMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_IDENTITYLINK') drop table ACT_RU_IDENTITYLINK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TASK') drop table ACT_RU_TASK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') drop table ACT_RU_VARIABLE; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXECUTION') drop table ACT_RU_EXECUTION; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EVENT_SUBSCR') drop table ACT_RU_EVENT_SUBSCR; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') drop table ACT_RU_JOB; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mssql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mssql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..486b61f9c68e0ca595f67c64869753bbe2bb7933 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mssql.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_INST_END; +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_START; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_END; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TIME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_NAME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_PROCINST') drop table ACT_HI_PROCINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ACTINST') drop table ACT_HI_ACTINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_VARINST') drop table ACT_HI_VARINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_TASKINST') drop table ACT_HI_TASKINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_DETAIL') drop table ACT_HI_DETAIL; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_COMMENT') drop table ACT_HI_COMMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ATTACHMENT') drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mssql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mssql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..baf49c6f41ca8948ad9addeec7f2def9370fc14d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mssql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_INFO') drop table ACT_ID_INFO; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_MEMBERSHIP') drop table ACT_ID_MEMBERSHIP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_GROUP') drop table ACT_ID_GROUP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_USER') drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mysql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mysql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..d860130536eb7c3ffab6f3f6632f607d76943300 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mysql.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; +drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; +drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE; + +alter table ACT_GE_BYTEARRAY + drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop FOREIGN KEY ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR; + +drop table if exists ACT_GE_PROPERTY; +drop table if exists ACT_RU_VARIABLE; +drop table if exists ACT_GE_BYTEARRAY; +drop table if exists ACT_RE_DEPLOYMENT; +drop table if exists ACT_RU_IDENTITYLINK; +drop table if exists ACT_RU_TASK; +drop table if exists ACT_RE_PROCDEF; +drop table if exists ACT_RU_EXECUTION; +drop table if exists ACT_RU_JOB; +drop table if exists ACT_RU_EVENT_SUBSCR; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mysql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mysql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..4acf18eaac067552d0e77926cc03285a1737303d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mysql.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; +drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; +drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; +drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; +drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL; +drop index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST; +drop index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST; + +drop table if exists ACT_HI_PROCINST; +drop table if exists ACT_HI_ACTINST; +drop table if exists ACT_HI_VARINST; +drop table if exists ACT_HI_TASKINST; +drop table if exists ACT_HI_DETAIL; +drop table if exists ACT_HI_COMMENT; +drop table if exists ACT_HI_ATTACHMENT; + \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mysql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mysql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3b404c4db48bf4fe75817d7112e6873aca90b998 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.mysql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_USER; + +drop table if exists ACT_ID_INFO; +drop table if exists ACT_ID_MEMBERSHIP; +drop table if exists ACT_ID_GROUP; +drop table if exists ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.oracle.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.oracle.drop.engine.sql similarity index 63% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.oracle.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.oracle.drop.engine.sql index 94cc9bee4a73871453850f088e5f8238b7f16ff8..2f4c52a1a294a0ae71981c1438413737f82e8758 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.oracle.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.oracle.drop.engine.sql @@ -1,9 +1,7 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; +drop index ACT_IDX_BYTEAR_DEPL; +drop index ACT_IDX_EXE_PROCINST; +drop index ACT_IDX_EXE_PARENT; drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; drop index ACT_IDX_TSKASS_TASK; drop index ACT_IDX_TASK_EXEC; drop index ACT_IDX_TASK_PROCINST; @@ -17,14 +15,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop CONSTRAINT ACT_FK_BYTEARR_DEPL; @@ -37,16 +28,16 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop CONSTRAINT ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_USER; + +alter table ACT_RU_EXECUTION + drop CONSTRAINT ACT_FK_EXE_PROCDEF; alter table ACT_RU_IDENTITYLINK drop CONSTRAINT ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK + drop CONSTRAINT ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop CONSTRAINT ACT_FK_TASK_EXE; @@ -67,20 +58,24 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop CONSTRAINT ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop CONSTRAINT ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; drop table ACT_GE_PROPERTY; -drop table ACT_RU_VARIABLE; drop table ACT_GE_BYTEARRAY; drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_VARIABLE; drop table ACT_RU_TASK; -drop table ACT_RE_PROCDEF; drop table ACT_RU_EXECUTION; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_GROUP; -drop table ACT_ID_USER; drop table ACT_RU_JOB; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; \ No newline at end of file +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.oracle.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.oracle.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..284ae4af9f368b75b361315801a216b3a981c6ed --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.oracle.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.oracle.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.oracle.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..f54f10c642b4600eddab5922d037443ac13717c7 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.oracle.drop.identity.sql @@ -0,0 +1,13 @@ +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_USER; + +drop index ACT_IDX_MEMB_GROUP; +drop index ACT_IDX_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.postgres.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.postgres.drop.engine.sql similarity index 70% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.postgres.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.postgres.drop.engine.sql index 51111fea940251dbf93c3eebb66cadc9bd973da9..c69c43343eb8df18d55c9b0c3edac49c6b1e9676 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.1/drop/activiti.postgres.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.postgres.drop.engine.sql @@ -17,14 +17,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; @@ -37,16 +30,16 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; @@ -68,19 +61,23 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; + drop table ACT_GE_PROPERTY; drop table ACT_GE_BYTEARRAY; drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; drop table ACT_RU_EXECUTION; -drop table ACT_ID_GROUP; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_USER; drop table ACT_RU_JOB; -drop table ACT_RE_PROCDEF; drop table ACT_RU_TASK; drop table ACT_RU_IDENTITYLINK; drop table ACT_RU_VARIABLE; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.postgres.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.postgres.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.postgres.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.postgres.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.postgres.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..10ca22af87a7659a398cb616e113ae9f7ac97e2c --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.7/drop/activiti.postgres.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_GROUP; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_USER; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.db2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.db2.create.cycle.sql deleted file mode 100644 index 85379b78091699a60cd04b76476e2117960aa553..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.db2.create.cycle.sql +++ /dev/null @@ -1,97 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) not null, - PLUGIN_ID_ varchar(255) not null, - INSTANCE_NAME_ varchar(255) not null, - INSTANCE_ID_ varchar(255) not null, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ varchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) not null, - GROUP_ varchar(255) not null, - KEY_ varchar(255) not null, - VALUE_ varchar(1024) not null, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) default null, - SOURCE_ELEMENT_NAME_ varchar(255) default null, - SOURCE_REVISION_ bigint default null, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) default null, - TARGET_ELEMENT_NAME_ varchar(255) default null, - TARGET_REVISION_ bigint default null, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ smallint check(LINKED_BOTH_WAYS_ in (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) not null, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint default null, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255) not null, - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) not null, - CONNECTOR_ID_ varchar(255) not null, - NODE_ID_ varchar(550) not null, - ELEMENT_ID_ varchar(255) default null, - CONTENT_ varchar(1024) not null, - AUTHOR_ varchar(255), - DATE_ timestamp not null, - ANSWERED_COMMENT_ID_ varchar(255) default null, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ v(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.h2.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.h2.create.cycle.sql deleted file mode 100644 index c6cd75832f258346603e40dcbbda0df5aaf4191c..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.h2.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar NOT NULL, - PLUGIN_ID_ varchar NOT NULL, - INSTANCE_NAME_ varchar NOT NULL, - INSTANCE_ID_ varchar NOT NULL, - USER_ varchar, - GROUP_ varchar, - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar NOT NULL, - GROUP_ varchar NOT NULL, - KEY_ varchar NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_ELEMENT_ID_ varchar DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar, - TARGET_ARTIFACT_ID_ varchar, - TARGET_ELEMENT_ID_ varchar DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar, - COMMENT_ varchar, - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar NOT NULL, - SOURCE_CONNECTOR_ID_ varchar, - SOURCE_ARTIFACT_ID_ varchar, - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar, - GROUP_ID_ varchar, - LINK_TYPE_ varchar, - COMMENT_ varchar, - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar NOT NULL, - NAME_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - ARTIFACT_ID_ varchar NOT NULL, - ALIAS_ varchar DEFAULT NULL, - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - NODE_ID_ varchar NOT NULL, - ELEMENT_ID_ varchar DEFAULT NULL, - CONTENT_ varchar NOT NULL, - AUTHOR_ varchar, - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT; - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - STATE_ varchar NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar NOT NULL, - LABEL_ varchar NOT NULL, - CONNECTOR_ID_ varchar NOT NULL, - REFERENCED_NODE_ID_ varchar NOT NULL, - PROCESS_SOLUTION_ID_ varchar NOT NULL, - TYPE_ varchar NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.mssql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.mssql.create.cycle.sql deleted file mode 100644 index ac8b328a98e571bdeeb3d142b01f889f9d6c0c5f..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.mssql.create.cycle.sql +++ /dev/null @@ -1,96 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ nvarchar(255), - PLUGIN_ID_ nvarchar(255), - INSTANCE_NAME_ nvarchar(255), - INSTANCE_ID_ nvarchar(255), - USER_ nvarchar(255), - GROUP_ nvarchar(255), - VALUES_ nvarchar(1024), - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ nvarchar(255), - GROUP_ nvarchar(255), - KEY_ nvarchar(255), - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - TARGET_CONNECTOR_ID_ nvarchar(255), - TARGET_ARTIFACT_ID_ nvarchar(550), - TARGET_ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ nvarchar(255) DEFAULT NULL, - TARGET_REVISION_ numeric(19,0) DEFAULT NULL, - LINK_TYPE_ nvarchar(255) , - COMMENT_ nvarchar(1000), - LINKED_BOTH_WAYS_ bit, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ nvarchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ nvarchar(255), - SOURCE_ARTIFACT_ID_ nvarchar(550), - SOURCE_REVISION_ numeric(19,0) DEFAULT NULL, - USER_ID_ nvarchar(255), - GROUP_ID_ nvarchar(255), - LINK_TYPE_ nvarchar(255), - COMMENT_ nvarchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ nvarchar(255), - NAME_ nvarchar(255), - CONNECTOR_ID_ nvarchar(255), - ARTIFACT_ID_ nvarchar(550), - ALIAS_ nvarchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - NODE_ID_ nvarchar(550) NOT NULL, - ELEMENT_ID_ nvarchar(255) DEFAULT NULL, - CONTENT_ nvarchar(1024) NOT NULL, - AUTHOR_ nvarchar(255), - DATE_ datetime NOT NULL, - ANSWERED_COMMENT_ID_ nvarchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - STATE_ nvarchar(255) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ nvarchar(255) NOT NULL, - LABEL_ nvarchar(255) NOT NULL, - CONNECTOR_ID_ nvarchar(255) NOT NULL, - REFERENCED_NODE_ID_ nvarchar(255) NOT NULL, - PROCESS_SOLUTION_ID_ nvarchar(255) NOT NULL, - TYPE_ nvarchar(255) NOT NULL, - primary key(ID_) -); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION_ID - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.mysql.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.mysql.create.cycle.sql deleted file mode 100644 index a0d17b291cd94ebf17a1ce1f0bc8c632f76636e5..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.mysql.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255) , - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(255), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ text NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin; - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.oracle.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.oracle.create.cycle.sql deleted file mode 100644 index 77a7fc22ab55e8f8efd5ea2e24115544bc75ecd3..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.oracle.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - PLUGIN_ID_ NVARCHAR2(255) NOT NULL, - INSTANCE_NAME_ NVARCHAR2(255) NOT NULL, - INSTANCE_ID_ NVARCHAR2(255) NOT NULL, - USER_ NVARCHAR2(255), - GROUP_ NVARCHAR2(255), - VALUES_ clob, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ NVARCHAR2(255) NOT NULL, - GROUP_ NVARCHAR2(255) NOT NULL, - KEY_ NVARCHAR2(255) NOT NULL, - VALUE_ clob, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_REVISION_ INTEGER DEFAULT NULL, - TARGET_CONNECTOR_ID_ NVARCHAR2(255), - TARGET_ARTIFACT_ID_ NVARCHAR2(550), - TARGET_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, - TARGET_REVISION_ INTEGER DEFAULT NULL, - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - LINKED_BOTH_WAYS_ NUMBER(1,0) CHECK (LINKED_BOTH_WAYS_ IN (1,0)), - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ NVARCHAR2(255) NOT NULL, - SOURCE_CONNECTOR_ID_ NVARCHAR2(255), - SOURCE_ARTIFACT_ID_ NVARCHAR2(550), - SOURCE_REVISION_ NUMBER(19) DEFAULT NULL, - USER_ID_ NVARCHAR2(255), - GROUP_ID_ NVARCHAR2(255), - LINK_TYPE_ NVARCHAR2(255), - COMMENT_ NVARCHAR2(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ NVARCHAR2(255), - NAME_ NVARCHAR2(700), - CONNECTOR_ID_ NVARCHAR2(255), - ARTIFACT_ID_ NVARCHAR2(550), - ALIAS_ NVARCHAR2(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(255) NOT NULL, - NODE_ID_ NVARCHAR2(550) NOT NULL, - ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - CONTENT_ NVARCHAR2(2000) NOT NULL, - AUTHOR_ NVARCHAR2(255), - DATE_ TIMESTAMP(6) NOT NULL, - ANSWERED_COMMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - STATE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ NVARCHAR2(128) NOT NULL, - LABEL_ NVARCHAR2(255) NOT NULL, - CONNECTOR_ID_ NVARCHAR2(128) NOT NULL, - REFERENCED_NODE_ID_ NVARCHAR2(550) NOT NULL, - PROCESS_SOLUTION_ID_ NVARCHAR2(128) NOT NULL, - TYPE_ NVARCHAR2(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.postgres.create.cycle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.postgres.create.cycle.sql deleted file mode 100644 index ea0001337e90948f78eb1a146d86115236f263e2..0000000000000000000000000000000000000000 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/create/activiti.postgres.create.cycle.sql +++ /dev/null @@ -1,98 +0,0 @@ -create table ACT_CY_CONN_CONFIG ( - ID_ varchar(255) NOT NULL, - PLUGIN_ID_ varchar(255) NOT NULL, - INSTANCE_NAME_ varchar(255) NOT NULL, - INSTANCE_ID_ varchar(255) NOT NULL, - USER_ varchar(255), - GROUP_ varchar(255), - VALUES_ text, - primary key (ID_) -); - -create table ACT_CY_CONFIG ( - ID_ varchar(255) NOT NULL, - GROUP_ varchar(255) NOT NULL, - KEY_ varchar(255) NOT NULL, - VALUE_ text, - primary key (ID_) -); - -create table ACT_CY_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - SOURCE_REVISION_ bigint DEFAULT NULL, - TARGET_CONNECTOR_ID_ varchar(255), - TARGET_ARTIFACT_ID_ varchar(550), - TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, - TARGET_REVISION_ bigint DEFAULT NULL, - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - LINKED_BOTH_WAYS_ boolean, - primary key(ID_) -); - -create table ACT_CY_PEOPLE_LINK ( - ID_ varchar(255) NOT NULL, - SOURCE_CONNECTOR_ID_ varchar(255), - SOURCE_ARTIFACT_ID_ varchar(550), - SOURCE_REVISION_ bigint DEFAULT NULL, - USER_ID_ varchar(255), - GROUP_ID_ varchar(255), - LINK_TYPE_ varchar(255), - COMMENT_ varchar(1000), - primary key(ID_) -); - -create table ACT_CY_TAG ( - ID_ varchar(255), - NAME_ varchar(700), - CONNECTOR_ID_ varchar(255), - ARTIFACT_ID_ varchar(550), - ALIAS_ varchar(255), - primary key(ID_) -); - -create table ACT_CY_COMMENT ( - ID_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(255) NOT NULL, - NODE_ID_ varchar(550) NOT NULL, - ELEMENT_ID_ varchar(255) DEFAULT NULL, - CONTENT_ varchar(5000) NOT NULL, - AUTHOR_ varchar(255), - DATE_ timestamp NOT NULL, - ANSWERED_COMMENT_ID_ varchar(255) DEFAULT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_COMMENT on ACT_CY_COMMENT(ANSWERED_COMMENT_ID_); -alter table ACT_CY_COMMENT - add constraint FK_CY_COMMENT_COMMENT - foreign key (ANSWERED_COMMENT_ID_) - references ACT_CY_COMMENT (ID_); - -create table ACT_CY_PROCESS_SOLUTION ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - STATE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create table ACT_CY_V_FOLDER ( - ID_ varchar(128) NOT NULL, - LABEL_ varchar(255) NOT NULL, - CONNECTOR_ID_ varchar(128) NOT NULL, - REFERENCED_NODE_ID_ varchar(550) NOT NULL, - PROCESS_SOLUTION_ID_ varchar(128) NOT NULL, - TYPE_ varchar(32) NOT NULL, - primary key(ID_) -); - -create index ACT_CY_IDX_V_FOLDER on ACT_CY_V_FOLDER(PROCESS_SOLUTION_ID_); -alter table ACT_CY_V_FOLDER - add constraint FK_CY_PROCESS_SOLUTION - foreign key (PROCESS_SOLUTION_ID_) - references ACT_CY_PROCESS_SOLUTION (ID_); diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/db2.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/db2.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..3fd7844fc60193ba00fd905f4a51ab4b6184c28f --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/db2.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', TIMESTAMP ('2012-11-22 15:43:40')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', blob(X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + TIMESTAMP ('2012-11-22 15:43:40'), + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + TIMESTAMP ('2012-11-22 15:43:40'), + TIMESTAMP ('2012-11-22 15:43:40'), + 8 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + TIMESTAMP ('2012-11-22 15:43:40'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + TIMESTAMP ('2012-11-22 15:43:40'), + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + TIMESTAMP ('2012-11-22 15:43:40'), + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + TIMESTAMP ('2012-11-22 15:43:41'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + TIMESTAMP ('2012-11-22 15:43:41'), + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + TIMESTAMP ('2012-11-22 15:43:41'), + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = TIMESTAMP ('2012-11-22 15:43:41'), + DURATION_ = 471, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = TIMESTAMP ('2012-11-22 15:43:41'), + DURATION_ = 540 + where ID_ = '6'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', TIMESTAMP ('2012-11-22 15:43:41')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', blob(X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + TIMESTAMP ('2012-11-22 15:43:41'), + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + TIMESTAMP ('2012-11-22 15:43:41'), + TIMESTAMP ('2012-11-22 15:43:41'), + 26 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + TIMESTAMP ('2012-11-22 15:43:41'), + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + TIMESTAMP ('2012-11-22 15:43:41'), + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + TIMESTAMP ('2012-11-22 15:43:41'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + TIMESTAMP ('2012-11-22 15:43:41'), + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + TIMESTAMP ('2012-11-22 15:43:41'), + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/h2.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/h2.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..9c735c5f6de864246387d24b8498d5d9c96b30d4 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/h2.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-19 17:51:45'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-19 17:51:46', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-19 17:51:46', + '2012-11-19 17:51:46', + 23 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-19 17:51:46', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-19 17:51:46', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-19 17:51:46', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-19 17:51:46', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-19 17:51:46', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-19 17:51:46', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 17:51:46', + DURATION_ = 281, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 17:51:46', + DURATION_ = 312 + where ID_ = '6'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-19 17:51:46'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-19 17:51:47', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-19 17:51:47', + '2012-11-19 17:51:47', + 8 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-19 17:51:47', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-19 17:51:47', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-19 17:51:47', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-19 17:51:47', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-19 17:51:47', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/mssql.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/mssql.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..c4ea6c952602661bfbf6f2142b30f5a2e02c0467 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/mssql.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-21 16:12:46'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-21 16:12:47', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-21 16:12:47', + '2012-11-21 16:12:47', + 7 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-21 16:12:47', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-21 16:12:47', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-21 16:12:47', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-21 16:12:48', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-21 16:12:48', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-21 16:12:48', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-21 16:12:48', + DURATION_ = 958 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-21 16:12:48', + DURATION_ = 853, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-21 16:12:49'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-21 16:12:49', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-21 16:12:49', + '2012-11-21 16:12:49', + 53 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-21 16:12:49', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-21 16:12:49', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-21 16:12:49', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-21 16:12:49', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-21 16:12:49', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/mysql.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/mysql.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..28d429ba1c11e029e01ccdb4a087c91732f5ee51 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/mysql.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-19 15:40:33'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-19 15:40:34', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-19 15:40:34', + '2012-11-19 15:40:34', + 26 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-19 15:40:34', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-19 15:40:34', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-19 15:40:34', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-19 15:40:35', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-19 15:40:35', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-19 15:40:35', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 15:40:34', + DURATION_ = 979, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 15:40:35', + DURATION_ = 1010 + where ID_ = '6'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-19 15:40:35'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-19 15:40:35', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-19 15:40:35', + '2012-11-19 15:40:35', + 6 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-19 15:40:35', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-19 15:40:35', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-19 15:40:35', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-19 15:40:35', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-19 15:40:35', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/oracle.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/oracle.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..e21239d55c28be2008fe8193827eb445e75fecaf --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/oracle.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', to_timestamp('2012-11-21 10:42:15.592', 'YYYY-MM-DD HH:MI:SS.FF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + to_timestamp('2012-11-21 10:42:16.460', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 10:42:16.460', 'YYYY-MM-DD HH:MI:SS.FF'), + to_timestamp('2012-11-21 10:42:16.468', 'YYYY-MM-DD HH:MI:SS.FF'), + 8 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + to_timestamp('2012-11-21 10:42:16.468', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + to_timestamp('2012-11-21 10:42:16.468', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + to_timestamp('2012-11-21 10:42:16.469', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + to_timestamp('2012-11-21 10:42:17.07', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + to_timestamp('2012-11-21 10:42:17.08', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + to_timestamp('2012-11-21 10:42:17.08', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 10:42:16.946', 'YYYY-MM-DD HH:MI:SS.FF'), + DURATION_ = 477, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 10:42:17.07', 'YYYY-MM-DD HH:MI:SS.FF'), + DURATION_ = 539 + where ID_ = '6'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', to_timestamp('2012-11-21 10:42:17.238', 'YYYY-MM-DD HH:MI:SS.FF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + to_timestamp('2012-11-21 10:42:17.497', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 10:42:17.497', 'YYYY-MM-DD HH:MI:SS.FF'), + to_timestamp('2012-11-21 10:42:17.522', 'YYYY-MM-DD HH:MI:SS.FF'), + 25 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + to_timestamp('2012-11-21 10:42:17.521', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + to_timestamp('2012-11-21 10:42:17.521', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + to_timestamp('2012-11-21 10:42:17.522', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + to_timestamp('2012-11-21 10:42:17.522', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + to_timestamp('2012-11-21 10:42:17.522', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/postgres.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/postgres.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..335f8edb83980f3976cb00503da82dce800ed9b4 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/data/postgres.data.sql @@ -0,0 +1,517 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-23 07:55:38'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', decode('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', 'hex'), '1'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('simpleTaskProcess:1:3', + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-23 07:55:38', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-23 07:55:38', + '2012-11-23 07:55:38', + 7 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-23 07:55:38', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-23 07:55:38', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-23 07:55:38', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-23 07:55:38', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-23 07:55:38', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-23 07:55:38', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-23 07:55:38', + DURATION_ = 90 + where ID_ = '6'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + PARENT_ID_ = null, + SUPER_EXEC_ = null + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-23 07:55:38', + DURATION_ = 82, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-23 07:55:38'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', decode('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', 'hex'), '10'); + +insert into ACT_RE_PROCDEF(ID_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_) + values ('taskWithExecutionVariablesProcess:1:12', + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_, PARENT_ID_, SUPER_EXEC_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + null, + null + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-23 07:55:38', + null, + null, + null, + 'start', + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-23 07:55:38', + '2012-11-23 07:55:38', + 1 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-23 07:55:38', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-23 07:55:38', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-23 07:55:38', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-23 07:55:38', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-23 07:55:38', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.db2.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.db2.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..b560a9d5fb331bcca2444ff36550223fbf4bc4b8 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.db2.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY; +drop index ACT_IDX_TASK_CREATE; +drop index ACT_IDX_IDENT_LNK_USER; +drop index ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_IDX_VARIABLE_TASK_ID; + +alter table ACT_GE_BYTEARRAY + drop foreign key ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop foreign key ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop foreign key ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + +drop table ACT_GE_PROPERTY; +drop table ACT_GE_BYTEARRAY; +drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; +drop table ACT_RU_VARIABLE; +drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_TASK; +drop table ACT_RU_EXECUTION; +drop table ACT_RU_JOB; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.db2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.db2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.db2.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.db2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.db2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3f62284e91860884790d0082da24806977886eb1 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.db2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.h2.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.h2.drop.engine.sql similarity index 62% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.h2.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.h2.drop.engine.sql index 256fe5c87ada4951a01ff2b6c61f2db14915711a..ef00e7be1b0520cffbbf34253ee9f159155bc465 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.h2.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.h2.drop.engine.sql @@ -2,14 +2,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; @@ -23,21 +16,18 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - alter table ACT_RU_EXECUTION - drop constraint ACT_UNIQ_RU_BUS_KEY; - -alter table ACT_HI_PROCINST - drop constraint ACT_UNIQ_HI_BUS_KEY; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; - + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_UNIQ_RU_BUS_KEY; + alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; - + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; @@ -59,19 +49,22 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop constraint ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + drop table ACT_GE_PROPERTY if exists; drop table ACT_GE_BYTEARRAY if exists; drop table ACT_RE_DEPLOYMENT if exists; drop table ACT_RU_EXECUTION if exists; -drop table ACT_ID_GROUP if exists; -drop table ACT_ID_MEMBERSHIP if exists; -drop table ACT_ID_USER if exists; drop table ACT_RU_JOB if exists; drop table ACT_RE_PROCDEF if exists; drop table ACT_RU_TASK if exists; drop table ACT_RU_IDENTITYLINK if exists; drop table ACT_RU_VARIABLE if exists; -drop table ACT_HI_PROCINST if exists; -drop table ACT_HI_ACTINST if exists; -drop table ACT_HI_TASKINST if exists; -drop table ACT_HI_DETAIL if exists; +drop table ACT_RU_EVENT_SUBSCR if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.h2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.h2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..936591335ea20d3541a1869460ca7fe591b7daeb --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.h2.drop.history.sql @@ -0,0 +1,23 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +alter table ACT_HI_PROCINST + drop constraint ACT_UNIQ_HI_BUS_KEY; + +drop table ACT_HI_PROCINST if exists; +drop table ACT_HI_ACTINST if exists; +drop table ACT_HI_VARINST if exists; +drop table ACT_HI_TASKINST if exists; +drop table ACT_HI_DETAIL if exists; +drop table ACT_HI_COMMENT if exists; +drop table ACT_HI_ATTACHMENT if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.h2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.h2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..8290d1d16811b7d0fd03b15139f781f76ed35a2d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.h2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO if exists; +drop table ACT_ID_GROUP if exists; +drop table ACT_ID_MEMBERSHIP if exists; +drop table ACT_ID_USER if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mssql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mssql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..4e3ee2e43f12bc0edeceb038e0ae1e44d7e4c889 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mssql.drop.engine.sql @@ -0,0 +1,61 @@ +drop index ACT_RU_EXECUTION.ACT_IDX_EXEC_BUSKEY; +drop index ACT_RU_TASK.ACT_IDX_TASK_CREATE; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_USER; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_RU_VARIABLE.ACT_IDX_VARIABLE_TASK_ID; +drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_CONFIG_; + +alter table ACT_GE_BYTEARRAY + drop constraint ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_SUPER; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop constraint ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +drop index ACT_RU_IDENTITYLINK.ACT_IDX_ATHRZ_PROCEDEF; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_PROPERTY') drop table ACT_GE_PROPERTY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_BYTEARRAY') drop table ACT_GE_BYTEARRAY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_PROCDEF') drop table ACT_RE_PROCDEF; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_DEPLOYMENT') drop table ACT_RE_DEPLOYMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_IDENTITYLINK') drop table ACT_RU_IDENTITYLINK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TASK') drop table ACT_RU_TASK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') drop table ACT_RU_VARIABLE; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXECUTION') drop table ACT_RU_EXECUTION; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EVENT_SUBSCR') drop table ACT_RU_EVENT_SUBSCR; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') drop table ACT_RU_JOB; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mssql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mssql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..486b61f9c68e0ca595f67c64869753bbe2bb7933 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mssql.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_INST_END; +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_START; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_END; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TIME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_NAME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_PROCINST') drop table ACT_HI_PROCINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ACTINST') drop table ACT_HI_ACTINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_VARINST') drop table ACT_HI_VARINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_TASKINST') drop table ACT_HI_TASKINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_DETAIL') drop table ACT_HI_DETAIL; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_COMMENT') drop table ACT_HI_COMMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ATTACHMENT') drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mssql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mssql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..baf49c6f41ca8948ad9addeec7f2def9370fc14d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mssql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_INFO') drop table ACT_ID_INFO; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_MEMBERSHIP') drop table ACT_ID_MEMBERSHIP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_GROUP') drop table ACT_ID_GROUP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_USER') drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mysql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mysql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..d860130536eb7c3ffab6f3f6632f607d76943300 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mysql.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; +drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; +drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE; + +alter table ACT_GE_BYTEARRAY + drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop FOREIGN KEY ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR; + +drop table if exists ACT_GE_PROPERTY; +drop table if exists ACT_RU_VARIABLE; +drop table if exists ACT_GE_BYTEARRAY; +drop table if exists ACT_RE_DEPLOYMENT; +drop table if exists ACT_RU_IDENTITYLINK; +drop table if exists ACT_RU_TASK; +drop table if exists ACT_RE_PROCDEF; +drop table if exists ACT_RU_EXECUTION; +drop table if exists ACT_RU_JOB; +drop table if exists ACT_RU_EVENT_SUBSCR; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mysql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mysql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..4acf18eaac067552d0e77926cc03285a1737303d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mysql.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; +drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; +drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; +drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; +drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL; +drop index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST; +drop index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST; + +drop table if exists ACT_HI_PROCINST; +drop table if exists ACT_HI_ACTINST; +drop table if exists ACT_HI_VARINST; +drop table if exists ACT_HI_TASKINST; +drop table if exists ACT_HI_DETAIL; +drop table if exists ACT_HI_COMMENT; +drop table if exists ACT_HI_ATTACHMENT; + \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mysql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mysql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3b404c4db48bf4fe75817d7112e6873aca90b998 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.mysql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_USER; + +drop table if exists ACT_ID_INFO; +drop table if exists ACT_ID_MEMBERSHIP; +drop table if exists ACT_ID_GROUP; +drop table if exists ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.oracle.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.oracle.drop.engine.sql similarity index 63% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.oracle.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.oracle.drop.engine.sql index 94cc9bee4a73871453850f088e5f8238b7f16ff8..2f4c52a1a294a0ae71981c1438413737f82e8758 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.oracle.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.oracle.drop.engine.sql @@ -1,9 +1,7 @@ -drop index ACT_IDX_BYTEAR_DEPL ; -drop index ACT_IDX_EXE_PROCINST ; -drop index ACT_IDX_EXE_PARENT ; +drop index ACT_IDX_BYTEAR_DEPL; +drop index ACT_IDX_EXE_PROCINST; +drop index ACT_IDX_EXE_PARENT; drop index ACT_IDX_EXE_SUPER; -drop index ACT_IDX_MEMB_GROUP; -drop index ACT_IDX_MEMB_USER; drop index ACT_IDX_TSKASS_TASK; drop index ACT_IDX_TASK_EXEC; drop index ACT_IDX_TASK_PROCINST; @@ -17,14 +15,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop CONSTRAINT ACT_FK_BYTEARR_DEPL; @@ -37,16 +28,16 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop CONSTRAINT ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop CONSTRAINT ACT_FK_MEMB_USER; + +alter table ACT_RU_EXECUTION + drop CONSTRAINT ACT_FK_EXE_PROCDEF; alter table ACT_RU_IDENTITYLINK drop CONSTRAINT ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK + drop CONSTRAINT ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop CONSTRAINT ACT_FK_TASK_EXE; @@ -67,20 +58,24 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop CONSTRAINT ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop CONSTRAINT ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; drop table ACT_GE_PROPERTY; -drop table ACT_RU_VARIABLE; drop table ACT_GE_BYTEARRAY; drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_VARIABLE; drop table ACT_RU_TASK; -drop table ACT_RE_PROCDEF; drop table ACT_RU_EXECUTION; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_GROUP; -drop table ACT_ID_USER; drop table ACT_RU_JOB; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; \ No newline at end of file +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.oracle.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.oracle.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..284ae4af9f368b75b361315801a216b3a981c6ed --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.oracle.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.oracle.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.oracle.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..f54f10c642b4600eddab5922d037443ac13717c7 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.oracle.drop.identity.sql @@ -0,0 +1,13 @@ +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_USER; + +drop index ACT_IDX_MEMB_GROUP; +drop index ACT_IDX_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.postgres.drop.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.postgres.drop.engine.sql similarity index 70% rename from modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.postgres.drop.sql rename to modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.postgres.drop.engine.sql index 51111fea940251dbf93c3eebb66cadc9bd973da9..c69c43343eb8df18d55c9b0c3edac49c6b1e9676 100644 --- a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.3/drop/activiti.postgres.drop.sql +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.postgres.drop.engine.sql @@ -17,14 +17,7 @@ drop index ACT_IDX_EXEC_BUSKEY; drop index ACT_IDX_TASK_CREATE; drop index ACT_IDX_IDENT_LNK_USER; drop index ACT_IDX_IDENT_LNK_GROUP; -drop index ACT_IDX_HI_PRO_INST_END; -drop index ACT_IDX_HI_PRO_I_BUSKEY; -drop index ACT_IDX_HI_ACT_INST_START; -drop index ACT_IDX_HI_ACT_INST_END; -drop index ACT_IDX_HI_DETAIL_PROC_INST; -drop index ACT_IDX_HI_DETAIL_ACT_INST; -drop index ACT_IDX_HI_DETAIL_TIME; -drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_VARIABLE_TASK_ID; alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; @@ -37,16 +30,16 @@ alter table ACT_RU_EXECUTION alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_GROUP; - -alter table ACT_ID_MEMBERSHIP - drop constraint ACT_FK_MEMB_USER; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; @@ -68,19 +61,23 @@ alter table ACT_RU_VARIABLE alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; + drop table ACT_GE_PROPERTY; drop table ACT_GE_BYTEARRAY; drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; drop table ACT_RU_EXECUTION; -drop table ACT_ID_GROUP; -drop table ACT_ID_MEMBERSHIP; -drop table ACT_ID_USER; drop table ACT_RU_JOB; -drop table ACT_RE_PROCDEF; drop table ACT_RU_TASK; drop table ACT_RU_IDENTITYLINK; drop table ACT_RU_VARIABLE; -drop table ACT_HI_PROCINST; -drop table ACT_HI_ACTINST; -drop table ACT_HI_TASKINST; -drop table ACT_HI_DETAIL; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.postgres.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.postgres.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.postgres.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.postgres.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.postgres.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..10ca22af87a7659a398cb616e113ae9f7ac97e2c --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.8/drop/activiti.postgres.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_GROUP; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_USER; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/db2.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/db2.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..7c47e7eedd93b3e88d51938e39522d8c8152dddc --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/db2.data.sql @@ -0,0 +1,531 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', TIMESTAMP ('2012-11-22 15:42:28')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', blob(X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '1', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + 0, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + TIMESTAMP ('2012-11-22 15:42:28'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + TIMESTAMP ('2012-11-22 15:42:28'), + TIMESTAMP ('2012-11-22 15:42:28'), + 9 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + TIMESTAMP ('2012-11-22 15:42:28'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + TIMESTAMP ('2012-11-22 15:42:28'), + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + TIMESTAMP ('2012-11-22 15:42:28'), + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + TIMESTAMP ('2012-11-22 15:42:29'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + TIMESTAMP ('2012-11-22 15:42:29'), + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + TIMESTAMP ('2012-11-22 15:42:29'), + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = TIMESTAMP ('2012-11-22 15:42:29'), + DURATION_ = 552 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = TIMESTAMP ('2012-11-22 15:42:29'), + DURATION_ = 488, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + IS_EVENT_SCOPE_ = 0, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1 + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', TIMESTAMP ('2012-11-22 15:42:29')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', blob(X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '10', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + 0, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + TIMESTAMP ('2012-11-22 15:42:29'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + TIMESTAMP ('2012-11-22 15:42:29'), + TIMESTAMP ('2012-11-22 15:42:29'), + 27 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + TIMESTAMP ('2012-11-22 15:42:29'), + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + TIMESTAMP ('2012-11-22 15:42:29'), + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + TIMESTAMP ('2012-11-22 15:42:29'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + TIMESTAMP ('2012-11-22 15:42:29'), + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + TIMESTAMP ('2012-11-22 15:42:29'), + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/h2.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/h2.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..4773e23f1f33de58f35e5de176c564b0100132d0 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/h2.data.sql @@ -0,0 +1,531 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-19 17:45:58'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '1', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + false, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-19 17:45:58', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-19 17:45:58', + '2012-11-19 17:45:58', + 23 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-19 17:45:58', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-19 17:45:58', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-19 17:45:58', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-19 17:45:59', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-19 17:45:59', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-19 17:45:59', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 17:45:59', + DURATION_ = 381 + where ID_ = '6'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + IS_EVENT_SCOPE_ = false, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1 + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 17:45:59', + DURATION_ = 342, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-19 17:45:59'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', X'3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '10', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + false, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-19 17:45:59', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-19 17:45:59', + '2012-11-19 17:45:59', + 7 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-19 17:45:59', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-19 17:45:59', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-19 17:45:59', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-19 17:45:59', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-19 17:45:59', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/mssql.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/mssql.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..dedb15b69909bbc54a3b67db3c6848bc27a487cd --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/mssql.data.sql @@ -0,0 +1,531 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-21 16:12:20'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '1', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + 0, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-21 16:12:21', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-21 16:12:21', + '2012-11-21 16:12:21', + 8 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-21 16:12:21', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-21 16:12:21', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-21 16:12:21', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-21 16:12:22', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-21 16:12:22', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-21 16:12:22', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-21 16:12:22', + DURATION_ = 994 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-21 16:12:22', + DURATION_ = 884, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + IS_EVENT_SCOPE_ = 0, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1 + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-21 16:12:22'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '10', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + 0, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-21 16:12:23', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-21 16:12:23', + '2012-11-21 16:12:23', + 51 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-21 16:12:23', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-21 16:12:23', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-21 16:12:23', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-21 16:12:23', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-21 16:12:23', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/mysql.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/mysql.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..b2b1159d91c617a9fcc73c4ca65a098a90877a9f --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/mysql.data.sql @@ -0,0 +1,531 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-19 15:39:42'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '1', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + false, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-19 15:39:43', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-19 15:39:43', + '2012-11-19 15:39:43', + 24 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-19 15:39:43', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-19 15:39:43', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-19 15:39:43', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-19 15:39:43', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-19 15:39:43', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-19 15:39:43', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 15:39:43', + DURATION_ = 594 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-19 15:39:43', + DURATION_ = 559, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + IS_EVENT_SCOPE_ = false, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1 + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-19 15:39:43'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E, '10', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + false, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-19 15:39:43', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-19 15:39:43', + '2012-11-19 15:39:43', + 5 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-19 15:39:43', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-19 15:39:43', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-19 15:39:43', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-19 15:39:43', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-19 15:39:43', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/oracle.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/oracle.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..ecb8551faa59b6298381ab344bf281fba1364981 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/oracle.data.sql @@ -0,0 +1,531 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', to_timestamp('2012-11-21 10:41:48.121', 'YYYY-MM-DD HH:MI:SS.FF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '1', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + 1, + 0, + 1, + 0, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + to_timestamp('2012-11-21 10:41:49.108', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 10:41:49.109', 'YYYY-MM-DD HH:MI:SS.FF'), + to_timestamp('2012-11-21 10:41:49.115', 'YYYY-MM-DD HH:MI:SS.FF'), + 6 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + to_timestamp('2012-11-21 10:41:49.116', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + to_timestamp('2012-11-21 10:41:49.116', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + to_timestamp('2012-11-21 10:41:49.116', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + to_timestamp('2012-11-21 10:41:49.669', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + to_timestamp('2012-11-21 10:41:49.669', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + to_timestamp('2012-11-21 10:41:49.669', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 10:41:49.669', 'YYYY-MM-DD HH:MI:SS.FF'), + DURATION_ = 553 + where ID_ = '6'; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = to_timestamp('2012-11-21 10:41:49.606', 'YYYY-MM-DD HH:MI:SS.FF'), + DURATION_ = 490, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = 1, + IS_CONCURRENT_ = 0, + IS_SCOPE_ = 1, + IS_EVENT_SCOPE_ = 0, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1 + where ID_ = '4' + and REV_ = 1; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', to_timestamp('2012-11-21 10:41:49.903', 'YYYY-MM-DD HH:MI:SS.FF')); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', hextoraw('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E'), '10', 0); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + 0, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + 1, + 0, + 1, + 0, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + to_timestamp('2012-11-21 10:41:50.189', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + to_timestamp('2012-11-21 10:41:50.189', 'YYYY-MM-DD HH:MI:SS.FF'), + to_timestamp('2012-11-21 10:41:50.215', 'YYYY-MM-DD HH:MI:SS.FF'), + 26 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + to_timestamp('2012-11-21 10:41:50.215', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + to_timestamp('2012-11-21 10:41:50.215', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + to_timestamp('2012-11-21 10:41:50.215', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + to_timestamp('2012-11-21 10:41:50.215', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + to_timestamp('2012-11-21 10:41:50.215', 'YYYY-MM-DD HH:MI:SS.FF'), + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/postgres.data.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/postgres.data.sql new file mode 100644 index 0000000000000000000000000000000000000000..0598c6751d0b535940d8601ca1a2f8c649c6939e --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/data/postgres.data.sql @@ -0,0 +1,531 @@ +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('1', 'simpleTaskProcess', '2012-11-23 07:55:20'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('2', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', decode('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', 'hex'), '1', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('simpleTaskProcess:1:3', + 1, + 'Upgrade', + null, + 'simpleTaskProcess', + 1, + '1', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testSimplestTask.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '4', + 1, + '4', + null, + 'simpleTaskProcess:1:3', + 'simpleTask1', + true, + false, + true, + false, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '4', + '4', + null, + 'simpleTaskProcess:1:3', + '2012-11-23 07:55:20', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '5', + 'simpleTaskProcess:1:3', + '4', + '4', + 'start', + null, + 'startEvent', + null, + '2012-11-23 07:55:20', + '2012-11-23 07:55:20', + 7 + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '6', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask1', + 'simpleTask', + 'userTask', + 'kermit', + '2012-11-23 07:55:20', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('7', + 1, + 'simpleTask', + null, + null, + 50, + '2012-11-23 07:55:20', + null, + 'kermit', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask1', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '7', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask', + null, + null, + null, + 'kermit', + '2012-11-23 07:55:20', + null, + null, + null, + 'simpleTask1', + 50, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '8', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + 'simpleTask2', + 'userTask', + 'swedishchef', + '2012-11-23 07:55:20', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('9', + 1, + 'simpleTask2', + null, + 'spicy sauce', + 50, + '2012-11-23 07:55:20', + null, + 'swedishchef', + null, + '4', + '4', + 'simpleTaskProcess:1:3', + 'simpleTask2', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '9', + 'simpleTaskProcess:1:3', + '4', + '4', + 'simpleTask2', + null, + 'spicy sauce', + null, + 'swedishchef', + '2012-11-23 07:55:20', + null, + null, + null, + 'simpleTask2', + 50, + null + ); + +update ACT_RU_EXECUTION set + REV_ = 2, + PROC_DEF_ID_ = 'simpleTaskProcess:1:3', + ACT_ID_ = 'simpleTask2', + IS_ACTIVE_ = true, + IS_CONCURRENT_ = false, + IS_SCOPE_ = true, + IS_EVENT_SCOPE_ = false, + PARENT_ID_ = null, + SUPER_EXEC_ = null, + SUSPENSION_STATE_ = 1 + where ID_ = '4' + and REV_ = 1; + +update ACT_HI_TASKINST set + EXECUTION_ID_ = '4', + NAME_ = 'simpleTask', + PARENT_TASK_ID_ = null, + DESCRIPTION_ = null, + OWNER_ = null, + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-23 07:55:20', + DURATION_ = 79, + DELETE_REASON_ = 'completed', + TASK_DEF_KEY_ = 'simpleTask1', + PRIORITY_ = 50, + DUE_DATE_ = null + where ID_ = '7'; + +update ACT_HI_ACTINST set + EXECUTION_ID_ = '4', + ASSIGNEE_ = 'kermit', + END_TIME_ = '2012-11-23 07:55:20', + DURATION_ = 89 + where ID_ = '6'; + +delete from ACT_RU_TASK where ID_ = '7'; + +insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_) + values('10', 'simpleTaskProcess', '2012-11-23 07:55:20'); + +insert into ACT_GE_BYTEARRAY(ID_, REV_, NAME_, BYTES_, DEPLOYMENT_ID_, GENERATED_) + values ('11', 1, 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', decode('3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', 'hex'), '10', false); + +insert into ACT_RE_PROCDEF(ID_, REV_, CATEGORY_, NAME_, KEY_, VERSION_, DEPLOYMENT_ID_, RESOURCE_NAME_, DGRM_RESOURCE_NAME_, HAS_START_FORM_KEY_, SUSPENSION_STATE_) + values ('taskWithExecutionVariablesProcess:1:12', + 1, + 'Upgrade', + null, + 'taskWithExecutionVariablesProcess', + 1, + '10', + 'org/activiti/upgrade/test/UserTaskBeforeTest.testTaskWithExecutionVariables.bpmn20.xml', + null, + false, + 1); + +insert into ACT_RU_EXECUTION (ID_, REV_, PROC_INST_ID_, BUSINESS_KEY_, PROC_DEF_ID_, ACT_ID_, IS_ACTIVE_, IS_CONCURRENT_, IS_SCOPE_,IS_EVENT_SCOPE_, PARENT_ID_, SUPER_EXEC_, SUSPENSION_STATE_) + values ( + '13', + 1, + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + true, + false, + true, + false, + null, + null, + 1 + ); + +insert into ACT_HI_PROCINST ( + ID_, + PROC_INST_ID_, + BUSINESS_KEY_, + PROC_DEF_ID_, + START_TIME_, + END_TIME_, + DURATION_, + START_USER_ID_, + START_ACT_ID_, + END_ACT_ID_, + SUPER_PROCESS_INSTANCE_ID_, + DELETE_REASON_ + ) values ( + '13', + '13', + null, + 'taskWithExecutionVariablesProcess:1:12', + '2012-11-23 07:55:20', + null, + null, + null, + 'start', + null, + null, + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '14', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'start', + null, + 'startEvent', + null, + '2012-11-23 07:55:20', + '2012-11-23 07:55:20', + 2 + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '15', + 1, + 'string', + 'player', + '13', + '13', + null, + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '16', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'player', + 0, + 'string', + '2012-11-23 07:55:20', + null, + null, + null, + 'gonzo', + null + ); + +insert into ACT_RU_VARIABLE (ID_, REV_, TYPE_, NAME_, PROC_INST_ID_, EXECUTION_ID_, TASK_ID_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '17', + 1, + 'string', + 'instrument', + '13', + '13', + null, + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID_, TASK_ID_, NAME_, REV_, VAR_TYPE_, TIME_, BYTEARRAY_ID_, DOUBLE_, LONG_ , TEXT_, TEXT2_) + values ( + '18', + 'VariableUpdate', + '13', + '13', + '14', + null, + 'instrument', + 0, + 'string', + '2012-11-23 07:55:20', + null, + null, + null, + 'trumpet', + null + ); + +insert into ACT_HI_ACTINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + ACT_ID_, + ACT_NAME_, + ACT_TYPE_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_ + ) values ( + '19', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + 'taskWithExecutionVariables', + 'userTask', + null, + '2012-11-23 07:55:20', + null, + null + ); + +insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, + ASSIGNEE_, DELEGATION_, EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_KEY_, DUE_DATE_) + values ('20', + 1, + 'taskWithExecutionVariables', + null, + null, + 50, + '2012-11-23 07:55:20', + null, + null, + null, + '13', + '13', + 'taskWithExecutionVariablesProcess:1:12', + 'taskWithExecutionVariables', + null + ); + +insert into ACT_HI_TASKINST ( + ID_, + PROC_DEF_ID_, + PROC_INST_ID_, + EXECUTION_ID_, + NAME_, + PARENT_TASK_ID_, + DESCRIPTION_, + OWNER_, + ASSIGNEE_, + START_TIME_, + END_TIME_, + DURATION_, + DELETE_REASON_, + TASK_DEF_KEY_, + PRIORITY_, + DUE_DATE_ + ) values ( + '20', + 'taskWithExecutionVariablesProcess:1:12', + '13', + '13', + 'taskWithExecutionVariables', + null, + null, + null, + null, + '2012-11-23 07:55:20', + null, + null, + null, + 'taskWithExecutionVariables', + 50, + null + ); + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.db2.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.db2.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..b560a9d5fb331bcca2444ff36550223fbf4bc4b8 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.db2.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY; +drop index ACT_IDX_TASK_CREATE; +drop index ACT_IDX_IDENT_LNK_USER; +drop index ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_IDX_VARIABLE_TASK_ID; + +alter table ACT_GE_BYTEARRAY + drop foreign key ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop foreign key ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop foreign key ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop foreign key ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop foreign key ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop foreign key ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop foreign key ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + +drop table ACT_GE_PROPERTY; +drop table ACT_GE_BYTEARRAY; +drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; +drop table ACT_RU_VARIABLE; +drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_TASK; +drop table ACT_RU_EXECUTION; +drop table ACT_RU_JOB; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.db2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.db2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.db2.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.db2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.db2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3f62284e91860884790d0082da24806977886eb1 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.db2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop foreign key ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.h2.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.h2.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..ef00e7be1b0520cffbbf34253ee9f159155bc465 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.h2.drop.engine.sql @@ -0,0 +1,70 @@ +drop index ACT_IDX_EXEC_BUSKEY; +drop index ACT_IDX_TASK_CREATE; +drop index ACT_IDX_IDENT_LNK_USER; +drop index ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_IDX_VARIABLE_TASK_ID; + +alter table ACT_GE_BYTEARRAY + drop constraint ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_UNIQ_RU_BUS_KEY; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop constraint ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop constraint ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_ATHRZ_PROCEDEF; + +drop table ACT_GE_PROPERTY if exists; +drop table ACT_GE_BYTEARRAY if exists; +drop table ACT_RE_DEPLOYMENT if exists; +drop table ACT_RU_EXECUTION if exists; +drop table ACT_RU_JOB if exists; +drop table ACT_RE_PROCDEF if exists; +drop table ACT_RU_TASK if exists; +drop table ACT_RU_IDENTITYLINK if exists; +drop table ACT_RU_VARIABLE if exists; +drop table ACT_RU_EVENT_SUBSCR if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.h2.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.h2.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..936591335ea20d3541a1869460ca7fe591b7daeb --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.h2.drop.history.sql @@ -0,0 +1,23 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +alter table ACT_HI_PROCINST + drop constraint ACT_UNIQ_HI_BUS_KEY; + +drop table ACT_HI_PROCINST if exists; +drop table ACT_HI_ACTINST if exists; +drop table ACT_HI_VARINST if exists; +drop table ACT_HI_TASKINST if exists; +drop table ACT_HI_DETAIL if exists; +drop table ACT_HI_COMMENT if exists; +drop table ACT_HI_ATTACHMENT if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.h2.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.h2.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..8290d1d16811b7d0fd03b15139f781f76ed35a2d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.h2.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO if exists; +drop table ACT_ID_GROUP if exists; +drop table ACT_ID_MEMBERSHIP if exists; +drop table ACT_ID_USER if exists; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mssql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mssql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..4e3ee2e43f12bc0edeceb038e0ae1e44d7e4c889 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mssql.drop.engine.sql @@ -0,0 +1,61 @@ +drop index ACT_RU_EXECUTION.ACT_IDX_EXEC_BUSKEY; +drop index ACT_RU_TASK.ACT_IDX_TASK_CREATE; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_USER; +drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_RU_VARIABLE.ACT_IDX_VARIABLE_TASK_ID; +drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_CONFIG_; + +alter table ACT_GE_BYTEARRAY + drop constraint ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_SUPER; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop constraint ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +drop index ACT_RU_IDENTITYLINK.ACT_IDX_ATHRZ_PROCEDEF; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_PROPERTY') drop table ACT_GE_PROPERTY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_BYTEARRAY') drop table ACT_GE_BYTEARRAY; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_PROCDEF') drop table ACT_RE_PROCDEF; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RE_DEPLOYMENT') drop table ACT_RE_DEPLOYMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_IDENTITYLINK') drop table ACT_RU_IDENTITYLINK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TASK') drop table ACT_RU_TASK; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') drop table ACT_RU_VARIABLE; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXECUTION') drop table ACT_RU_EXECUTION; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EVENT_SUBSCR') drop table ACT_RU_EVENT_SUBSCR; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') drop table ACT_RU_JOB; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mssql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mssql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..486b61f9c68e0ca595f67c64869753bbe2bb7933 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mssql.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_INST_END; +drop index ACT_HI_PROCINST.ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_START; +drop index ACT_HI_ACTINST.ACT_IDX_HI_ACT_INST_END; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TIME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_NAME; +drop index ACT_HI_DETAIL.ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_PROCINST') drop table ACT_HI_PROCINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ACTINST') drop table ACT_HI_ACTINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_VARINST') drop table ACT_HI_VARINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_TASKINST') drop table ACT_HI_TASKINST; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_DETAIL') drop table ACT_HI_DETAIL; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_COMMENT') drop table ACT_HI_COMMENT; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ATTACHMENT') drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mssql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mssql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..baf49c6f41ca8948ad9addeec7f2def9370fc14d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mssql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_INFO') drop table ACT_ID_INFO; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_MEMBERSHIP') drop table ACT_ID_MEMBERSHIP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_GROUP') drop table ACT_ID_GROUP; +if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_ID_USER') drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mysql.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mysql.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..d860130536eb7c3ffab6f3f6632f607d76943300 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mysql.drop.engine.sql @@ -0,0 +1,64 @@ +drop index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION; +drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK; +drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE; + +alter table ACT_GE_BYTEARRAY + drop FOREIGN KEY ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop FOREIGN KEY ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop FOREIGN KEY ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop FOREIGN KEY ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop FOREIGN KEY ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop FOREIGN KEY ACT_FK_EVENT_EXEC; + +drop index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK; +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR; + +drop table if exists ACT_GE_PROPERTY; +drop table if exists ACT_RU_VARIABLE; +drop table if exists ACT_GE_BYTEARRAY; +drop table if exists ACT_RE_DEPLOYMENT; +drop table if exists ACT_RU_IDENTITYLINK; +drop table if exists ACT_RU_TASK; +drop table if exists ACT_RE_PROCDEF; +drop table if exists ACT_RU_EXECUTION; +drop table if exists ACT_RU_JOB; +drop table if exists ACT_RU_EVENT_SUBSCR; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mysql.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mysql.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..4acf18eaac067552d0e77926cc03285a1737303d --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mysql.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST; +drop index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST; +drop index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST; +drop index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST; +drop index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL; +drop index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL; +drop index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST; +drop index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST; + +drop table if exists ACT_HI_PROCINST; +drop table if exists ACT_HI_ACTINST; +drop table if exists ACT_HI_VARINST; +drop table if exists ACT_HI_TASKINST; +drop table if exists ACT_HI_DETAIL; +drop table if exists ACT_HI_COMMENT; +drop table if exists ACT_HI_ATTACHMENT; + \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mysql.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mysql.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..3b404c4db48bf4fe75817d7112e6873aca90b998 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.mysql.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop FOREIGN KEY ACT_FK_MEMB_USER; + +drop table if exists ACT_ID_INFO; +drop table if exists ACT_ID_MEMBERSHIP; +drop table if exists ACT_ID_GROUP; +drop table if exists ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.oracle.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.oracle.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..2f4c52a1a294a0ae71981c1438413737f82e8758 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.oracle.drop.engine.sql @@ -0,0 +1,81 @@ +drop index ACT_IDX_BYTEAR_DEPL; +drop index ACT_IDX_EXE_PROCINST; +drop index ACT_IDX_EXE_PARENT; +drop index ACT_IDX_EXE_SUPER; +drop index ACT_IDX_TSKASS_TASK; +drop index ACT_IDX_TASK_EXEC; +drop index ACT_IDX_TASK_PROCINST; +drop index ACT_IDX_TASK_PROCDEF; +drop index ACT_IDX_VAR_EXE; +drop index ACT_IDX_VAR_PROCINST; +drop index ACT_IDX_VAR_BYTEARRAY; +drop index ACT_IDX_JOB_EXCEPTION; + +drop index ACT_IDX_EXEC_BUSKEY; +drop index ACT_IDX_TASK_CREATE; +drop index ACT_IDX_IDENT_LNK_USER; +drop index ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_IDX_VARIABLE_TASK_ID; + +alter table ACT_GE_BYTEARRAY + drop CONSTRAINT ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop CONSTRAINT ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop CONSTRAINT ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop CONSTRAINT ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop CONSTRAINT ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop CONSTRAINT ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop CONSTRAINT ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop CONSTRAINT ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop CONSTRAINT ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop CONSTRAINT ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop CONSTRAINT ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop CONSTRAINT ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop CONSTRAINT ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop CONSTRAINT ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop CONSTRAINT ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; + +drop table ACT_GE_PROPERTY; +drop table ACT_GE_BYTEARRAY; +drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; +drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_VARIABLE; +drop table ACT_RU_TASK; +drop table ACT_RU_EXECUTION; +drop table ACT_RU_JOB; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.oracle.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.oracle.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..284ae4af9f368b75b361315801a216b3a981c6ed --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.oracle.drop.history.sql @@ -0,0 +1,21 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; + diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.oracle.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.oracle.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..f54f10c642b4600eddab5922d037443ac13717c7 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.oracle.drop.identity.sql @@ -0,0 +1,13 @@ +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop CONSTRAINT ACT_FK_MEMB_USER; + +drop index ACT_IDX_MEMB_GROUP; +drop index ACT_IDX_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.postgres.drop.engine.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.postgres.drop.engine.sql new file mode 100644 index 0000000000000000000000000000000000000000..c69c43343eb8df18d55c9b0c3edac49c6b1e9676 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.postgres.drop.engine.sql @@ -0,0 +1,83 @@ +drop index ACT_IDX_BYTEAR_DEPL ; +drop index ACT_IDX_EXE_PROCINST ; +drop index ACT_IDX_EXE_PARENT ; +drop index ACT_IDX_EXE_SUPER; +drop index ACT_IDX_MEMB_GROUP; +drop index ACT_IDX_MEMB_USER; +drop index ACT_IDX_TSKASS_TASK; +drop index ACT_IDX_TASK_EXEC; +drop index ACT_IDX_TASK_PROCINST; +drop index ACT_IDX_TASK_PROCDEF; +drop index ACT_IDX_VAR_EXE; +drop index ACT_IDX_VAR_PROCINST; +drop index ACT_IDX_VAR_BYTEARRAY; +drop index ACT_IDX_JOB_EXCEPTION; + +drop index ACT_IDX_EXEC_BUSKEY; +drop index ACT_IDX_TASK_CREATE; +drop index ACT_IDX_IDENT_LNK_USER; +drop index ACT_IDX_IDENT_LNK_GROUP; +drop index ACT_IDX_VARIABLE_TASK_ID; + +alter table ACT_GE_BYTEARRAY + drop constraint ACT_FK_BYTEARR_DEPL; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCINST; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PARENT; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_SUPER; + +alter table ACT_RU_EXECUTION + drop constraint ACT_FK_EXE_PROCDEF; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_TSKASS_TASK; + +alter table ACT_RU_IDENTITYLINK + drop constraint ACT_FK_ATHRZ_PROCEDEF; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_EXE; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCINST; + +alter table ACT_RU_TASK + drop constraint ACT_FK_TASK_PROCDEF; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_EXE; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_PROCINST; + +alter table ACT_RU_VARIABLE + drop constraint ACT_FK_VAR_BYTEARRAY; + +alter table ACT_RU_JOB + drop constraint ACT_FK_JOB_EXCEPTION; + +alter table ACT_RU_EVENT_SUBSCR + drop constraint ACT_FK_EVENT_EXEC; + +alter table ACT_RE_PROCDEF + drop CONSTRAINT ACT_UNIQ_PROCDEF; + +drop index ACT_IDX_EVENT_SUBSCR_CONFIG_; +drop index ACT_IDX_EVENT_SUBSCR; +drop index ACT_IDX_ATHRZ_PROCEDEF; + +drop table ACT_GE_PROPERTY; +drop table ACT_GE_BYTEARRAY; +drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; +drop table ACT_RU_EXECUTION; +drop table ACT_RU_JOB; +drop table ACT_RU_TASK; +drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_VARIABLE; +drop table ACT_RU_EVENT_SUBSCR; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.postgres.drop.history.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.postgres.drop.history.sql new file mode 100644 index 0000000000000000000000000000000000000000..b27b8abe5745f583e011641e7b7c84d4cbc552d6 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.postgres.drop.history.sql @@ -0,0 +1,20 @@ +drop index ACT_IDX_HI_PRO_INST_END; +drop index ACT_IDX_HI_PRO_I_BUSKEY; +drop index ACT_IDX_HI_ACT_INST_START; +drop index ACT_IDX_HI_ACT_INST_END; +drop index ACT_IDX_HI_DETAIL_PROC_INST; +drop index ACT_IDX_HI_DETAIL_ACT_INST; +drop index ACT_IDX_HI_DETAIL_TIME; +drop index ACT_IDX_HI_DETAIL_NAME; +drop index ACT_IDX_HI_DETAIL_TASK_ID; +drop index ACT_IDX_HI_PROCVAR_PROC_INST; +drop index ACT_IDX_HI_PROCVAR_NAME_TYPE; +drop index ACT_IDX_HI_ACT_INST_PROCINST; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.postgres.drop.identity.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.postgres.drop.identity.sql new file mode 100644 index 0000000000000000000000000000000000000000..10ca22af87a7659a398cb616e113ae9f7ac97e2c --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/5.9/drop/activiti.postgres.drop.identity.sql @@ -0,0 +1,10 @@ +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_GROUP; + +alter table ACT_ID_MEMBERSHIP + drop constraint ACT_FK_MEMB_USER; + +drop table ACT_ID_INFO; +drop table ACT_ID_GROUP; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_USER; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.db2.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.db2.sql new file mode 100644 index 0000000000000000000000000000000000000000..e35b5d936df9e3011fd731ea25f50dc026009498 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.db2.sql @@ -0,0 +1,41 @@ +alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; +alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_PROCDEF; +alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_PARENT; +alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; +alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_ATHRZ_PROCEDEF; +alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; +alter table ACT_RU_TASK drop constraint ACT_FK_TASK_PROCINST; +alter table ACT_RU_TASK drop constraint ACT_FK_TASK_PROCDEF; +alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_EXE; +alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_PROCINST; +alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_BYTEARRAY; +alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR drop constraint ACT_FK_EVENT_EXEC; +alter table ACT_RE_MODEL drop constraint ACT_FK_MODEL_SOURCE; +alter table ACT_RE_MODEL drop constraint ACT_FK_MODEL_SOURCE_EXTRA; + +drop table ACT_GE_PROPERTY; +drop table ACT_GE_BYTEARRAY; +drop table ACT_RE_MODEL; +drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; +drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_VARIABLE; +drop table ACT_RU_TASK; +drop table ACT_RU_EXECUTION; +drop table ACT_RU_JOB; +drop table ACT_RU_EVENT_SUBSCR; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.h2.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.h2.sql new file mode 100644 index 0000000000000000000000000000000000000000..fc9a4f21daf9e63ae7f0a2718e91cbb39104b224 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.h2.sql @@ -0,0 +1 @@ +DROP ALL OBJECTS; \ No newline at end of file diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.mssql.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.mssql.sql new file mode 100644 index 0000000000000000000000000000000000000000..e35b5d936df9e3011fd731ea25f50dc026009498 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.mssql.sql @@ -0,0 +1,41 @@ +alter table ACT_GE_BYTEARRAY drop constraint ACT_FK_BYTEARR_DEPL; +alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_PROCDEF; +alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_PARENT; +alter table ACT_RU_EXECUTION drop constraint ACT_FK_EXE_SUPER; +alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_TSKASS_TASK; +alter table ACT_RU_IDENTITYLINK drop constraint ACT_FK_ATHRZ_PROCEDEF; +alter table ACT_RU_TASK drop constraint ACT_FK_TASK_EXE; +alter table ACT_RU_TASK drop constraint ACT_FK_TASK_PROCINST; +alter table ACT_RU_TASK drop constraint ACT_FK_TASK_PROCDEF; +alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_EXE; +alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_PROCINST; +alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_BYTEARRAY; +alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION; +alter table ACT_RU_EVENT_SUBSCR drop constraint ACT_FK_EVENT_EXEC; +alter table ACT_RE_MODEL drop constraint ACT_FK_MODEL_SOURCE; +alter table ACT_RE_MODEL drop constraint ACT_FK_MODEL_SOURCE_EXTRA; + +drop table ACT_GE_PROPERTY; +drop table ACT_GE_BYTEARRAY; +drop table ACT_RE_MODEL; +drop table ACT_RE_DEPLOYMENT; +drop table ACT_RE_PROCDEF; +drop table ACT_RU_IDENTITYLINK; +drop table ACT_RU_VARIABLE; +drop table ACT_RU_TASK; +drop table ACT_RU_EXECUTION; +drop table ACT_RU_JOB; +drop table ACT_RU_EVENT_SUBSCR; + +drop table ACT_HI_PROCINST; +drop table ACT_HI_ACTINST; +drop table ACT_HI_VARINST; +drop table ACT_HI_TASKINST; +drop table ACT_HI_DETAIL; +drop table ACT_HI_COMMENT; +drop table ACT_HI_ATTACHMENT; + +drop table ACT_ID_INFO; +drop table ACT_ID_MEMBERSHIP; +drop table ACT_ID_GROUP; +drop table ACT_ID_USER; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.mysql.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.mysql.sql new file mode 100644 index 0000000000000000000000000000000000000000..507afdc841fdd0b9d06ef2e0350ac9a906f24315 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.mysql.sql @@ -0,0 +1,2 @@ +drop schema activitiupgrade; +create database activitiupgrade character set utf8 collate utf8_bin; diff --git a/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.oracle.sql b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.oracle.sql new file mode 100644 index 0000000000000000000000000000000000000000..1087f228c34cc1ac17be057cf6b8037e43e26a29 --- /dev/null +++ b/modules/activiti-upgrade/src/test/resources/org/activiti/db/clean/clean.oracle.sql @@ -0,0 +1,24 @@ +drop table ACT_GE_PROPERTY cascade constraints; +drop table ACT_GE_BYTEARRAY cascade constraints; +drop table ACT_RE_MODEL cascade constraints; +drop table ACT_RE_DEPLOYMENT cascade constraints; +drop table ACT_RE_PROCDEF cascade constraints; +drop table ACT_RU_IDENTITYLINK cascade constraints; +drop table ACT_RU_VARIABLE cascade constraints; +drop table ACT_RU_TASK cascade constraints; +drop table ACT_RU_EXECUTION cascade constraints; +drop table ACT_RU_JOB cascade constraints; +drop table ACT_RU_EVENT_SUBSCR cascade constraints; + +drop table ACT_HI_PROCINST cascade constraints; +drop table ACT_HI_ACTINST cascade constraints; +drop table ACT_HI_VARINST cascade constraints; +drop table ACT_HI_TASKINST cascade constraints; +drop table ACT_HI_DETAIL cascade constraints; +drop table ACT_HI_COMMENT cascade constraints; +drop table ACT_HI_ATTACHMENT cascade constraints; + +drop table ACT_ID_INFO cascade constraints; +drop table ACT_ID_MEMBERSHIP cascade constraints; +drop table ACT_ID_GROUP cascade constraints; +drop table ACT_ID_USER cascade constraints; diff --git a/modules/activiti-webapp-explorer2/src/main/resources/org/activiti/explorer/demo/process/oneTaskProcess.bpmn20.xml b/modules/activiti-webapp-explorer2/src/main/resources/org/activiti/explorer/demo/process/oneTaskProcess.bpmn20.xml index b0413471695acafcbfd3ba92d76a0527e5228f37..289df99132efeeefe9e42cbe79da978e58e2599e 100644 --- a/modules/activiti-webapp-explorer2/src/main/resources/org/activiti/explorer/demo/process/oneTaskProcess.bpmn20.xml +++ b/modules/activiti-webapp-explorer2/src/main/resources/org/activiti/explorer/demo/process/oneTaskProcess.bpmn20.xml @@ -6,9 +6,9 @@ - + - + diff --git a/modules/activiti-webapp-explorer2/src/main/webapp/VAADIN/themes/activiti/styles.css b/modules/activiti-webapp-explorer2/src/main/webapp/VAADIN/themes/activiti/styles.css index de91263bfb7ee7749ba5d250e89e4c2e876cebe8..c53dacab5af458dc856cfb870152be6766d83e64 100644 --- a/modules/activiti-webapp-explorer2/src/main/webapp/VAADIN/themes/activiti/styles.css +++ b/modules/activiti-webapp-explorer2/src/main/webapp/VAADIN/themes/activiti/styles.css @@ -915,6 +915,14 @@ div.searchbox { .v-table-related-content-create-list .v-table-row-odd.v-selected { background: #DFF5FF; } + +/********************** +* Process definitions * +***********************/ + +.process-definition-suspend-choice { + margin: 5px 5px 5px 10px; +} /********************** * Custom Scrollbar CSS