diff --git a/gulliver/system/class.database_mysql.php b/gulliver/system/class.database_mysql.php index fb6e56b93..c7334c2a7 100644 --- a/gulliver/system/class.database_mysql.php +++ b/gulliver/system/class.database_mysql.php @@ -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 .= ','; diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index b37c7ba42..958dab82e 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -4250,7 +4250,7 @@ - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 8b7fd5ff9..8b5f1430d 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -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 #-----------------------------------------------------------------------------