fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-298 Resolving merge conflict with schema.sql

Browse Source
This commit is contained in:
Chloe Deguzman
2016-03-09 22:20:30 +00:00
parent 2eea08ace1 5b4ed8a3ff
commit c4c114e8eb
195 changed files with 10286 additions and 5269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/data/mysql/insert.sql
View File

@@ -11,6 +11,24 @@ INSERT INTO CONTENT (CON_CATEGORY,CON_PARENT,CON_ID,CON_LANG,CON_VALUE) VALUES
('PER_NAME','','00000000000000000000000000000017','en','Add file in folders'),
('PER_NAME','','00000000000000000000000000000018','en','Cancel cases'),
('PER_NAME','','00000000000000000000000000000019','en','Delete folders'),
('PER_NAME','','00000000000000000000000000000020','en','Setup Logo'),
('PER_NAME','','00000000000000000000000000000021','en','Setup Email'),
('PER_NAME','','00000000000000000000000000000022','en','Setup Calendar'),
('PER_NAME','','00000000000000000000000000000023','en','Setup Process Categories'),
('PER_NAME','','00000000000000000000000000000024','en','Setup Clear Cache'),
('PER_NAME','','00000000000000000000000000000025','en','Setup Heart Beat'),
('PER_NAME','','00000000000000000000000000000026','en','Setup Environment'),
('PER_NAME','','00000000000000000000000000000027','en','Setup PM Tables'),
('PER_NAME','','00000000000000000000000000000028','en','Setup Login'),
('PER_NAME','','00000000000000000000000000000029','en','Setup Dashborads'),
('PER_NAME','','00000000000000000000000000000030','en','Setup Language'),
('PER_NAME','','00000000000000000000000000000031','en','Setup Skin'),
('PER_NAME','','00000000000000000000000000000032','en','Setup Case List Cache Builder'),
('PER_NAME','','00000000000000000000000000000033','en','Setup Plugins'),
('PER_NAME','','00000000000000000000000000000034','en','Setup User Authentication Sources'),
('PER_NAME','','00000000000000000000000000000035','en','Setup Logs'),
('PER_NAME','','00000000000000000000000000000036','en','Delete process cases'),
('PER_NAME','','00000000000000000000000000000037','en','Edit personal info Calendar'),
('PER_NAME','','00000000000000000000000000000013','en','Delete cases'),
('PER_NAME','','00000000000000000000000000000012','en','WebDav'),
('PER_NAME','','00000000000000000000000000000011','en','Dashboard'),

33
workflow/engine/data/mysql/schema.sql
View File

@@ -96,7 +96,9 @@ CREATE TABLE `APP_DOCUMENT`
`APP_DOC_STATUS` VARCHAR(32) default 'ACTIVE' NOT NULL,
`APP_DOC_STATUS_DATE` DATETIME,
`APP_DOC_FIELDNAME` VARCHAR(150),
`APP_DOC_DRIVE_DOWNLOAD` MEDIUMTEXT,
`APP_DOC_DRIVE_DOWNLOAD` MEDIUMTEXT,
`SYNC_WITH_DRIVE` VARCHAR(32) default 'UNSYNCHRONIZED' NOT NULL,
`SYNC_PERMISSIONS` MEDIUMTEXT,
PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`),
KEY `indexAppDocument`(`FOLDER_UID`, `APP_DOC_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Documents in an Application';
@@ -175,6 +177,8 @@ CREATE TABLE `CONTENT`
`CON_LANG` VARCHAR(10) default '' NOT NULL,
`CON_VALUE` MEDIUMTEXT NOT NULL,
PRIMARY KEY (`CON_CATEGORY`,`CON_PARENT`,`CON_ID`,`CON_LANG`),
KEY `indexUidLang`(`CON_ID`, `CON_LANG`),
KEY `indexCatParUidLang`(`CON_CATEGORY`, `CON_PARENT`, `CON_ID`, `CON_LANG`),
KEY `indexUid`(`CON_ID`, `CON_CATEGORY`, `CON_LANG`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
@@ -1190,6 +1194,7 @@ CREATE TABLE `APP_CACHE_VIEW`
`APP_UPDATE_DATE` DATETIME NOT NULL,
`APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexProUid`(`PRO_UID`),
KEY `indexAppNumber`(`APP_NUMBER`),
KEY `protitle`(`APP_PRO_TITLE`),
KEY `appupdatedate`(`APP_UPDATE_DATE`),
@@ -2258,6 +2263,7 @@ CREATE TABLE `LIST_INBOX`
`DEL_RISK_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexUser`(`USR_UID`),
KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`),
KEY `indexInboxUserStatusUpdateDate`(`USR_UID`, `APP_STATUS`, `APP_UPDATE_DATE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Inbox list';
@@ -2319,6 +2325,7 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
`DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '',
`DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '',
`DEL_CURRENT_TAS_TITLE` VARCHAR(255) default '' NOT NULL,)
`DEL_DELEGATE_DATE` DATETIME NOT NULL,
`DEL_INIT_DATE` DATETIME,
`DEL_DUE_DATE` DATETIME,
@@ -2919,4 +2926,28 @@ CREATE TABLE `NOTIFICATION_DEVICE`
KEY `indexUserNotification`(`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Definitions Notification device.';
# This restores the fkey checks, after having unset them earlier
# SET FOREIGN_KEY_CHECKS = 1;
#-----------------------------------------------------------------------------
#-- GMAIL_RELABELING
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `GMAIL_RELABELING`;
CREATE TABLE `GMAIL_RELABELING` (
`LABELING_UID` VARCHAR(32) NOT NULL,
`CREATE_DATE` DATETIME NOT NULL,
`APP_UID` VARCHAR(32) NOT NULL DEFAULT '',
`DEL_INDEX` INT(11) NOT NULL DEFAULT '0',
`CURRENT_LAST_INDEX` INT(11) NOT NULL DEFAULT '0',
`UNASSIGNED` INT(11) NOT NULL DEFAULT '0',
`STATUS` VARCHAR(32) NOT NULL DEFAULT 'pending',
`MSG_ERROR` TEXT NULL,
PRIMARY KEY (`LABELING_UID`),
KEY `indexStatus` (`STATUS`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Task to synchronize Gmail Labels';
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;