From dd919be30daac51b20a9ab94fb1976c37488d2d6 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Fri, 2 Jun 2017 13:53:36 -0400 Subject: [PATCH] HOR-3226 Changed BOOLEAN type by CHAR(1) to fix the database-upgrade. --- .../classes/model/map/WebEntryMapBuilder.php | 2 +- .../engine/classes/model/om/BaseWebEntry.php | 18 ++++++++++++------ workflow/engine/config/schema.xml | 2 +- workflow/engine/data/mysql/schema.sql | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/workflow/engine/classes/model/map/WebEntryMapBuilder.php b/workflow/engine/classes/model/map/WebEntryMapBuilder.php index f787263be..d6a5d0844 100644 --- a/workflow/engine/classes/model/map/WebEntryMapBuilder.php +++ b/workflow/engine/classes/model/map/WebEntryMapBuilder.php @@ -95,7 +95,7 @@ class WebEntryMapBuilder $tMap->addColumn('WE_AUTHENTICATION', 'WeAuthentication', 'string', CreoleTypes::VARCHAR, true, 14); - $tMap->addColumn('WE_HIDE_INFORMATION_BAR', 'WeHideInformationBar', 'boolean', CreoleTypes::BOOLEAN, false, null); + $tMap->addColumn('WE_HIDE_INFORMATION_BAR', 'WeHideInformationBar', 'string', CreoleTypes::CHAR, false, 1); $tMap->addColumn('WE_CALLBACK', 'WeCallback', 'string', CreoleTypes::VARCHAR, true, 13); diff --git a/workflow/engine/classes/model/om/BaseWebEntry.php b/workflow/engine/classes/model/om/BaseWebEntry.php index 7773e5ad0..a1c78ed9f 100644 --- a/workflow/engine/classes/model/om/BaseWebEntry.php +++ b/workflow/engine/classes/model/om/BaseWebEntry.php @@ -119,9 +119,9 @@ abstract class BaseWebEntry extends BaseObject implements Persistent /** * The value for the we_hide_information_bar field. - * @var boolean + * @var string */ - protected $we_hide_information_bar = false; + protected $we_hide_information_bar = '0'; /** * The value for the we_callback field. @@ -383,7 +383,7 @@ abstract class BaseWebEntry extends BaseObject implements Persistent /** * Get the [we_hide_information_bar] column value. * - * @return boolean + * @return string */ public function getWeHideInformationBar() { @@ -804,13 +804,19 @@ abstract class BaseWebEntry extends BaseObject implements Persistent /** * Set the value of [we_hide_information_bar] column. * - * @param boolean $v new value + * @param string $v new value * @return void */ public function setWeHideInformationBar($v) { - if ($this->we_hide_information_bar !== $v || $v === false) { + // Since the native PHP type for this column is string, + // we will cast the input to a string (if it is not). + if ($v !== null && !is_string($v)) { + $v = (string) $v; + } + + if ($this->we_hide_information_bar !== $v || $v === '0') { $this->we_hide_information_bar = $v; $this->modifiedColumns[] = WebEntryPeer::WE_HIDE_INFORMATION_BAR; } @@ -996,7 +1002,7 @@ abstract class BaseWebEntry extends BaseObject implements Persistent $this->we_authentication = $rs->getString($startcol + 14); - $this->we_hide_information_bar = $rs->getBoolean($startcol + 15); + $this->we_hide_information_bar = $rs->getString($startcol + 15); $this->we_callback = $rs->getString($startcol + 16); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index a1412ec85..10dc0c51f 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -3346,7 +3346,7 @@ - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 248bb946e..c872e884b 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -1664,7 +1664,7 @@ CREATE TABLE `WEB_ENTRY` `WE_TYPE` VARCHAR(8) default 'SINGLE' NOT NULL, `WE_CUSTOM_TITLE` MEDIUMTEXT, `WE_AUTHENTICATION` VARCHAR(14) default 'ANONYMOUS' NOT NULL, - `WE_HIDE_INFORMATION_BAR` INTEGER default 0, + `WE_HIDE_INFORMATION_BAR` CHAR(1) default '0', `WE_CALLBACK` VARCHAR(13) default 'PROCESSMAKER' NOT NULL, `WE_CALLBACK_URL` MEDIUMTEXT, `WE_LINK_GENERATION` VARCHAR(8) default 'DEFAULT' NOT NULL,