fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker/HOR-2457 (pull request #5288)

Browse Source 
HOR-2457
This commit is contained in:
Julio Cesar Laura Avendaño
2016-12-23 16:41:05 -04:00
parent b264f56ef6 828d1baead
commit 19bdbb287a
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulliver/system/class.database_mysql.php
View File

@@ -89,8 +89,8 @@ class database extends database_base
$sKeys .= $this->sQuoteCharacter . $sColumnName . $this->sQuoteCharacter . ',';
}
if (isset( $aParameters['Default'] ) && $aParameters['Default'] != '') {
$sSQL .= " DEFAULT '" . $aParameters['Default'] . "'";
if (isset( $aParameters['Default'] )) {
$sSQL .= " DEFAULT '" . trim($aParameters['Default']) . "'";
}
$sSQL .= ',';

2
workflow/engine/config/schema.xml
View File

@@ -4250,7 +4250,7 @@
</vendor>
<column name="APP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="USR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="DEL_INDEX" type="INTEGER" required="true" primaryKey="true" default=""/>
<column name="DEL_INDEX" type="INTEGER" required="true" primaryKey="true" default="0"/>
<column name="TAS_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="APP_NUMBER" type="INTEGER" required="true" default="0"/>

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

@@ -49,7 +49,7 @@ DROP TABLE IF EXISTS `APP_SEQUENCE`;
CREATE TABLE `APP_SEQUENCE`
(
`ID` INTEGER NOT NULL,
`ID` INTEGER NOT NULL AUTO_INCREMENT,
PRIMARY KEY (`ID`)
)ENGINE=InnoDB ;
#-----------------------------------------------------------------------------
@@ -672,9 +672,9 @@ CREATE TABLE `TASK`
`TAS_SELFSERVICE_EXECUTION` VARCHAR(15) default 'EVERY_TIME',
`TAS_NOT_EMAIL_FROM_FORMAT` INTEGER default 0,
`TAS_OFFLINE` VARCHAR(20) default 'FALSE' NOT NULL,
`TAS_EMAIL_SERVER_UID` VARCHAR(32) default '' NOT NULL,
`TAS_EMAIL_SERVER_UID` VARCHAR(32) default '',
`TAS_AUTO_ROOT` VARCHAR(20) default 'FALSE' NOT NULL,
`TAS_RECEIVE_SERVER_UID` VARCHAR(32) default '' NOT NULL,
`TAS_RECEIVE_SERVER_UID` VARCHAR(32) default '',
`TAS_RECEIVE_LAST_EMAIL` VARCHAR(20) default 'FALSE' NOT NULL,
`TAS_RECEIVE_EMAIL_FROM_FORMAT` INTEGER default 0,
`TAS_RECEIVE_MESSAGE_TYPE` VARCHAR(20) default 'text' NOT NULL,
@@ -2750,7 +2750,7 @@ CREATE TABLE `ABE_CONFIGURATION`
`ABE_SUBJECT_FIELD` VARCHAR(100) default '',
`ABE_MAILSERVER_OR_MAILCURRENT` INTEGER default 0,
`ABE_CUSTOM_GRID` MEDIUMTEXT,
`ABE_EMAIL_SERVER_UID` VARCHAR(32) default '' NOT NULL,
`ABE_EMAIL_SERVER_UID` VARCHAR(32) default '',
PRIMARY KEY (`ABE_UID`),
KEY `indexAbeProcess`(`PRO_UID`),
KEY `indexAbeProcessTask`(`PRO_UID`, `TAS_UID`)
@@ -3020,15 +3020,15 @@ 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` MEDIUMTEXT NULL,
`APP_UID` VARCHAR(32) default '' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`CURRENT_LAST_INDEX` INTEGER default 0 NOT NULL,
`UNASSIGNED` INTEGER default 0 NOT NULL,
`STATUS` VARCHAR(32) default 'pending' NOT NULL,
`MSG_ERROR` MEDIUMTEXT,
PRIMARY KEY (`LABELING_UID`),
KEY `indexStatus`(`STATUS`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Task to synchronize Gmail Labels';
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Task for label relabaling';
#-----------------------------------------------------------------------------
#-- NOTIFICATION_QUEUE
#-----------------------------------------------------------------------------