Author: tom.baeyens(a)jboss.com Date: 2009-10-27 07:31:02 -0400 (Tue, 27 Oct 2009) New Revision: 5812 Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml Log: JBPM-2597 fix oracle schema creation errors Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -311,14 +311,10 @@ create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDETAIL_HACTI on JBPM4_HIST_DETAIL (HACTI_); - create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_); - create index IDX_HDETAIL_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_); Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -317,14 +317,10 @@ create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDETAIL_HACTI on JBPM4_HIST_DETAIL (HACTI_); - create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_); - create index IDX_HDETAIL_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_); Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -310,14 +310,10 @@ create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDETAIL_HACTI on JBPM4_HIST_DETAIL (HACTI_); - create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_); - create index IDX_HDETAIL_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_); Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -310,14 +310,10 @@ create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDETAIL_HACTI on JBPM4_HIST_DETAIL (HACTI_); - create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_); - create index IDX_HDETAIL_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_); Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -1,6 +1,11 @@ -create table JBPM4_PROPERTY ( - KEY_ varchar(255) not null, - VERSION_ integer not null, - VALUE_ varchar(255), - primary key (KEY_) -); + + create table JBPM4_PROPERTY ( + KEY_ varchar(255) not null, + VERSION_ integer not null, + VALUE_ varchar(255), + primary key (KEY_) + ); + + drop index IDX_HDETAIL_HACTI; + + drop index IDX_HDETAIL_HPROCI; Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -5,3 +5,7 @@ VALUE_ varchar(255), primary key (KEY_) ) type=InnoDB; + + alter table JBPM4_HIST_DETAIL drop index IDX_HDETAIL_HACTI; + + alter table JBPM4_HIST_DETAIL drop index IDX_HDETAIL_HPROCI; Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -7,4 +7,7 @@ ); drop sequence hibernate_sequence; - \ No newline at end of file + + drop index IDX_HDETAIL_HACTI; + + drop index IDX_HDETAIL_HPROCI; Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-27 11:31:02 UTC (rev 5812) @@ -40,7 +40,7 @@ <set name="details" cascade="all"> <key foreign-key="FK_HDETAIL_HPROCI"> - <column name="HPROCI_" index="IDX_HDETAIL_HPROCI" /> + <column name="HPROCI_" /> </key> <one-to-many class="HistoryDetailImpl" /> </set> @@ -73,7 +73,7 @@ <set name="details" cascade="all"> <key foreign-key="FK_HDETAIL_HACTI"> - <column name="HACTI_" index="IDX_HDETAIL_HACTI" /> + <column name="HACTI_" /> </key> <one-to-many class="HistoryDetailImpl" /> </set>