diff --git a/workflow/engine/classes/model/map/DynaformMapBuilder.php b/workflow/engine/classes/model/map/DynaformMapBuilder.php index f7d503671..15d28846f 100755 --- a/workflow/engine/classes/model/map/DynaformMapBuilder.php +++ b/workflow/engine/classes/model/map/DynaformMapBuilder.php @@ -79,7 +79,7 @@ class DynaformMapBuilder $tMap->addColumn('DYN_VERSION', 'DynVersion', 'int', CreoleTypes::INTEGER, true, null); - $tMap->addColumn('DYN_UPDATE_DATE', 'DynUpdateDate', 'int', CreoleTypes::DATE, false, null); + $tMap->addColumn('DYN_UPDATE_DATE', 'DynUpdateDate', 'int', CreoleTypes::TIMESTAMP, false, null); $tMap->addValidator('DYN_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'xmlform|grid', 'Please select a valid dynaform type.'); diff --git a/workflow/engine/classes/model/om/BaseDynaform.php b/workflow/engine/classes/model/om/BaseDynaform.php index 210c90197..44a3d5cb7 100755 --- a/workflow/engine/classes/model/om/BaseDynaform.php +++ b/workflow/engine/classes/model/om/BaseDynaform.php @@ -174,7 +174,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent * @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL). * @throws PropelException - if unable to convert the date/time to timestamp. */ - public function getDynUpdateDate($format = 'Y-m-d') + public function getDynUpdateDate($format = 'Y-m-d H:i:s') { if ($this->dyn_update_date === null || $this->dyn_update_date === '') { @@ -412,7 +412,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent $this->dyn_version = $rs->getInt($startcol + 6); - $this->dyn_update_date = $rs->getDate($startcol + 7, null); + $this->dyn_update_date = $rs->getTimestamp($startcol + 7, null); $this->resetModified(); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 31646258b..f0713647a 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -465,7 +465,7 @@ - + diff --git a/workflow/engine/data/mssql/schema.sql b/workflow/engine/data/mssql/schema.sql index 7ed4c9515..71919ff23 100755 --- a/workflow/engine/data/mssql/schema.sql +++ b/workflow/engine/data/mssql/schema.sql @@ -432,7 +432,6 @@ CREATE TABLE [DYNAFORM] [PRO_UID] VARCHAR(32) default '0' NOT NULL, [DYN_TYPE] VARCHAR(20) default 'xmlform' NOT NULL, [DYN_FILENAME] VARCHAR(100) default '' NOT NULL, - [DYN_UPDATE_DATE] DATETIME default '' NOT NULL, CONSTRAINT DYNAFORM_PK PRIMARY KEY ([DYN_UID]) ); diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 65d836ee2..c6dbd4a07 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -212,7 +212,7 @@ CREATE TABLE `DYNAFORM` `DYN_CONTENT` MEDIUMTEXT, `DYN_LABEL` MEDIUMTEXT, `DYN_VERSION` INTEGER NOT NULL, - `DYN_UPDATE_DATE` DATETIME NOT NULL, + `DYN_UPDATE_DATE` DATETIME default '' NOT NULL, PRIMARY KEY (`DYN_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Forms required'; #-----------------------------------------------------------------------------