From ac33df77d2831f2231776676f249eb3ecc6c5346 Mon Sep 17 00:00:00 2001 From: "kristin.polenz" Date: Tue, 19 Oct 2010 19:26:27 +0000 Subject: [PATCH] Changed table schema ACT_CY_LINK and delete tables for ArtifactRevision and Artifact. --- .../db/cycle/create/activiti.h2.create.sql | 38 ++----- .../db/cycle/create/activiti.mysql.create.sql | 40 +++----- .../cycle/create/activiti.oracle.create.sql | 38 ++----- .../cycle/create/activiti.postgres.create.sql | 38 ++----- .../db/cycle/drop/activiti.h2.drop.sql | 2 - .../db/cycle/drop/activiti.mysql.drop.sql | 4 +- .../db/cycle/drop/activiti.oracle.drop.sql | 4 +- .../db/cycle/drop/activiti.postgres.drop.sql | 4 +- .../activiti/db/cycle/ibatis/link.mapping.xml | 98 ++++++++++++++++--- 9 files changed, 126 insertions(+), 140 deletions(-) diff --git a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.h2.create.sql b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.h2.create.sql index 109cdc9e25..6989aae4f0 100644 --- a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.h2.create.sql +++ b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.h2.create.sql @@ -6,44 +6,26 @@ create table ACT_CY_CONFIG ( ); create table ACT_CY_LINK ( - ID_ varchar, + ID_ varchar AUTO_INCREMENT, + SOURCE_CONNECTOR_ID_ varchar, + TARGET_CONNECTOR_ID_ varchar, + SOURCE_ARTIFACT_ID_ varchar, + TARGET_ARTIFACT_ID_ varchar, + SOURCE_ELEMENT_ID_ varchar DEFAULT NULL, TARGET_ELEMENT_ID_ varchar DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar, + SOURCE_ELEMENT_NAME_ varchar DEFAULT NULL, + TARGET_ELEMENT_NAME_ varchar DEFAULT NULL, + SOURCE_REVISION_ bigint DEFAULT NULL, TARGET_REVISION_ bigint DEFAULT NULL, - SOURCE_ARTIFACT_ID_ varchar, LINK_TYPE_ varchar, DESCRIPTION_ varchar, LINKED_BOTH_WAYS_ boolean, primary key(ID_) ); -create table ACT_CY_ARTIFACT ( - ID_ varchar, - SOURCE_ELEMENT_ID_ varchar DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar, - primary key (ID_) -); - -create table ACT_CY_ARTIFACT_REVISION ( - ID_ varchar auto_increment, - ARTIFACT_ID_ varchar, - REVISION_ bigint, - primary key (ID_) -); - create table ACT_CY_TAG ( ID_ bigint, NAME_ varchar, ALIAS_ varchar, primary key(ID_) -); - -alter table ACT_CY_LINK - add constraint FK_LINK_ARTIFACT - foreign key (SOURCE_ARTIFACT_ID_) - references ACT_CY_ARTIFACT (ID_); - -alter table ACT_CY_ARTIFACT_REVISION - add constraint FK_REVISION_ARTIFACT - foreign key (ARTIFACT_ID_) - references ACT_CY_ARTIFACT (ID_); +); \ No newline at end of file diff --git a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.mysql.create.sql b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.mysql.create.sql index 0c1749a5aa..bd38572dee 100644 --- a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.mysql.create.sql +++ b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.mysql.create.sql @@ -6,44 +6,26 @@ create table ACT_CY_CONFIG ( ) TYPE=InnoDB; create table ACT_CY_LINK ( - ID_ varchar(255), + ID_ varchar(255) AUTO_INCREMENT, + SOURCE_CONNECTOR_ID_ varchar(255), + TARGET_CONNECTOR_ID_ varchar(255), + SOURCE_ARTIFACT_ID_ varchar(255), + TARGET_ARTIFACT_ID_ varchar(255), + SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255), + SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, + TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, + SOURCE_REVISION_ bigint DEFAULT NULL, TARGET_REVISION_ bigint DEFAULT NULL, - SOURCE_ARTIFACT_ID_ varchar(255), - LINK_TYPE_ varchar(255), + LINK_TYPE_ varchar(255) , DESCRIPTION_ varchar(255), LINKED_BOTH_WAYS_ boolean, primary key(ID_) )TYPE=InnoDB; -create table ACT_CY_ARTIFACT ( - ID_ varchar(255), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255), - primary key (ID_) -)TYPE=InnoDB; - -create table ACT_CY_ARTIFACT_REVISION ( - ID_ varchar(255) auto_increment, - ARTIFACT_ID_ varchar(255), - REVISION_ bigint, - primary key (ID_) -)TYPE=InnoDB; - create table ACT_CY_TAG ( ID_ bigint, NAME_ varchar(255), ALIAS_ varchar(255), primary key(ID_) -)TYPE=InnoDB; - -alter table ACT_CY_LINK - add constraint FK_LINK_ARTIFACT - foreign key (SOURCE_ARTIFACT_ID_) - references ACT_CY_ARTIFACT (ID_); - -alter table ACT_CY_ARTIFACT_REVISION - add constraint FK_REVISION_ARTIFACT - foreign key (ARTIFACT_ID_) - references ACT_CY_ARTIFACT (ID_); \ No newline at end of file +)TYPE=InnoDB; \ No newline at end of file diff --git a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.oracle.create.sql b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.oracle.create.sql index bef7869efb..ad6998d14e 100644 --- a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.oracle.create.sql +++ b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.oracle.create.sql @@ -6,44 +6,26 @@ create table ACT_CY_CONFIG ( ); create table ACT_CY_LINK ( - ID_ NVARCHAR2(255), + ID_ NVARCHAR2(255) AUTO_INCREMENT, + SOURCE_CONNECTOR_ID_ NVARCHAR2(255), + TARGET_CONNECTOR_ID_ NVARCHAR2(255), + SOURCE_ARTIFACT_ID_ NVARCHAR2(255), + TARGET_ARTIFACT_ID_ NVARCHAR2(255), + SOURCE_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, TARGET_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ NVARCHAR2(255), + SOURCE_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, + TARGET_ELEMENT_NAME_ NVARCHAR2(255) DEFAULT NULL, + SOURCE_REVISION_ INTEGER DEFAULT NULL, TARGET_REVISION_ INTEGER DEFAULT NULL, - SOURCE_ARTIFACT_ID_ NVARCHAR2(255), LINK_TYPE_ NVARCHAR2(255), DESCRIPTION_ NVARCHAR2(255), LINKED_BOTH_WAYS_ boolean, primary key(ID_) ); -create table ACT_CY_ARTIFACT ( - ID_ NVARCHAR2(255), - SOURCE_ELEMENT_ID_ NVARCHAR2(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ NVARCHAR2(255), - primary key (ID_) -); - -create table ACT_CY_ARTIFACT_REVISION ( - ID_ NVARCHAR2(255) auto_increment, - ARTIFACT_ID_ NVARCHAR2(255), - REVISION_ INTEGER, - primary key (ID_) -); - create table ACT_CY_TAG ( ID_ INTEGER, NAME_ NVARCHAR2(255), ALIAS_ NVARCHAR2(255), primary key(ID_) -); - -alter table ACT_CY_LINK - add constraint FK_LINK_ARTIFACT - foreign key (SOURCE_ARTIFACT_ID_) - references ACT_CY_ARTIFACT (ID_); - -alter table ACT_CY_ARTIFACT_REVISION - add constraint FK_REVISION_ARTIFACT - foreign key (ARTIFACT_ID_) - references ACT_CY_ARTIFACT (ID_); \ No newline at end of file +); \ No newline at end of file diff --git a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.postgres.create.sql b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.postgres.create.sql index 28ba8abdca..56f56641fb 100644 --- a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.postgres.create.sql +++ b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/create/activiti.postgres.create.sql @@ -6,44 +6,26 @@ create table ACT_CY_CONFIG ( ); create table ACT_CY_LINK ( - ID_ varchar(255), + ID_ varchar(255) AUTO_INCREMENT, + SOURCE_CONNECTOR_ID_ varchar(255), + TARGET_CONNECTOR_ID_ varchar(255), + SOURCE_ARTIFACT_ID_ varchar(255), + TARGET_ARTIFACT_ID_ varchar(255), + SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, TARGET_ELEMENT_ID_ varchar(255) DEFAULT NULL, - TARGET_ELEMENT_NAME_ varchar(255), + SOURCE_ELEMENT_NAME_ varchar(255) DEFAULT NULL, + TARGET_ELEMENT_NAME_ varchar(255) DEFAULT NULL, + SOURCE_REVISION_ bigint DEFAULT NULL, TARGET_REVISION_ bigint DEFAULT NULL, - SOURCE_ARTIFACT_ID_ varchar(255), LINK_TYPE_ varchar(255), DESCRIPTION_ varchar(255), LINKED_BOTH_WAYS_ boolean, primary key(ID_) ); -create table ACT_CY_ARTIFACT ( - ID_ varchar(255), - SOURCE_ELEMENT_ID_ varchar(255) DEFAULT NULL, - SOURCE_ELEMENT_NAME_ varchar(255), - primary key (ID_) -); - -create table ACT_CY_ARTIFACT_REVISION ( - ID_ varchar(255) auto_increment, - ARTIFACT_ID_ varchar(255), - REVISION_ bigint, - primary key (ID_) -); - create table ACT_CY_TAG ( ID_ bigint, NAME_ varchar(255), ALIAS_ varchar(255), primary key(ID_) -); - -alter table ACT_CY_LINK - add constraint FK_LINK_ARTIFACT - foreign key (SOURCE_ARTIFACT_ID_) - references ACT_CY_ARTIFACT (ID_); - -alter table ACT_CY_ARTIFACT_REVISION - add constraint FK_REVISION_ARTIFACT - foreign key (ARTIFACT_ID_) - references ACT_CY_ARTIFACT (ID_); \ No newline at end of file +); \ No newline at end of file diff --git a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.h2.drop.sql b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.h2.drop.sql index fef7a40d19..a1ff1df2ad 100644 --- a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.h2.drop.sql +++ b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.h2.drop.sql @@ -1,5 +1,3 @@ drop table ACT_CY_CONFIG if exists; -drop table ACT_CY_ARTIFACT if exists; drop table ACT_CY_LINK if exists; -drop table ACT_CY_ARTIFACT_REVISION if exists; drop table ACT_CY_TAG if exists; \ No newline at end of file diff --git a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.mysql.drop.sql b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.mysql.drop.sql index b60d26634c..8dcb83f104 100644 --- a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.mysql.drop.sql +++ b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.mysql.drop.sql @@ -1,5 +1,3 @@ drop table if exists ACT_CY_CONFIG; drop table if exists ACT_CY_LINK; -drop table if exists ACT_CY_TAG; -drop table if exists ACT_CY_ARTIFACT; -drop table if exists ACT_CY_ARTIFACT_REVISION; \ No newline at end of file +drop table if exists ACT_CY_TAG; \ No newline at end of file diff --git a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.oracle.drop.sql b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.oracle.drop.sql index 71c03680a6..db9fc98970 100644 --- a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.oracle.drop.sql +++ b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.oracle.drop.sql @@ -1,5 +1,3 @@ drop table ACT_CY_CONFIG; drop table ACT_CY_LINK; -drop table ACT_CY_TAG; -drop table ACT_CY_ARTIFACT; -drop table ACT_CY_ARTIFACT_REVISION; \ No newline at end of file +drop table ACT_CY_TAG; \ No newline at end of file diff --git a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.postgres.drop.sql b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.postgres.drop.sql index 71c03680a6..db9fc98970 100644 --- a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.postgres.drop.sql +++ b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/drop/activiti.postgres.drop.sql @@ -1,5 +1,3 @@ drop table ACT_CY_CONFIG; drop table ACT_CY_LINK; -drop table ACT_CY_TAG; -drop table ACT_CY_ARTIFACT; -drop table ACT_CY_ARTIFACT_REVISION; \ No newline at end of file +drop table ACT_CY_TAG; \ No newline at end of file diff --git a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/ibatis/link.mapping.xml b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/ibatis/link.mapping.xml index f13e41bdde..cf18862f0b 100644 --- a/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/ibatis/link.mapping.xml +++ b/modules/activiti-cycle/src/main/resources/org/activiti/db/cycle/ibatis/link.mapping.xml @@ -4,7 +4,58 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into ACT_CY_LINK (ID_,SOURCE_CONNECTOR_ID_, TARGET_CONNECTOR_ID_, SOURCE_ARTIFACT_ID_,TARGET_ARTIFACT_ID_,SOURCE_ELEMENT_ID_,TARGET_ELEMENT_ID_,SOURCE_ELEMENT_NAME_,TARGET_ELEMENT_NAME_, SOURCE_REVISION_, TARGET_REVISION_ , LINK_TYPE_, DESCRIPTION_, LINKED_BOTH_WAYS_) + values ( + #{id, jdbcType=VARCHAR}, + #{sourceConnectorId, jdbcType=VARCHAR}, + #{targetConnectorId, jdbcType=VARCHAR}, + #{sourceArtifactId, jdbcType=VARCHAR}, + #{targetArtifactId, jdbcType=VARCHAR}, + #{sourceElementId, jdbcType=VARCHAR}, + #{targetElementId, jdbcType=VARCHAR}, + #{sourceElementName, jdbcType=VARCHAR}, + #{targetElementName, jdbcType=VARCHAR}, + #{sourceRevision, jdbcType=BIGINT}, + #{targetRevision, jdbcType=BIGINT}, + #{linkType, jdbcType=VARCHAR}, + #{description, jdbcType=VARCHAR}, + #{linkedBothWays, jdbcType=BOOLEAN} + ) + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + + --> + + -- GitLab