Skip to content

F
Flowable Engine

开发团队 / Flowable Engine

通知 9
Star 0
Fork 0
F
Flowable Engine

体验新版 GitCode，发现更多精彩内容 >>

提交 2d884e21 编写于 作者: T Tom Baeyens
浏览文件
操作

ACT-1333 fixing upgrade script

上级 3b798170
隐藏空白更改
内联 并排
Showing with 31 addition and 33 deletion
modules/activiti-upgrade/pom.xml
浏览文件 @ 2d884e21
......@@ -143,7 +143,7 @@
<version>1.4</version>
<executions>
<execution>
<id>run.upgrade.data.generator</id>
<id>generate.data.file</id>
<phase>process-test-classes</phase>
<goals>
<goal>run</goal>
......@@ -187,10 +187,8 @@
</fileset>
</path>
</sql>
<condition property="isPostgres">
<equals arg1="${database}" arg2="postgres" />
</condition>
<java classname="org.activiti.upgrade.CleanPostgres" fork="true" if="isPostgres">
<java classname="org.activiti.upgrade.CleanPostgres" fork="true">
<arg line="${database}"/>
<classpath>
<path path="${test_classpath}"/>
</classpath>
......
modules/activiti-upgrade/src/test/java/org/activiti/upgrade/DatabaseFormatterPostgres.java
浏览文件 @ 2d884e21
......@@ -18,9 +18,9 @@ public class DatabaseFormatterPostgres extends DatabaseFormatter {
@Override
public String formatBinary(byte[] bytes) {
StringBuffer sb = new StringBuffer();
sb.append("E'\\\\x");
sb.append("decode('");
appendBytesInHex(sb, bytes);
sb.append("'");
sb.append("', 'hex')");
return sb.toString();
}
......
modules/activiti-upgrade/src/test/resources/org/activiti/db/5.10/data/postgres.data.sql
浏览文件 @ 2d884e21
insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_)
values('1', 'simpleTaskProcess', '2012-11-22 14:24:55');
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', E'\\x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D2273696D706C655461736B50726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D2273696D706C655461736B3122202F3E0A0A202020203C757365725461736B2069643D2273696D706C655461736B3122206E616D653D2273696D706C655461736B222061637469766974693A61737369676E65653D226B65726D6974222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D2273696D706C655461736B3122207461726765745265663D2273696D706C655461736B3222202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3222206E616D653D2273696D706C655461736B32222061637469766974693A61737369676E65653D227377656469736863686566223E0A2020202020203C646F63756D656E746174696F6E3E73706963792073617563653C2F646F63756D656E746174696F6E3E0A202020203C2F757365725461736B3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77332220736F757263655265663D2273696D706C655461736B3222207461726765745265663D2273696D706C655461736B3322202F3E0A202020200A202020203C757365725461736B2069643D2273696D706C655461736B3322206E616D653D2273696D706C655461736B3322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77342220736F757263655265663D2273696D706C655461736B3322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '1', false);
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',
......@@ -53,7 +53,7 @@ insert into ACT_HI_PROCINST (
'4',
null,
'simpleTaskProcess:1:3',
'2012-11-22 14:24:55',
'2012-11-22 17:06:51',
null,
null,
null,
......@@ -84,9 +84,9 @@ insert into ACT_HI_ACTINST (
null,
'startEvent',
null,
'2012-11-22 14:24:55',
'2012-11-22 14:24:55',
5
'2012-11-22 17:06:51',
'2012-11-22 17:06:51',
7
);
insert into ACT_HI_ACTINST (
......@@ -110,7 +110,7 @@ insert into ACT_HI_ACTINST (
'simpleTask',
'userTask',
'kermit',
'2012-11-22 14:24:55',
'2012-11-22 17:06:51',
null,
null
);
......@@ -123,7 +123,7 @@ insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORI
null,
null,
50,
'2012-11-22 14:24:55',
'2012-11-22 17:06:51',
null,
'kermit',
null,
......@@ -161,7 +161,7 @@ insert into ACT_HI_TASKINST (
null,
null,
'kermit',
'2012-11-22 14:24:55',
'2012-11-22 17:06:51',
null,
null,
null,
......@@ -191,7 +191,7 @@ insert into ACT_HI_ACTINST (
'simpleTask2',
'userTask',
'swedishchef',
'2012-11-22 14:24:55',
'2012-11-22 17:06:51',
null,
null
);
......@@ -204,7 +204,7 @@ insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORI
null,
'spicy sauce',
50,
'2012-11-22 14:24:55',
'2012-11-22 17:06:51',
null,
'swedishchef',
null,
......@@ -242,7 +242,7 @@ insert into ACT_HI_TASKINST (
'spicy sauce',
null,
'swedishchef',
'2012-11-22 14:24:55',
'2012-11-22 17:06:51',
null,
null,
null,
......@@ -269,8 +269,8 @@ update ACT_RU_EXECUTION set
update ACT_HI_ACTINST set
EXECUTION_ID_ = '4',
ASSIGNEE_ = 'kermit',
END_TIME_ = '2012-11-22 14:24:55',
DURATION_ = 109
END_TIME_ = '2012-11-22 17:06:51',
DURATION_ = 83
where ID_ = '6';
update ACT_HI_TASKINST set
......@@ -280,8 +280,8 @@ update ACT_HI_TASKINST set
DESCRIPTION_ = null,
OWNER_ = null,
ASSIGNEE_ = 'kermit',
END_TIME_ = '2012-11-22 14:24:55',
DURATION_ = 99,
END_TIME_ = '2012-11-22 17:06:51',
DURATION_ = 74,
DELETE_REASON_ = 'completed',
TASK_DEF_KEY_ = 'simpleTask1',
PRIORITY_ = 50,
......@@ -291,10 +291,10 @@ update ACT_HI_TASKINST set
delete from ACT_RU_TASK where ID_ = '7';
insert into ACT_RE_DEPLOYMENT(ID_, NAME_, DEPLOY_TIME_)
values('10', 'simpleTaskProcess', '2012-11-22 14:24:55');
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', E'\\x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A0A3C646566696E6974696F6E732069643D227461736B41737369676E65654578616D706C6522200A20202020202020202020202020786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C220A20202020202020202020202020786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E220A202020202020202020202020207461726765744E616D6573706163653D2255706772616465223E0A20200A20203C70726F636573732069643D227461736B57697468457865637574696F6E5661726961626C657350726F63657373223E0A20200A202020203C73746172744576656E742069643D227374617274222F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77312220736F757263655265663D22737461727422207461726765745265663D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A0A202020203C757365725461736B2069643D227461736B57697468457865637574696F6E5661726961626C657322206E616D653D227461736B57697468457865637574696F6E5661726961626C657322202F3E0A202020200A202020203C73657175656E6365466C6F772069643D22666C6F77322220736F757263655265663D227461736B57697468457865637574696F6E5661726961626C657322207461726765745265663D22656E6422202F3E0A202020200A202020203C656E644576656E742069643D22656E6422202F3E0A202020200A20203C2F70726F636573733E0A0A3C2F646566696E6974696F6E733E', '10', false);
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',
......@@ -345,7 +345,7 @@ insert into ACT_HI_PROCINST (
'13',
null,
'taskWithExecutionVariablesProcess:1:12',
'2012-11-22 14:24:55',
'2012-11-22 17:06:52',
null,
null,
null,
......@@ -376,8 +376,8 @@ insert into ACT_HI_ACTINST (
null,
'startEvent',
null,
'2012-11-22 14:24:55',
'2012-11-22 14:24:55',
'2012-11-22 17:06:52',
'2012-11-22 17:06:52',
0
);
......@@ -408,7 +408,7 @@ insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID
'player',
0,
'string',
'2012-11-22 14:24:55',
'2012-11-22 17:06:52',
null,
null,
null,
......@@ -443,7 +443,7 @@ insert into ACT_HI_DETAIL (ID_, TYPE_, PROC_INST_ID_, EXECUTION_ID_, ACT_INST_ID
'instrument',
0,
'string',
'2012-11-22 14:24:55',
'2012-11-22 17:06:52',
null,
null,
null,
......@@ -472,7 +472,7 @@ insert into ACT_HI_ACTINST (
'taskWithExecutionVariables',
'userTask',
null,
'2012-11-22 14:24:55',
'2012-11-22 17:06:52',
null,
null
);
......@@ -485,7 +485,7 @@ insert into ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORI
null,
null,
50,
'2012-11-22 14:24:55',
'2012-11-22 17:06:52',
null,
null,
null,
......@@ -523,7 +523,7 @@ insert into ACT_HI_TASKINST (
null,
null,
null,
'2012-11-22 14:24:55',
'2012-11-22 17:06:52',
null,
null,
null,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或