From 1cb4695f67fc1e9a8e02a5acc4d7619cfea6852f Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Tue, 1 Aug 2017 09:23:46 -0400 Subject: [PATCH] Name of column changed --- workflow/engine/classes/class.wsTools.php | 6 +-- .../classes/model/map/AppDelayMapBuilder.php | 2 +- .../engine/classes/model/om/BaseAppDelay.php | 38 +++++++++---------- .../classes/model/om/BaseAppDelayPeer.php | 18 ++++----- workflow/engine/config/schema.xml | 4 +- workflow/engine/data/mysql/schema.sql | 4 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 247771ca4..ffd09bcb2 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -2669,7 +2669,7 @@ class workspaceTools LEFT JOIN '.$this->dbName.'.APP_DELEGATION AS AD2 ON (AD1.APP_NUMBER = AD2.APP_NUMBER AND AD1.DEL_PREVIOUS = AD2.DEL_INDEX) LEFT JOIN - '.$this->dbName.'.USERS ON (APP_DELAY.APP_DELEGATION_USR_ID = USERS.USR_ID) + '.$this->dbName.'.USERS ON (APP_DELAY.APP_DELEGATION_USER_ID = USERS.USR_ID) LEFT JOIN '.$this->dbName.'.USERS PREVIOUS ON (AD2.USR_ID = PREVIOUS.USR_ID) LEFT JOIN @@ -3735,8 +3735,8 @@ class workspaceTools FROM USERS ) AS USR ON (AD.APP_DELEGATION_USER = USR.USR_UID) - SET AD.APP_DELEGATION_USR_ID = USR.USR_ID - WHERE AD.APP_DELEGATION_USR_ID = 0"); + SET AD.APP_DELEGATION_USER_ID = USR.USR_ID + WHERE AD.APP_DELEGATION_USER_ID = 0"); $con->commit(); // Populating APP_DELAY.PRO_ID diff --git a/workflow/engine/classes/model/map/AppDelayMapBuilder.php b/workflow/engine/classes/model/map/AppDelayMapBuilder.php index 5584bd03a..c18fe9aae 100644 --- a/workflow/engine/classes/model/map/AppDelayMapBuilder.php +++ b/workflow/engine/classes/model/map/AppDelayMapBuilder.php @@ -95,7 +95,7 @@ class AppDelayMapBuilder $tMap->addColumn('APP_AUTOMATIC_DISABLED_DATE', 'AppAutomaticDisabledDate', 'int', CreoleTypes::TIMESTAMP, false, null); - $tMap->addColumn('APP_DELEGATION_USR_ID', 'AppDelegationUsrId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('APP_DELEGATION_USER_ID', 'AppDelegationUserId', 'int', CreoleTypes::INTEGER, false, null); $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); diff --git a/workflow/engine/classes/model/om/BaseAppDelay.php b/workflow/engine/classes/model/om/BaseAppDelay.php index 1957d235c..c43c309aa 100644 --- a/workflow/engine/classes/model/om/BaseAppDelay.php +++ b/workflow/engine/classes/model/om/BaseAppDelay.php @@ -118,10 +118,10 @@ abstract class BaseAppDelay extends BaseObject implements Persistent protected $app_automatic_disabled_date; /** - * The value for the app_delegation_usr_id field. + * The value for the app_delegation_user_id field. * @var int */ - protected $app_delegation_usr_id = 0; + protected $app_delegation_user_id = 0; /** * The value for the pro_id field. @@ -372,14 +372,14 @@ abstract class BaseAppDelay extends BaseObject implements Persistent } /** - * Get the [app_delegation_usr_id] column value. + * Get the [app_delegation_user_id] column value. * * @return int */ - public function getAppDelegationUsrId() + public function getAppDelegationUserId() { - return $this->app_delegation_usr_id; + return $this->app_delegation_user_id; } /** @@ -745,12 +745,12 @@ abstract class BaseAppDelay extends BaseObject implements Persistent } // setAppAutomaticDisabledDate() /** - * Set the value of [app_delegation_usr_id] column. + * Set the value of [app_delegation_user_id] column. * * @param int $v new value * @return void */ - public function setAppDelegationUsrId($v) + public function setAppDelegationUserId($v) { // Since the native PHP type for this column is integer, @@ -759,12 +759,12 @@ abstract class BaseAppDelay extends BaseObject implements Persistent $v = (int) $v; } - if ($this->app_delegation_usr_id !== $v || $v === 0) { - $this->app_delegation_usr_id = $v; - $this->modifiedColumns[] = AppDelayPeer::APP_DELEGATION_USR_ID; + if ($this->app_delegation_user_id !== $v || $v === 0) { + $this->app_delegation_user_id = $v; + $this->modifiedColumns[] = AppDelayPeer::APP_DELEGATION_USER_ID; } - } // setAppDelegationUsrId() + } // setAppDelegationUserId() /** * Set the value of [pro_id] column. @@ -835,7 +835,7 @@ abstract class BaseAppDelay extends BaseObject implements Persistent $this->app_automatic_disabled_date = $rs->getTimestamp($startcol + 14, null); - $this->app_delegation_usr_id = $rs->getInt($startcol + 15); + $this->app_delegation_user_id = $rs->getInt($startcol + 15); $this->pro_id = $rs->getInt($startcol + 16); @@ -1094,7 +1094,7 @@ abstract class BaseAppDelay extends BaseObject implements Persistent return $this->getAppAutomaticDisabledDate(); break; case 15: - return $this->getAppDelegationUsrId(); + return $this->getAppDelegationUserId(); break; case 16: return $this->getProId(); @@ -1134,7 +1134,7 @@ abstract class BaseAppDelay extends BaseObject implements Persistent $keys[12] => $this->getAppDisableActionUser(), $keys[13] => $this->getAppDisableActionDate(), $keys[14] => $this->getAppAutomaticDisabledDate(), - $keys[15] => $this->getAppDelegationUsrId(), + $keys[15] => $this->getAppDelegationUserId(), $keys[16] => $this->getProId(), ); return $result; @@ -1213,7 +1213,7 @@ abstract class BaseAppDelay extends BaseObject implements Persistent $this->setAppAutomaticDisabledDate($value); break; case 15: - $this->setAppDelegationUsrId($value); + $this->setAppDelegationUserId($value); break; case 16: $this->setProId($value); @@ -1302,7 +1302,7 @@ abstract class BaseAppDelay extends BaseObject implements Persistent } if (array_key_exists($keys[15], $arr)) { - $this->setAppDelegationUsrId($arr[$keys[15]]); + $this->setAppDelegationUserId($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { @@ -1380,8 +1380,8 @@ abstract class BaseAppDelay extends BaseObject implements Persistent $criteria->add(AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE, $this->app_automatic_disabled_date); } - if ($this->isColumnModified(AppDelayPeer::APP_DELEGATION_USR_ID)) { - $criteria->add(AppDelayPeer::APP_DELEGATION_USR_ID, $this->app_delegation_usr_id); + if ($this->isColumnModified(AppDelayPeer::APP_DELEGATION_USER_ID)) { + $criteria->add(AppDelayPeer::APP_DELEGATION_USER_ID, $this->app_delegation_user_id); } if ($this->isColumnModified(AppDelayPeer::PRO_ID)) { @@ -1470,7 +1470,7 @@ abstract class BaseAppDelay extends BaseObject implements Persistent $copyObj->setAppAutomaticDisabledDate($this->app_automatic_disabled_date); - $copyObj->setAppDelegationUsrId($this->app_delegation_usr_id); + $copyObj->setAppDelegationUserId($this->app_delegation_user_id); $copyObj->setProId($this->pro_id); diff --git a/workflow/engine/classes/model/om/BaseAppDelayPeer.php b/workflow/engine/classes/model/om/BaseAppDelayPeer.php index 887bafeda..05138024d 100644 --- a/workflow/engine/classes/model/om/BaseAppDelayPeer.php +++ b/workflow/engine/classes/model/om/BaseAppDelayPeer.php @@ -76,8 +76,8 @@ abstract class BaseAppDelayPeer /** the column name for the APP_AUTOMATIC_DISABLED_DATE field */ const APP_AUTOMATIC_DISABLED_DATE = 'APP_DELAY.APP_AUTOMATIC_DISABLED_DATE'; - /** the column name for the APP_DELEGATION_USR_ID field */ - const APP_DELEGATION_USR_ID = 'APP_DELAY.APP_DELEGATION_USR_ID'; + /** the column name for the APP_DELEGATION_USER_ID field */ + const APP_DELEGATION_USER_ID = 'APP_DELAY.APP_DELEGATION_USER_ID'; /** the column name for the PRO_ID field */ const PRO_ID = 'APP_DELAY.PRO_ID'; @@ -93,9 +93,9 @@ abstract class BaseAppDelayPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppDelayUid', 'ProUid', 'AppUid', 'AppNumber', 'AppThreadIndex', 'AppDelIndex', 'AppType', 'AppStatus', 'AppNextTask', 'AppDelegationUser', 'AppEnableActionUser', 'AppEnableActionDate', 'AppDisableActionUser', 'AppDisableActionDate', 'AppAutomaticDisabledDate', 'AppDelegationUsrId', 'ProId', ), - BasePeer::TYPE_COLNAME => array (AppDelayPeer::APP_DELAY_UID, AppDelayPeer::PRO_UID, AppDelayPeer::APP_UID, AppDelayPeer::APP_NUMBER, AppDelayPeer::APP_THREAD_INDEX, AppDelayPeer::APP_DEL_INDEX, AppDelayPeer::APP_TYPE, AppDelayPeer::APP_STATUS, AppDelayPeer::APP_NEXT_TASK, AppDelayPeer::APP_DELEGATION_USER, AppDelayPeer::APP_ENABLE_ACTION_USER, AppDelayPeer::APP_ENABLE_ACTION_DATE, AppDelayPeer::APP_DISABLE_ACTION_USER, AppDelayPeer::APP_DISABLE_ACTION_DATE, AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE, AppDelayPeer::APP_DELEGATION_USR_ID, AppDelayPeer::PRO_ID, ), - BasePeer::TYPE_FIELDNAME => array ('APP_DELAY_UID', 'PRO_UID', 'APP_UID', 'APP_NUMBER', 'APP_THREAD_INDEX', 'APP_DEL_INDEX', 'APP_TYPE', 'APP_STATUS', 'APP_NEXT_TASK', 'APP_DELEGATION_USER', 'APP_ENABLE_ACTION_USER', 'APP_ENABLE_ACTION_DATE', 'APP_DISABLE_ACTION_USER', 'APP_DISABLE_ACTION_DATE', 'APP_AUTOMATIC_DISABLED_DATE', 'APP_DELEGATION_USR_ID', 'PRO_ID', ), + BasePeer::TYPE_PHPNAME => array ('AppDelayUid', 'ProUid', 'AppUid', 'AppNumber', 'AppThreadIndex', 'AppDelIndex', 'AppType', 'AppStatus', 'AppNextTask', 'AppDelegationUser', 'AppEnableActionUser', 'AppEnableActionDate', 'AppDisableActionUser', 'AppDisableActionDate', 'AppAutomaticDisabledDate', 'AppDelegationUserId', 'ProId', ), + BasePeer::TYPE_COLNAME => array (AppDelayPeer::APP_DELAY_UID, AppDelayPeer::PRO_UID, AppDelayPeer::APP_UID, AppDelayPeer::APP_NUMBER, AppDelayPeer::APP_THREAD_INDEX, AppDelayPeer::APP_DEL_INDEX, AppDelayPeer::APP_TYPE, AppDelayPeer::APP_STATUS, AppDelayPeer::APP_NEXT_TASK, AppDelayPeer::APP_DELEGATION_USER, AppDelayPeer::APP_ENABLE_ACTION_USER, AppDelayPeer::APP_ENABLE_ACTION_DATE, AppDelayPeer::APP_DISABLE_ACTION_USER, AppDelayPeer::APP_DISABLE_ACTION_DATE, AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE, AppDelayPeer::APP_DELEGATION_USER_ID, AppDelayPeer::PRO_ID, ), + BasePeer::TYPE_FIELDNAME => array ('APP_DELAY_UID', 'PRO_UID', 'APP_UID', 'APP_NUMBER', 'APP_THREAD_INDEX', 'APP_DEL_INDEX', 'APP_TYPE', 'APP_STATUS', 'APP_NEXT_TASK', 'APP_DELEGATION_USER', 'APP_ENABLE_ACTION_USER', 'APP_ENABLE_ACTION_DATE', 'APP_DISABLE_ACTION_USER', 'APP_DISABLE_ACTION_DATE', 'APP_AUTOMATIC_DISABLED_DATE', 'APP_DELEGATION_USER_ID', 'PRO_ID', ), BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) ); @@ -106,9 +106,9 @@ abstract class BaseAppDelayPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppDelayUid' => 0, 'ProUid' => 1, 'AppUid' => 2, 'AppNumber' => 3, 'AppThreadIndex' => 4, 'AppDelIndex' => 5, 'AppType' => 6, 'AppStatus' => 7, 'AppNextTask' => 8, 'AppDelegationUser' => 9, 'AppEnableActionUser' => 10, 'AppEnableActionDate' => 11, 'AppDisableActionUser' => 12, 'AppDisableActionDate' => 13, 'AppAutomaticDisabledDate' => 14, 'AppDelegationUsrId' => 15, 'ProId' => 16, ), - BasePeer::TYPE_COLNAME => array (AppDelayPeer::APP_DELAY_UID => 0, AppDelayPeer::PRO_UID => 1, AppDelayPeer::APP_UID => 2, AppDelayPeer::APP_NUMBER => 3, AppDelayPeer::APP_THREAD_INDEX => 4, AppDelayPeer::APP_DEL_INDEX => 5, AppDelayPeer::APP_TYPE => 6, AppDelayPeer::APP_STATUS => 7, AppDelayPeer::APP_NEXT_TASK => 8, AppDelayPeer::APP_DELEGATION_USER => 9, AppDelayPeer::APP_ENABLE_ACTION_USER => 10, AppDelayPeer::APP_ENABLE_ACTION_DATE => 11, AppDelayPeer::APP_DISABLE_ACTION_USER => 12, AppDelayPeer::APP_DISABLE_ACTION_DATE => 13, AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE => 14, AppDelayPeer::APP_DELEGATION_USR_ID => 15, AppDelayPeer::PRO_ID => 16, ), - BasePeer::TYPE_FIELDNAME => array ('APP_DELAY_UID' => 0, 'PRO_UID' => 1, 'APP_UID' => 2, 'APP_NUMBER' => 3, 'APP_THREAD_INDEX' => 4, 'APP_DEL_INDEX' => 5, 'APP_TYPE' => 6, 'APP_STATUS' => 7, 'APP_NEXT_TASK' => 8, 'APP_DELEGATION_USER' => 9, 'APP_ENABLE_ACTION_USER' => 10, 'APP_ENABLE_ACTION_DATE' => 11, 'APP_DISABLE_ACTION_USER' => 12, 'APP_DISABLE_ACTION_DATE' => 13, 'APP_AUTOMATIC_DISABLED_DATE' => 14, 'APP_DELEGATION_USR_ID' => 15, 'PRO_ID' => 16, ), + BasePeer::TYPE_PHPNAME => array ('AppDelayUid' => 0, 'ProUid' => 1, 'AppUid' => 2, 'AppNumber' => 3, 'AppThreadIndex' => 4, 'AppDelIndex' => 5, 'AppType' => 6, 'AppStatus' => 7, 'AppNextTask' => 8, 'AppDelegationUser' => 9, 'AppEnableActionUser' => 10, 'AppEnableActionDate' => 11, 'AppDisableActionUser' => 12, 'AppDisableActionDate' => 13, 'AppAutomaticDisabledDate' => 14, 'AppDelegationUserId' => 15, 'ProId' => 16, ), + BasePeer::TYPE_COLNAME => array (AppDelayPeer::APP_DELAY_UID => 0, AppDelayPeer::PRO_UID => 1, AppDelayPeer::APP_UID => 2, AppDelayPeer::APP_NUMBER => 3, AppDelayPeer::APP_THREAD_INDEX => 4, AppDelayPeer::APP_DEL_INDEX => 5, AppDelayPeer::APP_TYPE => 6, AppDelayPeer::APP_STATUS => 7, AppDelayPeer::APP_NEXT_TASK => 8, AppDelayPeer::APP_DELEGATION_USER => 9, AppDelayPeer::APP_ENABLE_ACTION_USER => 10, AppDelayPeer::APP_ENABLE_ACTION_DATE => 11, AppDelayPeer::APP_DISABLE_ACTION_USER => 12, AppDelayPeer::APP_DISABLE_ACTION_DATE => 13, AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE => 14, AppDelayPeer::APP_DELEGATION_USER_ID => 15, AppDelayPeer::PRO_ID => 16, ), + BasePeer::TYPE_FIELDNAME => array ('APP_DELAY_UID' => 0, 'PRO_UID' => 1, 'APP_UID' => 2, 'APP_NUMBER' => 3, 'APP_THREAD_INDEX' => 4, 'APP_DEL_INDEX' => 5, 'APP_TYPE' => 6, 'APP_STATUS' => 7, 'APP_NEXT_TASK' => 8, 'APP_DELEGATION_USER' => 9, 'APP_ENABLE_ACTION_USER' => 10, 'APP_ENABLE_ACTION_DATE' => 11, 'APP_DISABLE_ACTION_USER' => 12, 'APP_DISABLE_ACTION_DATE' => 13, 'APP_AUTOMATIC_DISABLED_DATE' => 14, 'APP_DELEGATION_USER_ID' => 15, 'PRO_ID' => 16, ), BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) ); @@ -240,7 +240,7 @@ abstract class BaseAppDelayPeer $criteria->addSelectColumn(AppDelayPeer::APP_AUTOMATIC_DISABLED_DATE); - $criteria->addSelectColumn(AppDelayPeer::APP_DELEGATION_USR_ID); + $criteria->addSelectColumn(AppDelayPeer::APP_DELEGATION_USER_ID); $criteria->addSelectColumn(AppDelayPeer::PRO_ID); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 7fd1547d8..cafe0b03e 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -1701,13 +1701,13 @@ - + - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 3d2a47cbe..ff9c1909b 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -840,11 +840,11 @@ CREATE TABLE `APP_DELAY` `APP_DISABLE_ACTION_USER` VARCHAR(32) default '0', `APP_DISABLE_ACTION_DATE` DATETIME, `APP_AUTOMATIC_DISABLED_DATE` DATETIME, - `APP_DELEGATION_USR_ID` INTEGER default 0, + `APP_DELEGATION_USER_ID` INTEGER default 0, `PRO_ID` INTEGER default 0, PRIMARY KEY (`APP_DELAY_UID`), KEY `INDEX_APP_NUMBER`(`APP_NUMBER`), - KEY `INDEX_USR_ID`(`APP_DELEGATION_USR_ID`), + KEY `INDEX_USR_ID`(`APP_DELEGATION_USER_ID`), KEY `INDEX_PRO_ID`(`PRO_ID`), KEY `indexAppDelay`(`PRO_UID`, `APP_UID`, `APP_THREAD_INDEX`, `APP_DEL_INDEX`, `APP_NEXT_TASK`, `APP_DELEGATION_USER`, `APP_DISABLE_ACTION_USER`), KEY `indexAppUid`(`APP_UID`)