diff --git a/workflow/engine/classes/model/map/RouteMapBuilder.php b/workflow/engine/classes/model/map/RouteMapBuilder.php index 0114f592d..eebbc00d1 100644 --- a/workflow/engine/classes/model/map/RouteMapBuilder.php +++ b/workflow/engine/classes/model/map/RouteMapBuilder.php @@ -96,6 +96,8 @@ class RouteMapBuilder { $tMap->addColumn('ROU_EVN_UID', 'RouEvnUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('GAT_UID', 'GatUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addValidator('ROU_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Route UID can be no larger than 32 in size'); $tMap->addValidator('ROU_UID', 'required', 'propel.validator.RequiredValidator', '', 'Route UID is required.'); diff --git a/workflow/engine/classes/model/om/BaseRoute.php b/workflow/engine/classes/model/om/BaseRoute.php index 0ade35235..7dfd9a79e 100644 --- a/workflow/engine/classes/model/om/BaseRoute.php +++ b/workflow/engine/classes/model/om/BaseRoute.php @@ -139,6 +139,13 @@ abstract class BaseRoute extends BaseObject implements Persistent { */ protected $rou_evn_uid = ''; + + /** + * The value for the gat_uid field. + * @var string + */ + protected $gat_uid = ''; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -329,6 +336,17 @@ abstract class BaseRoute extends BaseObject implements Persistent { return $this->rou_evn_uid; } + /** + * Get the [gat_uid] column value. + * + * @return string + */ + public function getGatUid() + { + + return $this->gat_uid; + } + /** * Set the value of [rou_uid] column. * @@ -681,6 +699,28 @@ abstract class BaseRoute extends BaseObject implements Persistent { } // setRouEvnUid() + /** + * Set the value of [gat_uid] column. + * + * @param string $v new value + * @return void + */ + public function setGatUid($v) + { + + // 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->gat_uid !== $v || $v === '') { + $this->gat_uid = $v; + $this->modifiedColumns[] = RoutePeer::GAT_UID; + } + + } // setGatUid() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -730,12 +770,14 @@ abstract class BaseRoute extends BaseObject implements Persistent { $this->rou_evn_uid = $rs->getString($startcol + 15); + $this->gat_uid = $rs->getString($startcol + 16); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 16; // 16 = RoutePeer::NUM_COLUMNS - RoutePeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 17; // 17 = RoutePeer::NUM_COLUMNS - RoutePeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Route object", $e); @@ -986,6 +1028,9 @@ abstract class BaseRoute extends BaseObject implements Persistent { case 15: return $this->getRouEvnUid(); break; + case 16: + return $this->getGatUid(); + break; default: return null; break; @@ -1022,6 +1067,7 @@ abstract class BaseRoute extends BaseObject implements Persistent { $keys[13] => $this->getRouToPort(), $keys[14] => $this->getRouFromPort(), $keys[15] => $this->getRouEvnUid(), + $keys[16] => $this->getGatUid(), ); return $result; } @@ -1101,6 +1147,9 @@ abstract class BaseRoute extends BaseObject implements Persistent { case 15: $this->setRouEvnUid($value); break; + case 16: + $this->setGatUid($value); + break; } // switch() } @@ -1140,6 +1189,7 @@ abstract class BaseRoute extends BaseObject implements Persistent { if (array_key_exists($keys[13], $arr)) $this->setRouToPort($arr[$keys[13]]); if (array_key_exists($keys[14], $arr)) $this->setRouFromPort($arr[$keys[14]]); if (array_key_exists($keys[15], $arr)) $this->setRouEvnUid($arr[$keys[15]]); + if (array_key_exists($keys[16], $arr)) $this->setGatUid($arr[$keys[16]]); } /** @@ -1167,6 +1217,7 @@ abstract class BaseRoute extends BaseObject implements Persistent { if ($this->isColumnModified(RoutePeer::ROU_TO_PORT)) $criteria->add(RoutePeer::ROU_TO_PORT, $this->rou_to_port); if ($this->isColumnModified(RoutePeer::ROU_FROM_PORT)) $criteria->add(RoutePeer::ROU_FROM_PORT, $this->rou_from_port); if ($this->isColumnModified(RoutePeer::ROU_EVN_UID)) $criteria->add(RoutePeer::ROU_EVN_UID, $this->rou_evn_uid); + if ($this->isColumnModified(RoutePeer::GAT_UID)) $criteria->add(RoutePeer::GAT_UID, $this->gat_uid); return $criteria; } @@ -1251,6 +1302,8 @@ abstract class BaseRoute extends BaseObject implements Persistent { $copyObj->setRouEvnUid($this->rou_evn_uid); + $copyObj->setGatUid($this->gat_uid); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseRoutePeer.php b/workflow/engine/classes/model/om/BaseRoutePeer.php index 25300022d..04e69e945 100644 --- a/workflow/engine/classes/model/om/BaseRoutePeer.php +++ b/workflow/engine/classes/model/om/BaseRoutePeer.php @@ -24,7 +24,7 @@ abstract class BaseRoutePeer { const CLASS_DEFAULT = 'classes.model.Route'; /** The total number of columns. */ - const NUM_COLUMNS = 16; + const NUM_COLUMNS = 17; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -78,6 +78,9 @@ abstract class BaseRoutePeer { /** the column name for the ROU_EVN_UID field */ const ROU_EVN_UID = 'ROUTE.ROU_EVN_UID'; + /** the column name for the GAT_UID field */ + const GAT_UID = 'ROUTE.GAT_UID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -89,10 +92,10 @@ abstract class BaseRoutePeer { * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('RouUid', 'RouParent', 'ProUid', 'TasUid', 'RouNextTask', 'RouCase', 'RouType', 'RouCondition', 'RouToLastUser', 'RouOptional', 'RouSendEmail', 'RouSourceanchor', 'RouTargetanchor', 'RouToPort', 'RouFromPort', 'RouEvnUid', ), - BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID, RoutePeer::ROU_PARENT, RoutePeer::PRO_UID, RoutePeer::TAS_UID, RoutePeer::ROU_NEXT_TASK, RoutePeer::ROU_CASE, RoutePeer::ROU_TYPE, RoutePeer::ROU_CONDITION, RoutePeer::ROU_TO_LAST_USER, RoutePeer::ROU_OPTIONAL, RoutePeer::ROU_SEND_EMAIL, RoutePeer::ROU_SOURCEANCHOR, RoutePeer::ROU_TARGETANCHOR, RoutePeer::ROU_TO_PORT, RoutePeer::ROU_FROM_PORT, RoutePeer::ROU_EVN_UID, ), - BasePeer::TYPE_FIELDNAME => array ('ROU_UID', 'ROU_PARENT', 'PRO_UID', 'TAS_UID', 'ROU_NEXT_TASK', 'ROU_CASE', 'ROU_TYPE', 'ROU_CONDITION', 'ROU_TO_LAST_USER', 'ROU_OPTIONAL', 'ROU_SEND_EMAIL', 'ROU_SOURCEANCHOR', 'ROU_TARGETANCHOR', 'ROU_TO_PORT', 'ROU_FROM_PORT', 'ROU_EVN_UID', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ) + BasePeer::TYPE_PHPNAME => array ('RouUid', 'RouParent', 'ProUid', 'TasUid', 'RouNextTask', 'RouCase', 'RouType', 'RouCondition', 'RouToLastUser', 'RouOptional', 'RouSendEmail', 'RouSourceanchor', 'RouTargetanchor', 'RouToPort', 'RouFromPort', 'RouEvnUid', 'GatUid', ), + BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID, RoutePeer::ROU_PARENT, RoutePeer::PRO_UID, RoutePeer::TAS_UID, RoutePeer::ROU_NEXT_TASK, RoutePeer::ROU_CASE, RoutePeer::ROU_TYPE, RoutePeer::ROU_CONDITION, RoutePeer::ROU_TO_LAST_USER, RoutePeer::ROU_OPTIONAL, RoutePeer::ROU_SEND_EMAIL, RoutePeer::ROU_SOURCEANCHOR, RoutePeer::ROU_TARGETANCHOR, RoutePeer::ROU_TO_PORT, RoutePeer::ROU_FROM_PORT, RoutePeer::ROU_EVN_UID, RoutePeer::GAT_UID, ), + BasePeer::TYPE_FIELDNAME => array ('ROU_UID', 'ROU_PARENT', 'PRO_UID', 'TAS_UID', 'ROU_NEXT_TASK', 'ROU_CASE', 'ROU_TYPE', 'ROU_CONDITION', 'ROU_TO_LAST_USER', 'ROU_OPTIONAL', 'ROU_SEND_EMAIL', 'ROU_SOURCEANCHOR', 'ROU_TARGETANCHOR', 'ROU_TO_PORT', 'ROU_FROM_PORT', 'ROU_EVN_UID', 'GAT_UID', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) ); /** @@ -102,10 +105,10 @@ abstract class BaseRoutePeer { * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('RouUid' => 0, 'RouParent' => 1, 'ProUid' => 2, 'TasUid' => 3, 'RouNextTask' => 4, 'RouCase' => 5, 'RouType' => 6, 'RouCondition' => 7, 'RouToLastUser' => 8, 'RouOptional' => 9, 'RouSendEmail' => 10, 'RouSourceanchor' => 11, 'RouTargetanchor' => 12, 'RouToPort' => 13, 'RouFromPort' => 14, 'RouEvnUid' => 15, ), - BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID => 0, RoutePeer::ROU_PARENT => 1, RoutePeer::PRO_UID => 2, RoutePeer::TAS_UID => 3, RoutePeer::ROU_NEXT_TASK => 4, RoutePeer::ROU_CASE => 5, RoutePeer::ROU_TYPE => 6, RoutePeer::ROU_CONDITION => 7, RoutePeer::ROU_TO_LAST_USER => 8, RoutePeer::ROU_OPTIONAL => 9, RoutePeer::ROU_SEND_EMAIL => 10, RoutePeer::ROU_SOURCEANCHOR => 11, RoutePeer::ROU_TARGETANCHOR => 12, RoutePeer::ROU_TO_PORT => 13, RoutePeer::ROU_FROM_PORT => 14, RoutePeer::ROU_EVN_UID => 15, ), - BasePeer::TYPE_FIELDNAME => array ('ROU_UID' => 0, 'ROU_PARENT' => 1, 'PRO_UID' => 2, 'TAS_UID' => 3, 'ROU_NEXT_TASK' => 4, 'ROU_CASE' => 5, 'ROU_TYPE' => 6, 'ROU_CONDITION' => 7, 'ROU_TO_LAST_USER' => 8, 'ROU_OPTIONAL' => 9, 'ROU_SEND_EMAIL' => 10, 'ROU_SOURCEANCHOR' => 11, 'ROU_TARGETANCHOR' => 12, 'ROU_TO_PORT' => 13, 'ROU_FROM_PORT' => 14, 'ROU_EVN_UID' => 15, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ) + BasePeer::TYPE_PHPNAME => array ('RouUid' => 0, 'RouParent' => 1, 'ProUid' => 2, 'TasUid' => 3, 'RouNextTask' => 4, 'RouCase' => 5, 'RouType' => 6, 'RouCondition' => 7, 'RouToLastUser' => 8, 'RouOptional' => 9, 'RouSendEmail' => 10, 'RouSourceanchor' => 11, 'RouTargetanchor' => 12, 'RouToPort' => 13, 'RouFromPort' => 14, 'RouEvnUid' => 15, 'GatUid' => 16, ), + BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID => 0, RoutePeer::ROU_PARENT => 1, RoutePeer::PRO_UID => 2, RoutePeer::TAS_UID => 3, RoutePeer::ROU_NEXT_TASK => 4, RoutePeer::ROU_CASE => 5, RoutePeer::ROU_TYPE => 6, RoutePeer::ROU_CONDITION => 7, RoutePeer::ROU_TO_LAST_USER => 8, RoutePeer::ROU_OPTIONAL => 9, RoutePeer::ROU_SEND_EMAIL => 10, RoutePeer::ROU_SOURCEANCHOR => 11, RoutePeer::ROU_TARGETANCHOR => 12, RoutePeer::ROU_TO_PORT => 13, RoutePeer::ROU_FROM_PORT => 14, RoutePeer::ROU_EVN_UID => 15, RoutePeer::GAT_UID => 16, ), + BasePeer::TYPE_FIELDNAME => array ('ROU_UID' => 0, 'ROU_PARENT' => 1, 'PRO_UID' => 2, 'TAS_UID' => 3, 'ROU_NEXT_TASK' => 4, 'ROU_CASE' => 5, 'ROU_TYPE' => 6, 'ROU_CONDITION' => 7, 'ROU_TO_LAST_USER' => 8, 'ROU_OPTIONAL' => 9, 'ROU_SEND_EMAIL' => 10, 'ROU_SOURCEANCHOR' => 11, 'ROU_TARGETANCHOR' => 12, 'ROU_TO_PORT' => 13, 'ROU_FROM_PORT' => 14, 'ROU_EVN_UID' => 15, 'GAT_UID' => 16, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) ); /** @@ -238,6 +241,8 @@ abstract class BaseRoutePeer { $criteria->addSelectColumn(RoutePeer::ROU_EVN_UID); + $criteria->addSelectColumn(RoutePeer::GAT_UID); + } const COUNT = 'COUNT(ROUTE.ROU_UID)'; diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 4ce97d318..0f9f47be1 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -2744,6 +2744,16 @@ + + + + + + + + + + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 03a14a4aa..ed7589137 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -468,6 +468,7 @@ CREATE TABLE `ROUTE` `ROU_TO_PORT` INTEGER default 1 NOT NULL, `ROU_FROM_PORT` INTEGER default 2 NOT NULL, `ROU_EVN_UID` VARCHAR(32) default '' NOT NULL, + `GAT_UID` VARCHAR(32) default '' NOT NULL, PRIMARY KEY (`ROU_UID`) )Type=MyISAM ; #-----------------------------------------------------------------------------