From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/resources/migration/V1_1__Initial_Setup.sql | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/migration/V1_1__Initial_Setup.sql b/src/main/resources/migration/V1_1__Initial_Setup.sql
index 6dc56c9..6474c42 100644
--- a/src/main/resources/migration/V1_1__Initial_Setup.sql
+++ b/src/main/resources/migration/V1_1__Initial_Setup.sql
@@ -303,7 +303,7 @@
-- �뀒�씠釉� owl_en_1.5.issue_user 援ъ“ �궡蹂대궡湲�
CREATE TABLE IF NOT EXISTS `issue_user` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
- `user_id` bigint(20) NOT NULL,
+ `user_id` bigint(20) NULL,
`issue_id` bigint(20) NOT NULL,
`workspace_id` bigint(20) NOT NULL,
`register_id` bigint(20) NOT NULL,
@@ -315,6 +315,23 @@
KEY `issueIdIndex` (`issue_id`),
KEY `workspaceIdIndex` (`workspace_id`),
KEY `userIdIndex` (`user_id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- �뀒�씠釉� owl_en_1.5.issue_department 援ъ“ �궡蹂대궡湲�
+CREATE TABLE IF NOT EXISTS `issue_department` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `department_id` bigint(20) NOT NULL,
+ `issue_id` bigint(20) NOT NULL,
+ `workspace_id` bigint(20) NOT NULL,
+ `register_id` bigint(20) NOT NULL,
+ `modify_id` bigint(20) NOT NULL,
+ `register_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `modify_date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (`id`),
+ KEY `departmentIdAndIssueIdIndex` (`department_id`,`issue_id`),
+ KEY `issueIdIndex` (`issue_id`),
+ KEY `workspaceIdIndex` (`workspace_id`),
+ KEY `departmentIdIndex` (`department_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- �뀒�씠釉� �뜲�씠�꽣 owl_en_1.5.issue_user:~0 rows (���왂�쟻) �궡蹂대궡湲�
@@ -521,6 +538,36 @@
KEY `projectRoleIdIndex` (`project_role_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+-- �뀒�씠釉� owl_en_1.5.project_role_department 援ъ“ �궡蹂대궡湲�
+CREATE TABLE IF NOT EXISTS `project_role_department` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `project_role_id` bigint(20) NOT NULL,
+ `department_id` bigint(20) NOT NULL,
+ `register_id` bigint(20) NOT NULL,
+ `register_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `modify_id` bigint(20) NOT NULL,
+ `modify_date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (`id`),
+ KEY `projectRoleIdAndDepartmentIdIndex` (`project_role_id`,`department_id`),
+ KEY `departmentIdIndex` (`department_id`),
+ KEY `projectRoleIdIndex` (`project_role_id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- �뀒�씠釉� owl_en_1.5.project_role_department 援ъ“ �궡蹂대궡湲�
+CREATE TABLE IF NOT EXISTS `project_role_department` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `project_role_id` bigint(20) NOT NULL,
+ `department_id` bigint(20) NULL,
+ `register_id` bigint(20) NOT NULL,
+ `register_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `modify_id` bigint(20) NOT NULL,
+ `modify_date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (`id`),
+ KEY `projectRoleIdAndDepartmentIdIndex` (`project_role_id`,`department_id`),
+ KEY `departmentIdIndex` (`department_id`),
+ KEY `projectRoleIdIndex` (`project_role_id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
-- �뀒�씠釉� �뜲�씠�꽣 owl_en_1.5.project_role_user:~0 rows (���왂�쟻) �궡蹂대궡湲�
/*!40000 ALTER TABLE `project_role_user` DISABLE KEYS */;
/*!40000 ALTER TABLE `project_role_user` ENABLE KEYS */;
--
Gitblit v1.8.0