diff --git a/workflow/engine/classes/model/map/BpmnEventMapBuilder.php b/workflow/engine/classes/model/map/BpmnEventMapBuilder.php index 1c42b65d5..7fd82bbb1 100644 --- a/workflow/engine/classes/model/map/BpmnEventMapBuilder.php +++ b/workflow/engine/classes/model/map/BpmnEventMapBuilder.php @@ -99,7 +99,7 @@ class BpmnEventMapBuilder $tMap->addColumn('EVN_MESSAGE', 'EvnMessage', 'string', CreoleTypes::LONGVARCHAR, false, null); - $tMap->addColumn('EVN_OPRERATION_NAME', 'EvnOprerationName', 'string', CreoleTypes::VARCHAR, false, 255); + $tMap->addColumn('EVN_OPERATION_NAME', 'EvnOperationName', 'string', CreoleTypes::VARCHAR, false, 255); $tMap->addColumn('EVN_OPERATION_IMPLEMENTATION_REF', 'EvnOperationImplementationRef', 'string', CreoleTypes::VARCHAR, false, 255); diff --git a/workflow/engine/classes/model/om/BaseBpmnEvent.php b/workflow/engine/classes/model/om/BaseBpmnEvent.php index c71f57df7..80059a84f 100644 --- a/workflow/engine/classes/model/om/BaseBpmnEvent.php +++ b/workflow/engine/classes/model/om/BaseBpmnEvent.php @@ -130,10 +130,10 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent protected $evn_message; /** - * The value for the evn_opreration_name field. + * The value for the evn_operation_name field. * @var string */ - protected $evn_opreration_name; + protected $evn_operation_name; /** * The value for the evn_operation_implementation_ref field. @@ -377,14 +377,14 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent } /** - * Get the [evn_opreration_name] column value. + * Get the [evn_operation_name] column value. * * @return string */ - public function getEvnOprerationName() + public function getEvnOperationName() { - return $this->evn_opreration_name; + return $this->evn_operation_name; } /** @@ -825,12 +825,12 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent } // setEvnMessage() /** - * Set the value of [evn_opreration_name] column. + * Set the value of [evn_operation_name] column. * * @param string $v new value * @return void */ - public function setEvnOprerationName($v) + public function setEvnOperationName($v) { // Since the native PHP type for this column is string, @@ -839,12 +839,12 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent $v = (string) $v; } - if ($this->evn_opreration_name !== $v) { - $this->evn_opreration_name = $v; - $this->modifiedColumns[] = BpmnEventPeer::EVN_OPRERATION_NAME; + if ($this->evn_operation_name !== $v) { + $this->evn_operation_name = $v; + $this->modifiedColumns[] = BpmnEventPeer::EVN_OPERATION_NAME; } - } // setEvnOprerationName() + } // setEvnOperationName() /** * Set the value of [evn_operation_implementation_ref] column. @@ -1007,7 +1007,7 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent $this->evn_message = $rs->getString($startcol + 16); - $this->evn_opreration_name = $rs->getString($startcol + 17); + $this->evn_operation_name = $rs->getString($startcol + 17); $this->evn_operation_implementation_ref = $rs->getString($startcol + 18); @@ -1318,7 +1318,7 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent return $this->getEvnMessage(); break; case 17: - return $this->getEvnOprerationName(); + return $this->getEvnOperationName(); break; case 18: return $this->getEvnOperationImplementationRef(); @@ -1372,7 +1372,7 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent $keys[14] => $this->getEvnEscalationCode(), $keys[15] => $this->getEvnCondition(), $keys[16] => $this->getEvnMessage(), - $keys[17] => $this->getEvnOprerationName(), + $keys[17] => $this->getEvnOperationName(), $keys[18] => $this->getEvnOperationImplementationRef(), $keys[19] => $this->getEvnTimeDate(), $keys[20] => $this->getEvnTimeCycle(), @@ -1461,7 +1461,7 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent $this->setEvnMessage($value); break; case 17: - $this->setEvnOprerationName($value); + $this->setEvnOperationName($value); break; case 18: $this->setEvnOperationImplementationRef($value); @@ -1570,7 +1570,7 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent } if (array_key_exists($keys[17], $arr)) { - $this->setEvnOprerationName($arr[$keys[17]]); + $this->setEvnOperationName($arr[$keys[17]]); } if (array_key_exists($keys[18], $arr)) { @@ -1672,8 +1672,8 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent $criteria->add(BpmnEventPeer::EVN_MESSAGE, $this->evn_message); } - if ($this->isColumnModified(BpmnEventPeer::EVN_OPRERATION_NAME)) { - $criteria->add(BpmnEventPeer::EVN_OPRERATION_NAME, $this->evn_opreration_name); + if ($this->isColumnModified(BpmnEventPeer::EVN_OPERATION_NAME)) { + $criteria->add(BpmnEventPeer::EVN_OPERATION_NAME, $this->evn_operation_name); } if ($this->isColumnModified(BpmnEventPeer::EVN_OPERATION_IMPLEMENTATION_REF)) { @@ -1782,7 +1782,7 @@ abstract class BaseBpmnEvent extends BaseObject implements Persistent $copyObj->setEvnMessage($this->evn_message); - $copyObj->setEvnOprerationName($this->evn_opreration_name); + $copyObj->setEvnOperationName($this->evn_operation_name); $copyObj->setEvnOperationImplementationRef($this->evn_operation_implementation_ref); diff --git a/workflow/engine/classes/model/om/BaseBpmnEventPeer.php b/workflow/engine/classes/model/om/BaseBpmnEventPeer.php index f1afbfb32..867906b13 100644 --- a/workflow/engine/classes/model/om/BaseBpmnEventPeer.php +++ b/workflow/engine/classes/model/om/BaseBpmnEventPeer.php @@ -82,8 +82,8 @@ abstract class BaseBpmnEventPeer /** the column name for the EVN_MESSAGE field */ const EVN_MESSAGE = 'BPMN_EVENT.EVN_MESSAGE'; - /** the column name for the EVN_OPRERATION_NAME field */ - const EVN_OPRERATION_NAME = 'BPMN_EVENT.EVN_OPRERATION_NAME'; + /** the column name for the EVN_OPERATION_NAME field */ + const EVN_OPERATION_NAME = 'BPMN_EVENT.EVN_OPERATION_NAME'; /** the column name for the EVN_OPERATION_IMPLEMENTATION_REF field */ const EVN_OPERATION_IMPLEMENTATION_REF = 'BPMN_EVENT.EVN_OPERATION_IMPLEMENTATION_REF'; @@ -111,9 +111,9 @@ abstract class BaseBpmnEventPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('EvnUid', 'PrjUid', 'ProUid', 'EvnName', 'EvnType', 'EvnMarker', 'EvnIsInterrupting', 'EvnAttachedTo', 'EvnCancelActivity', 'EvnActivityRef', 'EvnWaitForCompletion', 'EvnErrorName', 'EvnErrorCode', 'EvnEscalationName', 'EvnEscalationCode', 'EvnCondition', 'EvnMessage', 'EvnOprerationName', 'EvnOperationImplementationRef', 'EvnTimeDate', 'EvnTimeCycle', 'EvnTimeDuration', 'EvnBehavior', ), - BasePeer::TYPE_COLNAME => array (BpmnEventPeer::EVN_UID, BpmnEventPeer::PRJ_UID, BpmnEventPeer::PRO_UID, BpmnEventPeer::EVN_NAME, BpmnEventPeer::EVN_TYPE, BpmnEventPeer::EVN_MARKER, BpmnEventPeer::EVN_IS_INTERRUPTING, BpmnEventPeer::EVN_ATTACHED_TO, BpmnEventPeer::EVN_CANCEL_ACTIVITY, BpmnEventPeer::EVN_ACTIVITY_REF, BpmnEventPeer::EVN_WAIT_FOR_COMPLETION, BpmnEventPeer::EVN_ERROR_NAME, BpmnEventPeer::EVN_ERROR_CODE, BpmnEventPeer::EVN_ESCALATION_NAME, BpmnEventPeer::EVN_ESCALATION_CODE, BpmnEventPeer::EVN_CONDITION, BpmnEventPeer::EVN_MESSAGE, BpmnEventPeer::EVN_OPRERATION_NAME, BpmnEventPeer::EVN_OPERATION_IMPLEMENTATION_REF, BpmnEventPeer::EVN_TIME_DATE, BpmnEventPeer::EVN_TIME_CYCLE, BpmnEventPeer::EVN_TIME_DURATION, BpmnEventPeer::EVN_BEHAVIOR, ), - BasePeer::TYPE_FIELDNAME => array ('EVN_UID', 'PRJ_UID', 'PRO_UID', 'EVN_NAME', 'EVN_TYPE', 'EVN_MARKER', 'EVN_IS_INTERRUPTING', 'EVN_ATTACHED_TO', 'EVN_CANCEL_ACTIVITY', 'EVN_ACTIVITY_REF', 'EVN_WAIT_FOR_COMPLETION', 'EVN_ERROR_NAME', 'EVN_ERROR_CODE', 'EVN_ESCALATION_NAME', 'EVN_ESCALATION_CODE', 'EVN_CONDITION', 'EVN_MESSAGE', 'EVN_OPRERATION_NAME', 'EVN_OPERATION_IMPLEMENTATION_REF', 'EVN_TIME_DATE', 'EVN_TIME_CYCLE', 'EVN_TIME_DURATION', 'EVN_BEHAVIOR', ), + BasePeer::TYPE_PHPNAME => array ('EvnUid', 'PrjUid', 'ProUid', 'EvnName', 'EvnType', 'EvnMarker', 'EvnIsInterrupting', 'EvnAttachedTo', 'EvnCancelActivity', 'EvnActivityRef', 'EvnWaitForCompletion', 'EvnErrorName', 'EvnErrorCode', 'EvnEscalationName', 'EvnEscalationCode', 'EvnCondition', 'EvnMessage', 'EvnOperationName', 'EvnOperationImplementationRef', 'EvnTimeDate', 'EvnTimeCycle', 'EvnTimeDuration', 'EvnBehavior', ), + BasePeer::TYPE_COLNAME => array (BpmnEventPeer::EVN_UID, BpmnEventPeer::PRJ_UID, BpmnEventPeer::PRO_UID, BpmnEventPeer::EVN_NAME, BpmnEventPeer::EVN_TYPE, BpmnEventPeer::EVN_MARKER, BpmnEventPeer::EVN_IS_INTERRUPTING, BpmnEventPeer::EVN_ATTACHED_TO, BpmnEventPeer::EVN_CANCEL_ACTIVITY, BpmnEventPeer::EVN_ACTIVITY_REF, BpmnEventPeer::EVN_WAIT_FOR_COMPLETION, BpmnEventPeer::EVN_ERROR_NAME, BpmnEventPeer::EVN_ERROR_CODE, BpmnEventPeer::EVN_ESCALATION_NAME, BpmnEventPeer::EVN_ESCALATION_CODE, BpmnEventPeer::EVN_CONDITION, BpmnEventPeer::EVN_MESSAGE, BpmnEventPeer::EVN_OPERATION_NAME, BpmnEventPeer::EVN_OPERATION_IMPLEMENTATION_REF, BpmnEventPeer::EVN_TIME_DATE, BpmnEventPeer::EVN_TIME_CYCLE, BpmnEventPeer::EVN_TIME_DURATION, BpmnEventPeer::EVN_BEHAVIOR, ), + BasePeer::TYPE_FIELDNAME => array ('EVN_UID', 'PRJ_UID', 'PRO_UID', 'EVN_NAME', 'EVN_TYPE', 'EVN_MARKER', 'EVN_IS_INTERRUPTING', 'EVN_ATTACHED_TO', 'EVN_CANCEL_ACTIVITY', 'EVN_ACTIVITY_REF', 'EVN_WAIT_FOR_COMPLETION', 'EVN_ERROR_NAME', 'EVN_ERROR_CODE', 'EVN_ESCALATION_NAME', 'EVN_ESCALATION_CODE', 'EVN_CONDITION', 'EVN_MESSAGE', 'EVN_OPERATION_NAME', 'EVN_OPERATION_IMPLEMENTATION_REF', 'EVN_TIME_DATE', 'EVN_TIME_CYCLE', 'EVN_TIME_DURATION', 'EVN_BEHAVIOR', ), BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, ) ); @@ -124,9 +124,9 @@ abstract class BaseBpmnEventPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('EvnUid' => 0, 'PrjUid' => 1, 'ProUid' => 2, 'EvnName' => 3, 'EvnType' => 4, 'EvnMarker' => 5, 'EvnIsInterrupting' => 6, 'EvnAttachedTo' => 7, 'EvnCancelActivity' => 8, 'EvnActivityRef' => 9, 'EvnWaitForCompletion' => 10, 'EvnErrorName' => 11, 'EvnErrorCode' => 12, 'EvnEscalationName' => 13, 'EvnEscalationCode' => 14, 'EvnCondition' => 15, 'EvnMessage' => 16, 'EvnOprerationName' => 17, 'EvnOperationImplementationRef' => 18, 'EvnTimeDate' => 19, 'EvnTimeCycle' => 20, 'EvnTimeDuration' => 21, 'EvnBehavior' => 22, ), - BasePeer::TYPE_COLNAME => array (BpmnEventPeer::EVN_UID => 0, BpmnEventPeer::PRJ_UID => 1, BpmnEventPeer::PRO_UID => 2, BpmnEventPeer::EVN_NAME => 3, BpmnEventPeer::EVN_TYPE => 4, BpmnEventPeer::EVN_MARKER => 5, BpmnEventPeer::EVN_IS_INTERRUPTING => 6, BpmnEventPeer::EVN_ATTACHED_TO => 7, BpmnEventPeer::EVN_CANCEL_ACTIVITY => 8, BpmnEventPeer::EVN_ACTIVITY_REF => 9, BpmnEventPeer::EVN_WAIT_FOR_COMPLETION => 10, BpmnEventPeer::EVN_ERROR_NAME => 11, BpmnEventPeer::EVN_ERROR_CODE => 12, BpmnEventPeer::EVN_ESCALATION_NAME => 13, BpmnEventPeer::EVN_ESCALATION_CODE => 14, BpmnEventPeer::EVN_CONDITION => 15, BpmnEventPeer::EVN_MESSAGE => 16, BpmnEventPeer::EVN_OPRERATION_NAME => 17, BpmnEventPeer::EVN_OPERATION_IMPLEMENTATION_REF => 18, BpmnEventPeer::EVN_TIME_DATE => 19, BpmnEventPeer::EVN_TIME_CYCLE => 20, BpmnEventPeer::EVN_TIME_DURATION => 21, BpmnEventPeer::EVN_BEHAVIOR => 22, ), - BasePeer::TYPE_FIELDNAME => array ('EVN_UID' => 0, 'PRJ_UID' => 1, 'PRO_UID' => 2, 'EVN_NAME' => 3, 'EVN_TYPE' => 4, 'EVN_MARKER' => 5, 'EVN_IS_INTERRUPTING' => 6, 'EVN_ATTACHED_TO' => 7, 'EVN_CANCEL_ACTIVITY' => 8, 'EVN_ACTIVITY_REF' => 9, 'EVN_WAIT_FOR_COMPLETION' => 10, 'EVN_ERROR_NAME' => 11, 'EVN_ERROR_CODE' => 12, 'EVN_ESCALATION_NAME' => 13, 'EVN_ESCALATION_CODE' => 14, 'EVN_CONDITION' => 15, 'EVN_MESSAGE' => 16, 'EVN_OPRERATION_NAME' => 17, 'EVN_OPERATION_IMPLEMENTATION_REF' => 18, 'EVN_TIME_DATE' => 19, 'EVN_TIME_CYCLE' => 20, 'EVN_TIME_DURATION' => 21, 'EVN_BEHAVIOR' => 22, ), + BasePeer::TYPE_PHPNAME => array ('EvnUid' => 0, 'PrjUid' => 1, 'ProUid' => 2, 'EvnName' => 3, 'EvnType' => 4, 'EvnMarker' => 5, 'EvnIsInterrupting' => 6, 'EvnAttachedTo' => 7, 'EvnCancelActivity' => 8, 'EvnActivityRef' => 9, 'EvnWaitForCompletion' => 10, 'EvnErrorName' => 11, 'EvnErrorCode' => 12, 'EvnEscalationName' => 13, 'EvnEscalationCode' => 14, 'EvnCondition' => 15, 'EvnMessage' => 16, 'EvnOperationName' => 17, 'EvnOperationImplementationRef' => 18, 'EvnTimeDate' => 19, 'EvnTimeCycle' => 20, 'EvnTimeDuration' => 21, 'EvnBehavior' => 22, ), + BasePeer::TYPE_COLNAME => array (BpmnEventPeer::EVN_UID => 0, BpmnEventPeer::PRJ_UID => 1, BpmnEventPeer::PRO_UID => 2, BpmnEventPeer::EVN_NAME => 3, BpmnEventPeer::EVN_TYPE => 4, BpmnEventPeer::EVN_MARKER => 5, BpmnEventPeer::EVN_IS_INTERRUPTING => 6, BpmnEventPeer::EVN_ATTACHED_TO => 7, BpmnEventPeer::EVN_CANCEL_ACTIVITY => 8, BpmnEventPeer::EVN_ACTIVITY_REF => 9, BpmnEventPeer::EVN_WAIT_FOR_COMPLETION => 10, BpmnEventPeer::EVN_ERROR_NAME => 11, BpmnEventPeer::EVN_ERROR_CODE => 12, BpmnEventPeer::EVN_ESCALATION_NAME => 13, BpmnEventPeer::EVN_ESCALATION_CODE => 14, BpmnEventPeer::EVN_CONDITION => 15, BpmnEventPeer::EVN_MESSAGE => 16, BpmnEventPeer::EVN_OPERATION_NAME => 17, BpmnEventPeer::EVN_OPERATION_IMPLEMENTATION_REF => 18, BpmnEventPeer::EVN_TIME_DATE => 19, BpmnEventPeer::EVN_TIME_CYCLE => 20, BpmnEventPeer::EVN_TIME_DURATION => 21, BpmnEventPeer::EVN_BEHAVIOR => 22, ), + BasePeer::TYPE_FIELDNAME => array ('EVN_UID' => 0, 'PRJ_UID' => 1, 'PRO_UID' => 2, 'EVN_NAME' => 3, 'EVN_TYPE' => 4, 'EVN_MARKER' => 5, 'EVN_IS_INTERRUPTING' => 6, 'EVN_ATTACHED_TO' => 7, 'EVN_CANCEL_ACTIVITY' => 8, 'EVN_ACTIVITY_REF' => 9, 'EVN_WAIT_FOR_COMPLETION' => 10, 'EVN_ERROR_NAME' => 11, 'EVN_ERROR_CODE' => 12, 'EVN_ESCALATION_NAME' => 13, 'EVN_ESCALATION_CODE' => 14, 'EVN_CONDITION' => 15, 'EVN_MESSAGE' => 16, 'EVN_OPERATION_NAME' => 17, 'EVN_OPERATION_IMPLEMENTATION_REF' => 18, 'EVN_TIME_DATE' => 19, 'EVN_TIME_CYCLE' => 20, 'EVN_TIME_DURATION' => 21, 'EVN_BEHAVIOR' => 22, ), BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, ) ); @@ -262,7 +262,7 @@ abstract class BaseBpmnEventPeer $criteria->addSelectColumn(BpmnEventPeer::EVN_MESSAGE); - $criteria->addSelectColumn(BpmnEventPeer::EVN_OPRERATION_NAME); + $criteria->addSelectColumn(BpmnEventPeer::EVN_OPERATION_NAME); $criteria->addSelectColumn(BpmnEventPeer::EVN_OPERATION_IMPLEMENTATION_REF); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index d53a79de7..c3eff4cad 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -3302,7 +3302,7 @@ - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 96646e1c1..31e859bbe 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -1825,7 +1825,7 @@ CREATE TABLE `BPMN_EVENT` `EVN_ESCALATION_CODE` VARCHAR(255), `EVN_CONDITION` VARCHAR(255), `EVN_MESSAGE` MEDIUMTEXT, - `EVN_OPRERATION_NAME` VARCHAR(255), + `EVN_OPERATION_NAME` VARCHAR(255), `EVN_OPERATION_IMPLEMENTATION_REF` VARCHAR(255), `EVN_TIME_DATE` VARCHAR(255), `EVN_TIME_CYCLE` VARCHAR(255),