diff --git a/rbac/engine/config/schema.xml b/rbac/engine/config/schema.xml
index 74a992a53..3198e8ebd 100755
--- a/rbac/engine/config/schema.xml
+++ b/rbac/engine/config/schema.xml
@@ -28,6 +28,9 @@
+
+
+
@@ -81,6 +84,10 @@
+
+
+
+
@@ -108,6 +115,9 @@
+
+
+
diff --git a/rbac/engine/data/mysql/schema.sql b/rbac/engine/data/mysql/schema.sql
index a4078ddac..5dababf24 100755
--- a/rbac/engine/data/mysql/schema.sql
+++ b/rbac/engine/data/mysql/schema.sql
@@ -4,7 +4,7 @@
SET FOREIGN_KEY_CHECKS = 0;
#-----------------------------------------------------------------------------
-#-- PERMISSIONS
+#-- RBAC_PERMISSIONS
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_PERMISSIONS`;
@@ -18,10 +18,11 @@ CREATE TABLE `RBAC_PERMISSIONS`
`PER_UPDATE_DATE` DATETIME,
`PER_STATUS` INTEGER default 1 NOT NULL,
`PER_SYSTEM` VARCHAR(32) default '00000000000000000000000000000002' NOT NULL,
- PRIMARY KEY (`PER_UID`)
+ PRIMARY KEY (`PER_UID`),
+ KEY `indexPermissionsCode`(`PER_CODE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Permissions';
#-----------------------------------------------------------------------------
-#-- ROLES
+#-- RBAC_ROLES
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_ROLES`;
@@ -39,7 +40,7 @@ CREATE TABLE `RBAC_ROLES`
PRIMARY KEY (`ROL_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Roles';
#-----------------------------------------------------------------------------
-#-- ROLES_PERMISSIONS
+#-- RBAC_ROLES_PERMISSIONS
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_ROLES_PERMISSIONS`;
@@ -49,10 +50,11 @@ CREATE TABLE `RBAC_ROLES_PERMISSIONS`
(
`ROL_UID` VARCHAR(32) default '' NOT NULL,
`PER_UID` VARCHAR(32) default '' NOT NULL,
- PRIMARY KEY (`ROL_UID`,`PER_UID`)
+ PRIMARY KEY (`ROL_UID`,`PER_UID`),
+ KEY `indexRolesPermissions`(`ROL_UID`, `PER_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Permissions of the roles';
#-----------------------------------------------------------------------------
-#-- SYSTEMS
+#-- RBAC_SYSTEMS
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_SYSTEMS`;
@@ -65,10 +67,11 @@ CREATE TABLE `RBAC_SYSTEMS`
`SYS_CREATE_DATE` DATETIME,
`SYS_UPDATE_DATE` DATETIME,
`SYS_STATUS` INTEGER default 0 NOT NULL,
- PRIMARY KEY (`SYS_UID`)
+ PRIMARY KEY (`SYS_UID`),
+ KEY `indexSystemCode`(`SYS_CODE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Systems';
#-----------------------------------------------------------------------------
-#-- USERS
+#-- RBAC_USERS
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_USERS`;
@@ -93,7 +96,7 @@ CREATE TABLE `RBAC_USERS`
PRIMARY KEY (`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Users';
#-----------------------------------------------------------------------------
-#-- USERS_ROLES
+#-- RBAC_USERS_ROLES
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_USERS_ROLES`;
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 96e902bcc..e9f2a7a10 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -1004,6 +1004,10 @@
+
+
+
+
@@ -2163,6 +2167,9 @@
+
+
+
@@ -2275,6 +2282,9 @@
+
+
+
@@ -2419,6 +2429,11 @@
+
+
+
+
+
@@ -4002,6 +4017,9 @@
+
+
+
@@ -4789,6 +4807,13 @@
+
+
+
+
+
+
+
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 4addde059..f35567ead 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -493,7 +493,8 @@ CREATE TABLE `REPORT_TABLE`
`REP_TAB_CONNECTION` VARCHAR(32) default '' NOT NULL,
`REP_TAB_CREATE_DATE` DATETIME NOT NULL,
`REP_TAB_STATUS` CHAR(8) default 'ACTIVE' NOT NULL,
- PRIMARY KEY (`REP_TAB_UID`)
+ PRIMARY KEY (`REP_TAB_UID`),
+ KEY `indexProcessStatus`(`PRO_UID`, `REP_TAB_STATUS`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- REPORT_VAR
@@ -1005,7 +1006,8 @@ CREATE TABLE `SUB_APPLICATION`
`SA_VALUES_IN` MEDIUMTEXT,
`SA_INIT_DATE` DATETIME,
`SA_FINISH_DATE` DATETIME,
- PRIMARY KEY (`APP_UID`,`APP_PARENT`,`DEL_INDEX_PARENT`,`DEL_THREAD_PARENT`)
+ PRIMARY KEY (`APP_UID`,`APP_PARENT`,`DEL_INDEX_PARENT`,`DEL_THREAD_PARENT`),
+ KEY `indexParent`(`APP_PARENT`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- LOGIN_LOG
@@ -1067,7 +1069,8 @@ CREATE TABLE `ADDITIONAL_TABLES`
`ADD_TAB_TYPE` VARCHAR(32) default '',
`ADD_TAB_GRID` VARCHAR(256) default '',
`ADD_TAB_TAG` VARCHAR(256) default '',
- PRIMARY KEY (`ADD_TAB_UID`)
+ PRIMARY KEY (`ADD_TAB_UID`),
+ KEY `indexAdditionalProcess`(`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- FIELDS
@@ -1145,7 +1148,8 @@ CREATE TABLE `EVENT`
`EVN_TYPE` VARCHAR(32) default '',
`TAS_EVN_UID` VARCHAR(32) default '',
PRIMARY KEY (`EVN_UID`),
- KEY `indexEventTable`(`EVN_UID`)
+ KEY `indexEventTable`(`EVN_UID`),
+ KEY `indexStatusActionProcess`(`EVN_STATUS`, `EVN_ACTION`, `PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- GATEWAY
@@ -2230,7 +2234,8 @@ CREATE TABLE `ADDONS_MANAGER`
`ADDON_DOWNLOAD_URL` VARCHAR(2048),
`ADDON_DOWNLOAD_PROGRESS` FLOAT,
`ADDON_DOWNLOAD_MD5` VARCHAR(32),
- PRIMARY KEY (`ADDON_ID`,`STORE_ID`)
+ PRIMARY KEY (`ADDON_ID`,`STORE_ID`),
+ KEY `indexAddonsType`(`ADDON_TYPE`)
)ENGINE=InnoDB ;
#-----------------------------------------------------------------------------
#-- LICENSE_MANAGER
@@ -2705,7 +2710,9 @@ CREATE TABLE `ABE_CONFIGURATION`
`ABE_SUBJECT_FIELD` VARCHAR(100) default '',
`ABE_MAILSERVER_OR_MAILCURRENT` INTEGER default 0,
`ABE_CUSTOM_GRID` MEDIUMTEXT,
- PRIMARY KEY (`ABE_UID`)
+ PRIMARY KEY (`ABE_UID`),
+ KEY `indexAbeProcess`(`PRO_UID`),
+ KEY `indexAbeProcessTask`(`PRO_UID`, `TAS_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='The plugin table for actionsByEmail';
#-----------------------------------------------------------------------------
#-- ABE_REQUESTS
diff --git a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
index 809608aa0..b8aa5f70c 100755
--- a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
+++ b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
@@ -20,12 +20,12 @@ BEGIN
SELECT APPLICATION.APP_CREATE_DATE into @APP_CREATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
SELECT APPLICATION.APP_UPDATE_DATE into @APP_UPDATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
- SELECT CONTENT.CON_VALUE into @APP_TITLE FROM CONTENT WHERE NEW.APP_UID=CON_ID AND CON_CATEGORY='APP_TITLE' and CON_LANG = '{lang}' LIMIT 1;
+ SELECT APPLICATION.APP_TITLE into @APP_TITLE FROM APPLICATION WHERE NEW.APP_UID=APPLICATION.APP_UID LIMIT 1;
IF ( @APP_TITLE IS NULL ) THEN
SET @APP_TITLE = '';
END IF;
- SELECT CONTENT.CON_VALUE into @APP_PRO_TITLE FROM CONTENT WHERE NEW.PRO_UID=CON_ID AND CON_CATEGORY='PRO_TITLE' and CON_LANG = '{lang}' LIMIT 1;
- SELECT CONTENT.CON_VALUE into @APP_TAS_TITLE FROM CONTENT WHERE NEW.TAS_UID=CON_ID AND CON_CATEGORY='TAS_TITLE' and CON_LANG = '{lang}' LIMIT 1;
+ SELECT PROCESS.PRO_TITLE into @APP_PRO_TITLE FROM PROCESS WHERE NEW.PRO_UID=PROCESS.PRO_UID LIMIT 1;
+ SELECT TASK.TAS_TITLE into @APP_TAS_TITLE FROM TASK WHERE NEW.TAS_UID=TASK.TAS_UID LIMIT 1;
SELECT CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME) INTO @APP_CURRENT_USER FROM USERS WHERE USR_UID = NEW.USR_UID LIMIT 1;
IF ( @APP_CURRENT_USER IS NULL ) THEN
SET @APP_CURRENT_USER = '';
diff --git a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
index dce6833fe..39cee7d53 100755
--- a/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
+++ b/workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
@@ -20,12 +20,12 @@ BEGIN
SELECT APPLICATION.APP_CREATE_DATE into @APP_CREATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
SELECT APPLICATION.APP_UPDATE_DATE into @APP_UPDATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
- SELECT CONTENT.CON_VALUE into @APP_TITLE FROM CONTENT WHERE NEW.APP_UID=CON_ID AND CON_CATEGORY='APP_TITLE' and CON_LANG = '{lang}' LIMIT 1;
+ SELECT APPLICATION.APP_TITLE into @APP_TITLE FROM APPLICATION WHERE NEW.APP_UID=APPLICATION.APP_UID LIMIT 1;
IF ( @APP_TITLE IS NULL ) THEN
SET @APP_TITLE = '';
END IF;
- SELECT CONTENT.CON_VALUE into @APP_PRO_TITLE FROM CONTENT WHERE NEW.PRO_UID=CON_ID AND CON_CATEGORY='PRO_TITLE' and CON_LANG = '{lang}' LIMIT 1;
- SELECT CONTENT.CON_VALUE into @APP_TAS_TITLE FROM CONTENT WHERE NEW.TAS_UID=CON_ID AND CON_CATEGORY='TAS_TITLE' and CON_LANG = '{lang}' LIMIT 1;
+ SELECT PROCESS.PRO_TITLE into @APP_PRO_TITLE FROM PROCESS WHERE NEW.PRO_UID=PROCESS.PRO_UID LIMIT 1;
+ SELECT TASK.TAS_TITLE into @APP_TAS_TITLE FROM TASK WHERE NEW.TAS_UID=TASK.TAS_UID LIMIT 1;
SELECT CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME) INTO @APP_CURRENT_USER FROM USERS WHERE USR_UID = NEW.USR_UID LIMIT 1;
IF ( @APP_CURRENT_USER IS NULL ) THEN
SET @APP_CURRENT_USER = '';