3:49 a.m.
Author: tom.baeyens(a)jboss.com
Date: 2009-10-30 04:49:25 -0400 (Fri, 30 Oct 2009)
New Revision: 5852
Modified:
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.oracle.upgrade.sql
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql
jbpm4/tags/jbpm-4.2/modules/pvm/src/main/resources/jbpm.history.hbm.xml
jbpm4/tags/jbpm-4.2/qa/build.xml
jbpm4/tags/jbpm-4.2/qa/upgrade/cfg/logging.properties
Log:
fixed duplicate index generation in hibernate mappings and oracle indexes upgrade
Modified:
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql
===================================================================
---
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql 2009-10-30
08:44:32 UTC (rev 5851)
+++
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql 2009-10-30
08:49:25 UTC (rev 5852)
@@ -311,10 +311,6 @@
create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_);
- create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_);
-
- create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_);
-
create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_);
create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_);
@@ -339,6 +335,8 @@
foreign key (HVAR_)
references JBPM4_HIST_VAR;
+ create index IDX_HSUPERT_SUB on JBPM4_HIST_TASK (SUPERTASK_);
+
alter table JBPM4_HIST_TASK
add constraint FK_HSUPERT_SUB
foreign key (SUPERTASK_)
Modified:
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql
===================================================================
---
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql 2009-10-30
08:44:32 UTC (rev 5851)
+++
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql 2009-10-30
08:49:25 UTC (rev 5852)
@@ -317,10 +317,6 @@
create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_);
- create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_);
-
- create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_);
-
create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_);
create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_);
@@ -349,6 +345,8 @@
foreign key (HVAR_)
references JBPM4_HIST_VAR (DBID_);
+ create index IDX_HSUPERT_SUB on JBPM4_HIST_TASK (SUPERTASK_);
+
alter table JBPM4_HIST_TASK
add index FK_HSUPERT_SUB (SUPERTASK_),
add constraint FK_HSUPERT_SUB
Modified:
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql
===================================================================
---
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql 2009-10-30
08:44:32 UTC (rev 5851)
+++
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql 2009-10-30
08:49:25 UTC (rev 5852)
@@ -310,10 +310,6 @@
create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_);
- create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_);
-
- create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_);
-
create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_);
create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_);
@@ -338,6 +334,8 @@
foreign key (HVAR_)
references JBPM4_HIST_VAR;
+ create index IDX_HSUPERT_SUB on JBPM4_HIST_TASK (SUPERTASK_);
+
alter table JBPM4_HIST_TASK
add constraint FK_HSUPERT_SUB
foreign key (SUPERTASK_)
Modified:
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql
===================================================================
---
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql 2009-10-30
08:44:32 UTC (rev 5851)
+++
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql 2009-10-30
08:49:25 UTC (rev 5852)
@@ -310,10 +310,6 @@
create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_);
- create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_);
-
- create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_);
-
create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_);
create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_);
@@ -338,6 +334,8 @@
foreign key (HVAR_)
references JBPM4_HIST_VAR;
+ create index IDX_HSUPERT_SUB on JBPM4_HIST_TASK (SUPERTASK_);
+
alter table JBPM4_HIST_TASK
add constraint FK_HSUPERT_SUB
foreign key (SUPERTASK_)
Modified:
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql
===================================================================
---
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql 2009-10-30
08:44:32 UTC (rev 5851)
+++
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql 2009-10-30
08:49:25 UTC (rev 5852)
@@ -9,3 +9,9 @@
drop index IDX_HDETAIL_HACTI;
drop index IDX_HDETAIL_HPROCI;
+
+ drop index IDX_HDETAIL_HVAR;
+
+ drop index IDX_HDETAIL_HTASK;
+
+ create index IDX_HSUPERT_SUB on JBPM4_HIST_TASK (SUPERTASK_);
Modified:
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql
===================================================================
---
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql 2009-10-30
08:44:32 UTC (rev 5851)
+++
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql 2009-10-30
08:49:25 UTC (rev 5852)
@@ -9,3 +9,9 @@
alter table JBPM4_HIST_DETAIL drop index IDX_HDETAIL_HACTI;
alter table JBPM4_HIST_DETAIL drop index IDX_HDETAIL_HPROCI;
+
+ alter table JBPM4_HIST_DETAIL drop index IDX_HDETAIL_HVAR;
+
+ alter table JBPM4_HIST_DETAIL drop index IDX_HDETAIL_HTASK;
+
+ create index IDX_HSUPERT_SUB on JBPM4_HIST_TASK (SUPERTASK_);
Modified:
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.oracle.upgrade.sql
===================================================================
---
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.oracle.upgrade.sql 2009-10-30
08:44:32 UTC (rev 5851)
+++
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.oracle.upgrade.sql 2009-10-30
08:49:25 UTC (rev 5852)
@@ -5,3 +5,14 @@
VALUE_ varchar2(255 char),
primary key (KEY_)
);
+
+ drop index IDX_HDETAIL_HVAR;
+
+ drop index IDX_HDETAIL_HTASK;
+
+ create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_);
+
+ create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_);
+
+ create index IDX_HSUPERT_SUB on JBPM4_HIST_TASK (SUPERTASK_);
+
Modified:
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql
===================================================================
---
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql 2009-10-30
08:44:32 UTC (rev 5851)
+++
jbpm4/tags/jbpm-4.2/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql 2009-10-30
08:49:25 UTC (rev 5852)
@@ -11,3 +11,9 @@
drop index IDX_HDETAIL_HACTI;
drop index IDX_HDETAIL_HPROCI;
+
+ drop index IDX_HDETAIL_HVAR;
+
+ drop index IDX_HDETAIL_HTASK;
+
+ create index IDX_HSUPERT_SUB on JBPM4_HIST_TASK (SUPERTASK_);
Modified: jbpm4/tags/jbpm-4.2/modules/pvm/src/main/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/tags/jbpm-4.2/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-30
08:44:32 UTC (rev 5851)
+++ jbpm4/tags/jbpm-4.2/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-30
08:49:25 UTC (rev 5852)
@@ -23,23 +23,23 @@
<set name="historyActivityInstances"
cascade="all">
- <key foreign-key="FK_HACTI_HPROCI">
- <column name="HPROCI_" index="IDX_HACTI_HPROCI" />
+ <key foreign-key="none">
+ <column name="HPROCI_" />
</key>
<one-to-many class="HistoryActivityInstanceImpl" />
</set>
<set name="historyVariables"
cascade="all">
- <key foreign-key="FK_HVAR_HPROCI">
- <column name="HPROCI_" index="IDX_HVAR_HPROCI" />
+ <key foreign-key="none">
+ <column name="HPROCI_" />
</key>
<one-to-many class="HistoryVariableImpl" />
</set>
<set name="details"
cascade="all">
- <key foreign-key="FK_HDETAIL_HPROCI">
+ <key foreign-key="none">
<column name="HPROCI_" />
</key>
<one-to-many class="HistoryDetailImpl" />
@@ -59,7 +59,8 @@
<many-to-one name="historyProcessInstance"
class="HistoryProcessInstanceImpl"
column="HPROCI_"
- foreign-key="none" />
+ foreign-key="FK_HACTI_HPROCI"
+ index="IDX_HACTI_HPROCI" />
<property name="type" column="TYPE_" />
<property name="executionId" column="EXECUTION_" />
@@ -72,7 +73,7 @@
<set name="details"
cascade="all">
- <key foreign-key="FK_HDETAIL_HACTI">
+ <key foreign-key="none">
<column name="HACTI_" />
</key>
<one-to-many class="HistoryDetailImpl" />
@@ -83,12 +84,12 @@
</subclass>
<subclass name="HistoryTaskInstanceImpl"
discriminator-value="task">
- <many-to-one name="historyTask"
- class="HistoryTaskImpl"
- column="HTASK_"
- cascade="all"
- foreign-key="FK_HTI_HTASK"
- index="IDX_HTI_HTASK" />
+ <many-to-one name="historyTask"
+ class="HistoryTaskImpl"
+ column="HTASK_"
+ cascade="all"
+ foreign-key="FK_HTI_HTASK"
+ index="IDX_HTI_HTASK" />
</subclass>
</class>
@@ -111,22 +112,24 @@
<set name="details"
cascade="all">
- <key foreign-key="FK_HDETAIL_HTASK">
- <column name="HTASK_" index="IDX_HDETAIL_HTASK" />
+ <key foreign-key="none">
+ <column name="HTASK_" />
</key>
<one-to-many class="HistoryDetailImpl" />
</set>
<set name="historyVariables"
cascade="all">
- <key foreign-key="FK_HVAR_HTASK">
- <column name="HTASK_" index="IDX_HVAR_HTASK" />
+ <key foreign-key="none">
+ <column name="HTASK_" />
</key>
<one-to-many class="HistoryVariableImpl" />
</set>
<set name="subTasks" cascade="all-delete-orphan">
- <key column="SUPERTASK_" foreign-key="FK_HSUPERT_SUB" />
+ <key foreign-key="FK_HSUPERT_SUB">
+ <column name="SUPERTASK_" index="IDX_HSUPERT_SUB" />
+ </key>
<one-to-many class="HistoryTaskImpl" />
</set>
@@ -148,18 +151,20 @@
<many-to-one name="historyProcessInstance"
class="HistoryProcessInstanceImpl"
column="HPROCI_"
- foreign-key="none" />
+ foreign-key="FK_HVAR_HPROCI"
+ index="IDX_HVAR_HPROCI" />
<!-- the foreign-key is set on the other side of the relation: see
historyVariables above in HistoryTaskImpl -->
<many-to-one name="historyTask"
class="HistoryTaskImpl"
column="HTASK_"
- foreign-key="none" />
+ foreign-key="FK_HVAR_HTASK"
+ index="IDX_HVAR_HTASK" />
<set name="details"
cascade="all">
- <key foreign-key="FK_HDETAIL_HVAR">
- <column name="HVAR_" index="IDX_HDETAIL_HVAR" />
+ <key foreign-key="none">
+ <column name="HVAR_" />
</key>
<one-to-many class="HistoryDetailImpl" />
</set>
@@ -180,40 +185,40 @@
<many-to-one name="historyProcessInstance"
class="HistoryProcessInstanceImpl"
column="HPROCI_"
- foreign-key="FK_HDET_HPROCI"
+ foreign-key="FK_HDETAIL_HPROCI"
index="IDX_HDET_HPROCI" />
<property name="historyProcessInstanceIndex"
column="HPROCIIDX_" />
<many-to-one name="historyActivityInstance"
class="HistoryActivityInstanceImpl"
column="HACTI_"
- foreign-key="FK_HDET_HACTI"
+ foreign-key="FK_HDETAIL_HACTI"
index="IDX_HDET_HACTI" />
<property name="historyActivityInstanceIndex"
column="HACTIIDX_" />
<many-to-one name="historyTask"
class="HistoryTaskImpl"
column="HTASK_"
- foreign-key="FK_HDET_HTASK"
+ foreign-key="FK_HDETAIL_HTASK"
index="IDX_HDET_HTASK" />
<property name="historyTaskIndex" column="HTASKIDX_" />
<many-to-one name="historyVariable"
class="HistoryVariableImpl"
column="HVAR_"
- foreign-key="FK_HDET_HVAR"
+ foreign-key="FK_HDETAIL_HVAR"
index="IDX_HDET_HVAR" />
<property name="historyVariableIndex" column="HVARIDX_" />
<subclass name="HistoryCommentImpl"
discriminator-value="comment">
- <property name="message" column="MESSAGE_"
type="text" />
- <list name="replies"
- cascade="all-delete-orphan"
- inverse="false">
- <key column="PARENT_" foreign-key="none" />
- <list-index column="PARENT_IDX_" />
- <one-to-many class="HistoryCommentImpl" />
- </list>
+ <property name="message" column="MESSAGE_"
type="text" />
+ <list name="replies"
+ cascade="all-delete-orphan"
+ inverse="false">
+ <key column="PARENT_" foreign-key="none" />
+ <list-index column="PARENT_IDX_" />
+ <one-to-many class="HistoryCommentImpl" />
+ </list>
</subclass>
<subclass name="HistoryProcessInstanceMigrationImpl"
discriminator-value="instance-migration">
Modified: jbpm4/tags/jbpm-4.2/qa/build.xml
===================================================================
--- jbpm4/tags/jbpm-4.2/qa/build.xml 2009-10-30 08:44:32 UTC (rev 5851)
+++ jbpm4/tags/jbpm-4.2/qa/build.xml 2009-10-30 08:49:25 UTC (rev 5852)
@@ -184,6 +184,9 @@
<replacefilter token="PVM1" value="PVM2" />
<replacefilter token="pvm1" value="pvm2" />
</replace>
+ <copy todir="upgrade/target/jdbc" overwrite="true"
failonerror="false">
+ <fileset dir="${user.home}/.jbpm4/jdbc" />
+ </copy>
<!-- install the jbpm-test-upgrade lib -->
<delete dir="upgrade/target/jbpm-test-upgrade" />
<mkdir dir="upgrade/target/jbpm-test-upgrade" />
Modified: jbpm4/tags/jbpm-4.2/qa/upgrade/cfg/logging.properties
===================================================================
--- jbpm4/tags/jbpm-4.2/qa/upgrade/cfg/logging.properties 2009-10-30 08:44:32 UTC (rev
5851)
+++ jbpm4/tags/jbpm-4.2/qa/upgrade/cfg/logging.properties 2009-10-30 08:49:25 UTC (rev
5852)
@@ -9,7 +9,7 @@
# org.jbpm.pvm.internal.wire.level=FINE
# org.jbpm.pvm.internal.util.level=FINE
-org.hibernate.level=FINE
+org.hibernate.level=INFO
org.hibernate.cfg.SettingsFactory.level=SEVERE
org.hibernate.cfg.HbmBinder.level=SEVERE
# org.hibernate.SQL.level=FINEST