From 5a5c65da7a0cf0fde37e3183dcfe5fb8f2656bde Mon Sep 17 00:00:00 2001 From: Eberhard Heber Date: Wed, 5 Jul 2017 08:42:50 +0200 Subject: [PATCH] changed table name BUSINESS_CLASSIFICATION to CLASSIFICATION --- .../model/mappings/ClassificationMapper.java | 10 +++++----- .../src/main/resources/sql/db-structure.sql | 4 ++-- .../resources/sql/sample-data/classification.sql | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java b/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java index 837c3fa66..a39f2674a 100644 --- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java +++ b/lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java @@ -7,7 +7,7 @@ import java.util.List; public interface ClassificationMapper { - @Select("SELECT * FROM BUSINESS_CLASSIFICATION ORDER BY ID") + @Select("SELECT * FROM CLASSIFICATION ORDER BY ID") @Results({ @Result(property="id", column="ID"), @Result(property="tenantId", column="TENANT_ID"), @@ -23,15 +23,15 @@ public interface ClassificationMapper { }) List findAll(); - @Select("SELECT * FROM BUSINESS_CLASSIFICATION WHERE PARENT_CLASSIFICATION_ID = #{parentClassificationId} ORDER BY ID") + @Select("SELECT * FROM CLASSIFICATION WHERE PARENT_CLASSIFICATION_ID = #{parentClassificationId} ORDER BY ID") List findByParentId(@Param("parentClassificationId") String parentId); - @Select("SELECT * FROM BUSINESS_CLASSIFICATION WHERE ID = #{classificationId}") + @Select("SELECT * FROM CLASSIFICATION WHERE ID = #{classificationId}") Classification findById(@Param("classificationId") String classificationId); - @Insert("INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES (#{classification.id}, #{classification.tenantId}, #{classification.parentClassificationId}, #{classification.category}, #{classification.type}, #{classification.created}, #{classification.name}, #{classification.description}, #{classification.priority}, #{classification.serviceLevel})") + @Insert("INSERT INTO CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES (#{classification.id}, #{classification.tenantId}, #{classification.parentClassificationId}, #{classification.category}, #{classification.type}, #{classification.created}, #{classification.name}, #{classification.description}, #{classification.priority}, #{classification.serviceLevel})") void insert(@Param("classification") Classification classification); - @Update(value = "UPDATE BUSINESS_CLASSIFICATION SET TENANT_ID = #{classification.tenantId}, PARENT_CLASSIFICATION_ID = #{classification.parentClassificationId}, CATEGORY = #{classification.category}, TYPE = #{classification.type}, NAME = #{classification.name}, DESCRIPTION = #{classification.description}, PRIORITY = #{classification.priority}, SERVICE_LEVEL = #{classification.serviceLevel}, MODIFIED = #{classification.modified} WHERE ID = #{classification.id}") + @Update(value = "UPDATE CLASSIFICATION SET TENANT_ID = #{classification.tenantId}, PARENT_CLASSIFICATION_ID = #{classification.parentClassificationId}, CATEGORY = #{classification.category}, TYPE = #{classification.type}, NAME = #{classification.name}, DESCRIPTION = #{classification.description}, PRIORITY = #{classification.priority}, SERVICE_LEVEL = #{classification.serviceLevel}, MODIFIED = #{classification.modified} WHERE ID = #{classification.id}") void update(@Param("classification") Classification classification); } diff --git a/lib/taskana-core/src/main/resources/sql/db-structure.sql b/lib/taskana-core/src/main/resources/sql/db-structure.sql index 46b39f648..eee36ec38 100644 --- a/lib/taskana-core/src/main/resources/sql/db-structure.sql +++ b/lib/taskana-core/src/main/resources/sql/db-structure.sql @@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS DISTRIBUTION_TARGETS( PRIMARY KEY (SOURCE_ID, TARGET_ID) ); -CREATE TABLE IF NOT EXISTS BUSINESS_CLASSIFICATION( +CREATE TABLE IF NOT EXISTS CLASSIFICATION( ID varchar(255) NOT NULL, TENANT_ID varchar(255) NULL, PARENT_CLASSIFICATION_ID varchar(255), @@ -63,4 +63,4 @@ CREATE TABLE IF NOT EXISTS WORKBASKET_ACCESS_LIST( TRANSFER bit NOT NULL, DISTRIBUTE bit NOT NULL, PRIMARY KEY (ID) -); \ No newline at end of file +); diff --git a/rest/src/main/resources/sql/sample-data/classification.sql b/rest/src/main/resources/sql/sample-data/classification.sql index 0a2a27bc8..26776cf92 100644 --- a/rest/src/main/resources/sql/sample-data/classification.sql +++ b/rest/src/main/resources/sql/sample-data/classification.sql @@ -1,9 +1,9 @@ -INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('1', 'NT', '', 'EXTERN', 'BRIEF', CURRENT_TIMESTAMP, 'ROOT', 'DESC', 1, 'P1D'); -INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('2', 'NT', '1','MANUELL', 'BRIEF', CURRENT_TIMESTAMP, 'CHILD', 'DESC', 1, 'P1D'); -INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('3', 'NT', '1','MASCHINELL', 'BRIEF', CURRENT_TIMESTAMP, 'ANOTHER CHILD', 'DESC', 1, 'P2D'); -INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('4', 'NT', '2','PROZESS', 'EXCEL-SHEET', CURRENT_TIMESTAMP, 'GRANDCHILD', 'DESC', 1, 'P1DT4H12S'); +INSERT INTO CLASSIFICATION VALUES ('1', 'NT', '', 'EXTERN', 'BRIEF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'ROOT', 'DESC', 1, 'P1D'); +INSERT INTO CLASSIFICATION VALUES ('2', 'NT', '1','MANUELL', 'BRIEF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'CHILD', 'DESC', 1, 'P1D'); +INSERT INTO CLASSIFICATION VALUES ('3', 'NT', '1','MASCHINELL', 'BRIEF', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'ANOTHER CHILD', 'DESC', 1, 'P2D'); +INSERT INTO CLASSIFICATION VALUES ('4', 'NT', '2','PROZESS', 'EXCEL-SHEET', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'GRANDCHILD', 'DESC', 1, 'P1DT4H12S'); -INSERT INTO BUSINESS_CLASSIFICATION VALUES('13', 'NT', '3', 'MANUELL', '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'ANOTHER GRANDCHILD', 'DESC', 3, 'P3DT12H', NULL); -INSERT INTO BUSINESS_CLASSIFICATION VALUES('14', 'NT', '4', 'MANUELL', '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BIG GRANDCHILD', 'DESC', 2, 'P2DT12H', NULL); -INSERT INTO BUSINESS_CLASSIFICATION VALUES('15', 'NT', '3', 'PROZESS', 'MINDMAP', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SMALL GRANDCHILD', 'DESC', 4, 'P5DT12H', NULL); -INSERT INTO BUSINESS_CLASSIFICATION VALUES('16', 'NT', '4', 'MANUELL', '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'NO GRANDCHILD', 'DESC', 3, 'P3DT', NULL); +INSERT INTO CLASSIFICATION VALUES('13', 'NT', '3', 'MANUELL', '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'ANOTHER GRANDCHILD', 'DESC', 3, 'P3DT12H'); +INSERT INTO CLASSIFICATION VALUES('14', 'NT', '4', 'MANUELL', '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BIG GRANDCHILD', 'DESC', 2, 'P2DT12H'); +INSERT INTO CLASSIFICATION VALUES('15', 'NT', '3', 'PROZESS', 'MINDMAP', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SMALL GRANDCHILD', 'DESC', 4, 'P5DT12H'); +INSERT INTO CLASSIFICATION VALUES('16', 'NT', '4', 'MANUELL', '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'NO GRANDCHILD', 'DESC', 3, 'P3DT');