GI-136 Move changes to PM 3.0.1.6

This commit is contained in:
Marco A. Nina Mena
2015-11-09 13:58:34 -04:00
parent f5133f09a6
commit 42011c4e29
19 changed files with 759 additions and 34 deletions

View File

@@ -237,6 +237,12 @@ abstract class BaseUsers extends BaseObject implements Persistent
*/
protected $usr_unit_cost = '';
/**
* The value for the usr_pmdrive_folder_uid field.
* @var string
*/
protected $usr_pmdrive_folder_uid = '';
/**
* The value for the usr_bookmark_start_cases field.
* @var string
@@ -726,6 +732,17 @@ abstract class BaseUsers extends BaseObject implements Persistent
return $this->usr_unit_cost;
}
/**
* Get the [usr_pmdrive_folder_uid] column value.
*
* @return string
*/
public function getUsrPmdriveFolderUid()
{
return $this->usr_pmdrive_folder_uid;
}
/**
* Get the [usr_bookmark_start_cases] column value.
*
@@ -1529,6 +1546,28 @@ abstract class BaseUsers extends BaseObject implements Persistent
} // setUsrUnitCost()
/**
* Set the value of [usr_pmdrive_folder_uid] column.
*
* @param string $v new value
* @return void
*/
public function setUsrPmdriveFolderUid($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->usr_pmdrive_folder_uid !== $v || $v === '') {
$this->usr_pmdrive_folder_uid = $v;
$this->modifiedColumns[] = UsersPeer::USR_PMDRIVE_FOLDER_UID;
}
} // setUsrPmdriveFolderUid()
/**
* Set the value of [usr_bookmark_start_cases] column.
*
@@ -1638,14 +1677,16 @@ abstract class BaseUsers extends BaseObject implements Persistent
$this->usr_unit_cost = $rs->getString($startcol + 34);
$this->usr_bookmark_start_cases = $rs->getString($startcol + 35);
$this->usr_pmdrive_folder_uid = $rs->getString($startcol + 35);
$this->usr_bookmark_start_cases = $rs->getString($startcol + 36);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 36; // 36 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 37; // 37 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating Users object", $e);
@@ -1955,6 +1996,9 @@ abstract class BaseUsers extends BaseObject implements Persistent
return $this->getUsrUnitCost();
break;
case 35:
return $this->getUsrPmdriveFolderUid();
break;
case 36:
return $this->getUsrBookmarkStartCases();
break;
default:
@@ -2012,7 +2056,8 @@ abstract class BaseUsers extends BaseObject implements Persistent
$keys[32] => $this->getUsrTotalUnassigned(),
$keys[33] => $this->getUsrCostByHour(),
$keys[34] => $this->getUsrUnitCost(),
$keys[35] => $this->getUsrBookmarkStartCases(),
$keys[35] => $this->getUsrPmdriveFolderUid(),
$keys[36] => $this->getUsrBookmarkStartCases(),
);
return $result;
}
@@ -2150,6 +2195,9 @@ abstract class BaseUsers extends BaseObject implements Persistent
$this->setUsrUnitCost($value);
break;
case 35:
$this->setUsrPmdriveFolderUid($value);
break;
case 36:
$this->setUsrBookmarkStartCases($value);
break;
} // switch()
@@ -2316,7 +2364,11 @@ abstract class BaseUsers extends BaseObject implements Persistent
}
if (array_key_exists($keys[35], $arr)) {
$this->setUsrBookmarkStartCases($arr[$keys[35]]);
$this->setUsrPmdriveFolderUid($arr[$keys[35]]);
}
if (array_key_exists($keys[36], $arr)) {
$this->setUsrBookmarkStartCases($arr[$keys[36]]);
}
}
@@ -2470,6 +2522,10 @@ abstract class BaseUsers extends BaseObject implements Persistent
$criteria->add(UsersPeer::USR_UNIT_COST, $this->usr_unit_cost);
}
if ($this->isColumnModified(UsersPeer::USR_PMDRIVE_FOLDER_UID)) {
$criteria->add(UsersPeer::USR_PMDRIVE_FOLDER_UID, $this->usr_pmdrive_folder_uid);
}
if ($this->isColumnModified(UsersPeer::USR_BOOKMARK_START_CASES)) {
$criteria->add(UsersPeer::USR_BOOKMARK_START_CASES, $this->usr_bookmark_start_cases);
}
@@ -2596,6 +2652,8 @@ abstract class BaseUsers extends BaseObject implements Persistent
$copyObj->setUsrUnitCost($this->usr_unit_cost);
$copyObj->setUsrPmdriveFolderUid($this->usr_pmdrive_folder_uid);
$copyObj->setUsrBookmarkStartCases($this->usr_bookmark_start_cases);