From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/resources/migration/V1_11__Alter_Table.sql | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 172 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/migration/V1_11__Alter_Table.sql b/src/main/resources/migration/V1_11__Alter_Table.sql
index b786560..9fa9b72 100644
--- a/src/main/resources/migration/V1_11__Alter_Table.sql
+++ b/src/main/resources/migration/V1_11__Alter_Table.sql
@@ -12,7 +12,7 @@
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-CREATE TABLE `isp`(
+CREATE TABLE `isp_field`(
`id` BIGINT(11) AUTO_INCREMENT,
`code` varchar (50) NOT NULL,
`name` VARCHAR(50) NOT NULL,
@@ -28,9 +28,9 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-CREATE TABLE `hosting`(
+CREATE TABLE `hosting_field`(
`id` BIGINT(11) AUTO_INCREMENT,
- `code` varchar (50) NOT NULL,
+ `code` VARCHAR(50) NOT NULL,
`name` VARCHAR(50) NOT NULL,
`manager` VARCHAR(50) NULL,
`tel` VARCHAR (50) NULL,
@@ -43,3 +43,172 @@
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `user_department`(
+ `id` BIGINT(11) AUTO_INCREMENT,
+ `department_id` BIGINT(11),
+ `user_id` BIGINT(11),
+ `register_id` BIGINT(20) NOT NULL,
+ `register_date` TIMESTAMP NULL,
+ `modify_id` BIGINT(20) NOT NULL,
+ `modify_date` TIMESTAMP NULL,
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+-- api 愿��젴
+ALTER TABLE `user` ADD COLUMN `insert_type` VARCHAR(1) NOT NULL DEFAULT 'N';
+
+CREATE TABLE `api_token`(
+ `id` BIGINT(11) AUTO_INCREMENT,
+ `user_id` BIGINT(50) NOT NULL,
+ `app_name` VARCHAR(50) NOT NULL,
+ `token` VARCHAR(1024) NOT NULL,
+ `register_id` BIGINT(20) NOT NULL,
+ `register_date` TIMESTAMP NULL,
+ `modify_id` BIGINT(20) NOT NULL,
+ `modify_date` TIMESTAMP NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `userIdIndex` (`user_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `issue_api_default`(
+ `id` BIGINT(11) AUTO_INCREMENT,
+ `user_id` BIGINT(11) NOT NULL,
+ `issue_type_id` bigint(11) NOT NULL,
+ `issue_status_id` bigint(20) DEFAULT NULL,
+ `project_id` bigint(20) DEFAULT NULL,
+ `priority_id` bigint(20) DEFAULT NULL,
+ `severity_id` bigint(20) DEFAULT NULL,
+ `title` varchar(300) DEFAULT NULL,
+ `description` mediumtext COMMENT 'description',
+ `reverse_index` bigint(20) DEFAULT NULL,
+ `issue_number` bigint(20) DEFAULT NULL,
+ `start_date` varchar(20) DEFAULT NULL,
+ `complete_date` varchar(20) DEFAULT NULL,
+ `register_id` BIGINT(20) NOT NULL,
+ `register_date` TIMESTAMP NULL,
+ `modify_id` BIGINT(20) NOT NULL,
+ `modify_date` TIMESTAMP NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `userIdIndex` (`user_id`) USING BTREE,
+ INDEX `issueTypeIdIndex` (`issue_type_id`) USING BTREE
+
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `custom_field_api_default`(
+ `id` BIGINT(11) AUTO_INCREMENT,
+ `user_id` BIGINT(11) NOT NULL,
+ `issue_type_id` BIGINT(11) NOT NULL,
+ `custom_field_id` BIGINT(11) NOT NULL,
+ `custom_field_value` varchar(300) NOT NULL,
+ `register_id` BIGINT(20) NOT NULL,
+ `register_date` TIMESTAMP NULL,
+ `modify_id` BIGINT(20) NOT NULL,
+ `modify_date` TIMESTAMP NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `userIdIndex` (`user_id`) USING BTREE,
+ INDEX `issueTypeIdIndex` (`issue_type_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `custom_field_api_overlap`(
+ `id` BIGINT(11) AUTO_INCREMENT,
+ `user_id` BIGINT(11) NOT NULL,
+ `issue_type_id` BIGINT(11) NOT NULL,
+ `custom_field_id` BIGINT(11) NOT NULL,
+ `register_id` BIGINT(20) NOT NULL,
+ `register_date` TIMESTAMP NULL,
+ `modify_id` BIGINT(20) NOT NULL,
+ `modify_date` TIMESTAMP NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `userIdIndex` (`user_id`) USING BTREE,
+ INDEX `issueTypeIdIndex` (`issue_type_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- �씠�뒋 ���엯 �봽濡쒖젥�듃
+ALTER TABLE `issue_type` ADD COLUMN `project_id` BIGINT(11) NULL;
+
+-- �긽�쐞 �씠�뒋
+ALTER TABLE `issue` ADD COLUMN `parent_issue_id` BIGINT(11) NULL;
+
+CREATE TABLE `issue_company` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `issue_id` bigint(20) NOT NULL,
+ `company_id` bigint(20) DEFAULT NULL,
+ `name` VARCHAR(50) NULL,
+ `manager` VARCHAR(50) NULL,
+ `tel` VARCHAR (50) NULL,
+ `email` VARCHAR (255) NULL,
+ `memo` VARCHAR(255) NULL,
+ `register_id` bigint(20) NOT NULL COMMENT 'register_id',
+ `register_date` timestamp NULL DEFAULT NULL COMMENT 'register_date',
+ `modify_id` bigint(20) NOT NULL COMMENT 'modify_id',
+ `modify_date` timestamp NULL DEFAULT NULL COMMENT 'modify_date',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `companyIdIndex` (`company_id`) USING BTREE
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `issue_hosting` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `issue_id` bigint(20) NOT NULL,
+ `hosting_id` bigint(20) DEFAULT NULL,
+ `name` VARCHAR(50) NULL,
+ `code` VARCHAR(50) NULL,
+ `manager` VARCHAR(50) NULL,
+ `tel` VARCHAR (50) NULL,
+ `email` VARCHAR (255) NULL,
+ `memo` VARCHAR(255) NULL,
+ `register_id` bigint(20) NOT NULL COMMENT 'register_id',
+ `register_date` timestamp NULL DEFAULT NULL COMMENT 'register_date',
+ `modify_id` bigint(20) NOT NULL COMMENT 'modify_id',
+ `modify_date` timestamp NULL DEFAULT NULL COMMENT 'modify_date',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `hostingIdIndex` (`hosting_id`) USING BTREE
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `issue_isp` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `issue_id` bigint(20) NOT NULL,
+ `isp_id` bigint(20) DEFAULT NULL,
+ `name` VARCHAR(50) NULL,
+ `code` VARCHAR(50) NULL,
+ `manager` VARCHAR(50) NULL,
+ `tel` VARCHAR (50) NULL,
+ `email` VARCHAR (255) NULL,
+ `memo` VARCHAR(255) NULL,
+ `register_id` bigint(20) NOT NULL COMMENT 'register_id',
+ `register_date` timestamp NULL DEFAULT NULL COMMENT 'register_date',
+ `modify_id` bigint(20) NOT NULL COMMENT 'modify_id',
+ `modify_date` timestamp NULL DEFAULT NULL COMMENT 'modify_date',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `ispIdIndex` (`isp_id`) USING BTREE
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- �씠�뒋 �뀒�씠釉� ���엯 �꽕�젙(1: 硫붿씤, 2: �뿰愿�, 3: �븯�쐞)
+ALTER TABLE `issue_table_config` ADD COLUMN `issue_type_id` BIGINT(20) NOT NULL;
+ALTER TABLE `issue_table_config` ADD COLUMN `issue_table_type` INT(11) NOT NULL;
+ALTER TABLE `issue_table_config` ADD INDEX `issueTableTypeIndex`(`issue_table_type`);
+
+-- issue_risk �뀒�씠釉� 遺��꽌蹂�寃� 移댁슫�듃 而щ읆 異붽�
+ALTER TABLE `issue_risk` ADD COLUMN `change_department_count` BIGINT(20) NOT NULL DEFAULT '0';
+
+-- �썙�겕 �뵆濡쒖슦 �긽�깭 �떞�떦遺��꽌 吏��젙
+CREATE TABLE `workflow_department`(
+ `id` BIGINT(11) AUTO_INCREMENT,
+ `workflow_id` BIGINT(11),
+ `issue_status_id` BIGINT(11),
+ `department_id` BIGINT(11),
+ `register_id` BIGINT(20) NOT NULL,
+ `register_date` TIMESTAMP NULL,
+ `modify_id` BIGINT(20) NOT NULL,
+ `modify_date` TIMESTAMP NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `workflowIdIndex` (`workflow_id`) USING BTREE,
+ INDEX `issueStatusIdIndex` (`issue_status_id`) USING BTREE,
+ INDEX `departmentIdIndex` (`department_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- issue_type �뀒�씠釉� �뾽泥�,ISP,�샇�뒪�똿 而щ읆 異붽�
+ALTER TABLE `issue_type` ADD COLUMN `use_partner` BIGINT(11) NOT NULL DEFAULT '0';
+
+-- api �씠�뒋 �뿬遺�
+ALTER TABLE `issue` ADD COLUMN `is_api` VARCHAR(1) NOT NULL DEFAULT 'N';
--
Gitblit v1.8.0