fernando/luos
1
0
Fork 0
Code Releases Activity

Correccion de conflicto

Browse Source
This commit is contained in:
Brayan Pereyra
2015-02-06 15:48:01 -04:00
parent 8be9610114
commit 40d841820e
1 changed files with 53 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1907,6 +1907,7 @@ CREATE TABLE `BPMN_FLOW`
`FLO_X2` INTEGER default 0 NOT NULL,
`FLO_Y2` INTEGER default 0 NOT NULL,
`FLO_STATE` MEDIUMTEXT,
`FLO_POSITION` INTEGER default 0 NOT NULL,
PRIMARY KEY (`FLO_UID`),
KEY `BPMN_FLOW_I_1`(`FLO_UID`),
KEY `BPMN_FLOW_I_2`(`PRJ_UID`),
@@ -2262,15 +2263,11 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
`APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_STATUS` VARCHAR(20) default '0' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
`DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '',
`DEL_PREVIOUS_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_PREVIOUS_USR_LASTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '',
`DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '',
`DEL_DELEGATE_DATE` DATETIME NOT NULL,
`DEL_INIT_DATE` DATETIME,
`DEL_DUE_DATE` DATETIME,
@@ -2304,70 +2301,6 @@ CREATE TABLE `LIST_COMPLETED`
PRIMARY KEY (`APP_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Completed list';
#-----------------------------------------------------------------------------
#-- LIST_PAUSED
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `LIST_PAUSED`;
CREATE TABLE `LIST_PAUSED`
(
`APP_UID` VARCHAR(32) default '' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL,
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PAUSED_DATE` DATETIME NOT NULL,
`APP_RESTART_DATE` DATETIME NOT NULL,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
`DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '',
`DEL_PREVIOUS_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_PREVIOUS_USR_LASTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '',
`DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '',
`DEL_DELEGATE_DATE` DATETIME NOT NULL,
`DEL_INIT_DATE` DATETIME,
`DEL_DUE_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexPausedUser`(`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Paused list';
#-----------------------------------------------------------------------------
#-- LIST_CANCELED
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `LIST_CANCELED`;
CREATE TABLE `LIST_CANCELED`
(
`APP_UID` VARCHAR(32) default '' NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL,
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_CANCELED_DATE` DATETIME NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
`DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '',
`DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '',
`DEL_DELEGATE_DATE` DATETIME NOT NULL,
`DEL_INIT_DATE` DATETIME,
`DEL_DUE_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
PRIMARY KEY (`APP_UID`),
KEY `indexCanceledUser`(`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Canceled list';
#-----------------------------------------------------------------------------
#-- LIST_MY_INBOX
#-----------------------------------------------------------------------------
@@ -2446,42 +2379,40 @@ CREATE TABLE `LIST_UNASSIGNED_GROUP`
PRIMARY KEY (`UNA_UID`,`USR_UID`,`TYPE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Unassiged list';
#-----------------------------------------------------------------------------
#-- MESSAGE
#-- MESSAGE_TYPE
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `MESSAGE`;
DROP TABLE IF EXISTS MESSAGE_TYPE;
CREATE TABLE `MESSAGE`
CREATE TABLE MESSAGE_TYPE
(
`MES_UID` VARCHAR(32) NOT NULL,
`PRJ_UID` VARCHAR(32) NOT NULL,
`MES_NAME` VARCHAR(255) default '',
`MES_CONDITION` VARCHAR(255) default '',
PRIMARY KEY (`MES_UID`)
)ENGINE=InnoDB ;
MSGT_UID VARCHAR(32) default '' NOT NULL,
PRJ_UID VARCHAR(32) default '' NOT NULL,
MSGT_NAME VARCHAR(256) default '' NOT NULL,
PRIMARY KEY (MSGT_UID)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- MESSAGE_DETAIL
#-- MESSAGE_TYPE_VARIABLE
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `MESSAGE_DETAIL`;
DROP TABLE IF EXISTS MESSAGE_TYPE_VARIABLE;
CREATE TABLE `MESSAGE_DETAIL`
CREATE TABLE MESSAGE_TYPE_VARIABLE
(
`MD_UID` VARCHAR(32) NOT NULL,
`MES_UID` VARCHAR(32) NOT NULL,
`MD_TYPE` VARCHAR(32) default '',
`MD_NAME` VARCHAR(255) default '',
PRIMARY KEY (`MD_UID`)
)ENGINE=InnoDB ;
MSGTV_UID VARCHAR(32) default '' NOT NULL,
MSGT_UID VARCHAR(32) default '' NOT NULL,
MSGTV_NAME VARCHAR(256) default '' NOT NULL,
MSGTV_DEFAULT_VALUE VARCHAR(256) default '' NOT NULL,
PRIMARY KEY (MSGTV_UID)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- EMAIL_SERVER
#-- TABLE: EMAIL_SERVER
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `EMAIL_SERVER`;
CREATE TABLE `EMAIL_SERVER`
(
`MESS_UID` VARCHAR(32) default '' NOT NULL,
@@ -2499,25 +2430,24 @@ CREATE TABLE `EMAIL_SERVER`
`MESS_DEFAULT` INTEGER default 0 NOT NULL,
PRIMARY KEY (`MESS_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- WEB_ENTRY_EVENT
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `WEB_ENTRY_EVENT`;
DROP TABLE IF EXISTS WEB_ENTRY_EVENT;
CREATE TABLE `WEB_ENTRY_EVENT`
CREATE TABLE WEB_ENTRY_EVENT
(
`WEE_UID` VARCHAR(32) NOT NULL,
`PRJ_UID` VARCHAR(32) NOT NULL,
`EVN_UID` VARCHAR(32) NOT NULL,
`ACT_UID` VARCHAR(32) NOT NULL,
`DYN_UID` VARCHAR(32) NOT NULL,
`USR_UID` VARCHAR(32) NOT NULL,
`WEE_STATUS` VARCHAR(10) default 'ENABLED' NOT NULL,
`WEE_WE_UID` VARCHAR(32) default '' NOT NULL,
`WEE_WE_TAS_UID` VARCHAR(32) default '' NOT NULL,
PRIMARY KEY (`WEE_UID`)
WEE_UID VARCHAR(32) NOT NULL,
PRJ_UID VARCHAR(32) NOT NULL,
EVN_UID VARCHAR(32) NOT NULL,
ACT_UID VARCHAR(32) NOT NULL,
DYN_UID VARCHAR(32) NOT NULL,
USR_UID VARCHAR(32) NOT NULL,
WEE_STATUS VARCHAR(10) NOT NULL DEFAULT 'ENABLED',
WEE_WE_UID VARCHAR(32) NOT NULL DEFAULT '',
WEE_WE_TAS_UID VARCHAR(32) NOT NULL DEFAULT '',
PRIMARY KEY (WEE_UID)
) ENGINE=InnoDB DEFAULT CHARSET='utf8';
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;