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

solving conflicts

Browse Source
This commit is contained in:
marcelo.cuiza
2015-06-25 15:35:29 -04:00
parent e72277f964
commit 0fb6241bd9
10 changed files with 84 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2829,16 +2829,28 @@ CREATE TABLE `CATALOG`
PRIMARY KEY (`CAT_UID`, `CAT_TYPE`),
KEY `indexType`( `CAT_TYPE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Definitions catalog.';
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;
#-----------------------------------------------------------------------------
#-- TABLE: SCRIPT_TASK
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS SCRIPT_TASK;
CREATE TABLE SCRIPT_TASK
(
SCRTAS_UID VARCHAR(32) NOT NULL,
PRJ_UID VARCHAR(32) NOT NULL,
ACT_UID VARCHAR(32) NOT NULL,
SCRTAS_OBJ_TYPE VARCHAR(10) default 'TRIGGER' NOT NULL,
SCRTAS_OBJ_UID VARCHAR(32) NOT NULL,
PRIMARY KEY (SCRTAS_UID)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- EMAIL_EVENT
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `EMAIL_EVENT`;
CREATE TABLE `EMAIL_EVENT`
(
`EMAIL_EVENT_UID` VARCHAR(32) NOT NULL,
@@ -2847,7 +2859,9 @@ CREATE TABLE `EMAIL_EVENT`
`EMAIL_EVENT_FROM` VARCHAR(100) default '' NOT NULL,
`EMAIL_EVENT_TO` MEDIUMTEXT NOT NULL,
`EMAIL_EVENT_SUBJECT` VARCHAR(150) default '' NOT NULL,
`EMAIL_EVENT_BODY` MEDIUMTEXT NOT NULL,
`PRF_UID` VARCHAR(32) default '' NOT NULL,
PRIMARY KEY (`EMAIL_EVENT_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;