fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se cambia var_accepted_values a LongVarchar en VARIABLES

Browse Source
This commit is contained in:
Daniel Rojas
2014-07-25 16:26:39 -04:00
parent 07f6c824d5
commit e7e345e014
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/map/ProcessVariablesMapBuilder.php
View File

@@ -85,7 +85,7 @@ class ProcessVariablesMapBuilder
$tMap->addColumn('VAR_DEFAULT', 'VarDefault', 'string', CreoleTypes::VARCHAR, false, 32); $tMap->addColumn('VAR_DEFAULT', 'VarDefault', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('VAR_ACCEPTED_VALUES', 'VarAcceptedValues', 'string', CreoleTypes::VARCHAR, false, 128); $tMap->addColumn('VAR_ACCEPTED_VALUES', 'VarAcceptedValues', 'string', CreoleTypes::LONGVARCHAR, false, null);
} // doBuild() } // doBuild()

4
workflow/engine/classes/model/om/BaseProcessVariables.php
View File

@@ -91,7 +91,7 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
* The value for the var_accepted_values field. * The value for the var_accepted_values field.
* @var string * @var string
*/ */
protected $var_accepted_values = ''; protected $var_accepted_values;
/** /**
* Flag to prevent endless save loop, if this object is referenced * Flag to prevent endless save loop, if this object is referenced
@@ -463,7 +463,7 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
$v = (string) $v; $v = (string) $v;
} }
if ($this->var_accepted_values !== $v || $v === '') { if ($this->var_accepted_values !== $v) {
$this->var_accepted_values = $v; $this->var_accepted_values = $v;
$this->modifiedColumns[] = ProcessVariablesPeer::VAR_ACCEPTED_VALUES; $this->modifiedColumns[] = ProcessVariablesPeer::VAR_ACCEPTED_VALUES;
} }

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

@@ -3801,7 +3801,7 @@
<column name="VAR_SQL" type="VARCHAR" size="512" /> <column name="VAR_SQL" type="VARCHAR" size="512" />
<column name="VAR_NULL" type="TINYINT" size="32" default="0"/> <column name="VAR_NULL" type="TINYINT" size="32" default="0"/>
<column name="VAR_DEFAULT" type="VARCHAR" size="32" default=""/> <column name="VAR_DEFAULT" type="VARCHAR" size="32" default=""/>
<column name="VAR_ACCEPTED_VALUES" type="VARCHAR" size="128" default=""/> <column name="VAR_ACCEPTED_VALUES" type="LONGVARCHAR"/>
</table> </table>
</database> </database>

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

@@ -205,7 +205,7 @@ CREATE TABLE `DYNAFORM`
`DYN_TYPE` VARCHAR(20) default 'xmlform' NOT NULL, `DYN_TYPE` VARCHAR(20) default 'xmlform' NOT NULL,
`DYN_FILENAME` VARCHAR(100) default '' NOT NULL, `DYN_FILENAME` VARCHAR(100) default '' NOT NULL,
`DYN_CONTENT` MEDIUMTEXT, `DYN_CONTENT` MEDIUMTEXT,
`DYN_VERSION` INTEGER, `DYN_VERSION` INTEGER NOT NULL,
PRIMARY KEY (`DYN_UID`) PRIMARY KEY (`DYN_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Forms required'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Forms required';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -2079,7 +2079,7 @@ CREATE TABLE `PROCESS_VARIABLES`
`VAR_SQL` VARCHAR(512), `VAR_SQL` VARCHAR(512),
`VAR_NULL` TINYINT(32) default 0, `VAR_NULL` TINYINT(32) default 0,
`VAR_DEFAULT` VARCHAR(32) default '', `VAR_DEFAULT` VARCHAR(32) default '',
`VAR_ACCEPTED_VALUES` VARCHAR(128) default '', `VAR_ACCEPTED_VALUES` MEDIUMTEXT,
PRIMARY KEY (`VAR_UID`) PRIMARY KEY (`VAR_UID`)
)ENGINE=InnoDB ; )ENGINE=InnoDB ;
# This restores the fkey checks, after having unset them earlier # This restores the fkey checks, after having unset them earlier

3
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -372,9 +372,6 @@ class Variable
throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES", array('$var_null','0, 1' ))); throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES", array('$var_null','0, 1' )));
} }
} }
if (isset($aData["VAR_ACCEPTED_VALUES"])) {
Validator::isString($aData['VAR_ACCEPTED_VALUES'], '$var_accepted_values');
}
} catch (\Exception $e) { } catch (\Exception $e) {
throw $e; throw $e;
} }