Merged master into dashboards2
This commit is contained in:
@@ -188,8 +188,8 @@ class AppDelegation extends BaseAppDelegation
|
||||
if (PMLicensedFeatures
|
||||
::getSingleton()
|
||||
->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
|
||||
G::LoadClass('actionsByEmail');
|
||||
$actionsByEmail = new actionsByEmailClass();
|
||||
G::LoadClass('actionsByEmailCore');
|
||||
$actionsByEmail = new actionsByEmailCoreClass();
|
||||
$actionsByEmail->sendActionsByEmail($data);
|
||||
}
|
||||
/*----------------------------------********---------------------------------*/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
require_once 'classes/model/om/BaseCaseConsolidated.php';
|
||||
require_once 'classes/model/om/BaseCaseConsolidatedCore.php';
|
||||
|
||||
|
||||
/**
|
||||
@@ -14,6 +14,6 @@ require_once 'classes/model/om/BaseCaseConsolidated.php';
|
||||
*
|
||||
* @package classes.model
|
||||
*/
|
||||
class CaseConsolidated extends BaseCaseConsolidated {
|
||||
class CaseConsolidatedCore extends BaseCaseConsolidatedCore {
|
||||
|
||||
} // CaseConsolidated
|
||||
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
|
||||
// include base peer class
|
||||
require_once 'classes/model/om/BaseCaseConsolidatedPeer.php';
|
||||
require_once 'classes/model/om/BaseCaseConsolidatedCorePeer.php';
|
||||
|
||||
// include object class
|
||||
include_once 'classes/model/CaseConsolidated.php';
|
||||
include_once 'classes/model/CaseConsolidatedCore.php';
|
||||
|
||||
|
||||
/**
|
||||
@@ -18,6 +18,6 @@
|
||||
*
|
||||
* @package classes.model
|
||||
*/
|
||||
class CaseConsolidatedPeer extends BaseCaseConsolidatedPeer {
|
||||
class CaseConsolidatedCorePeer extends BaseCaseConsolidatedCorePeer {
|
||||
|
||||
} // CaseConsolidatedPeer
|
||||
@@ -16,13 +16,13 @@ include_once 'creole/CreoleTypes.php';
|
||||
*
|
||||
* @package workflow.classes.model.map
|
||||
*/
|
||||
class CaseConsolidatedMapBuilder
|
||||
class CaseConsolidatedCoreMapBuilder
|
||||
{
|
||||
|
||||
/**
|
||||
* The (dot-path) name of this class
|
||||
*/
|
||||
const CLASS_NAME = 'classes.model.map.CaseConsolidatedMapBuilder';
|
||||
const CLASS_NAME = 'classes.model.map.CaseConsolidatedCoreMapBuilder';
|
||||
|
||||
/**
|
||||
* The database map.
|
||||
@@ -75,4 +75,4 @@ class CaseConsolidatedMapBuilder
|
||||
|
||||
} // doBuild()
|
||||
|
||||
} // CaseConsolidatedMapBuilder
|
||||
} // CaseConsolidatedCoreMapBuilder
|
||||
@@ -7,7 +7,7 @@ require_once 'propel/om/Persistent.php';
|
||||
|
||||
include_once 'propel/util/Criteria.php';
|
||||
|
||||
include_once 'classes/model/CaseConsolidatedPeer.php';
|
||||
include_once 'classes/model/CaseConsolidatedCorePeer.php';
|
||||
|
||||
/**
|
||||
* Base class that represents a row from the 'CASE_CONSOLIDATED' table.
|
||||
@@ -16,7 +16,7 @@ include_once 'classes/model/CaseConsolidatedPeer.php';
|
||||
*
|
||||
* @package workflow.classes.model.om
|
||||
*/
|
||||
abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
abstract class BaseCaseConsolidatedCore extends BaseObject implements Persistent
|
||||
{
|
||||
|
||||
/**
|
||||
@@ -126,7 +126,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
|
||||
if ($this->tas_uid !== $v || $v === '') {
|
||||
$this->tas_uid = $v;
|
||||
$this->modifiedColumns[] = CaseConsolidatedPeer::TAS_UID;
|
||||
$this->modifiedColumns[] = CaseConsolidatedCorePeer::TAS_UID;
|
||||
}
|
||||
|
||||
} // setTasUid()
|
||||
@@ -148,7 +148,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
|
||||
if ($this->dyn_uid !== $v || $v === '') {
|
||||
$this->dyn_uid = $v;
|
||||
$this->modifiedColumns[] = CaseConsolidatedPeer::DYN_UID;
|
||||
$this->modifiedColumns[] = CaseConsolidatedCorePeer::DYN_UID;
|
||||
}
|
||||
|
||||
} // setDynUid()
|
||||
@@ -170,7 +170,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
|
||||
if ($this->rep_tab_uid !== $v || $v === '') {
|
||||
$this->rep_tab_uid = $v;
|
||||
$this->modifiedColumns[] = CaseConsolidatedPeer::REP_TAB_UID;
|
||||
$this->modifiedColumns[] = CaseConsolidatedCorePeer::REP_TAB_UID;
|
||||
}
|
||||
|
||||
} // setRepTabUid()
|
||||
@@ -192,7 +192,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
|
||||
if ($this->con_status !== $v || $v === 'ACTIVE') {
|
||||
$this->con_status = $v;
|
||||
$this->modifiedColumns[] = CaseConsolidatedPeer::CON_STATUS;
|
||||
$this->modifiedColumns[] = CaseConsolidatedCorePeer::CON_STATUS;
|
||||
}
|
||||
|
||||
} // setConStatus()
|
||||
@@ -227,7 +227,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
$this->setNew(false);
|
||||
|
||||
// FIXME - using NUM_COLUMNS may be clearer.
|
||||
return $startcol + 4; // 4 = CaseConsolidatedPeer::NUM_COLUMNS - CaseConsolidatedPeer::NUM_LAZY_LOAD_COLUMNS).
|
||||
return $startcol + 4; // 4 = CaseConsolidatedCorePeer::NUM_COLUMNS - CaseConsolidatedCorePeer::NUM_LAZY_LOAD_COLUMNS).
|
||||
|
||||
} catch (Exception $e) {
|
||||
throw new PropelException("Error populating CaseConsolidated object", $e);
|
||||
@@ -250,12 +250,12 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
}
|
||||
|
||||
if ($con === null) {
|
||||
$con = Propel::getConnection(CaseConsolidatedPeer::DATABASE_NAME);
|
||||
$con = Propel::getConnection(CaseConsolidatedCorePeer::DATABASE_NAME);
|
||||
}
|
||||
|
||||
try {
|
||||
$con->begin();
|
||||
CaseConsolidatedPeer::doDelete($this, $con);
|
||||
CaseConsolidatedCorePeer::doDelete($this, $con);
|
||||
$this->setDeleted(true);
|
||||
$con->commit();
|
||||
} catch (PropelException $e) {
|
||||
@@ -281,7 +281,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
}
|
||||
|
||||
if ($con === null) {
|
||||
$con = Propel::getConnection(CaseConsolidatedPeer::DATABASE_NAME);
|
||||
$con = Propel::getConnection(CaseConsolidatedCorePeer::DATABASE_NAME);
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -316,14 +316,14 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
// If this object has been modified, then save it to the database.
|
||||
if ($this->isModified()) {
|
||||
if ($this->isNew()) {
|
||||
$pk = CaseConsolidatedPeer::doInsert($this, $con);
|
||||
$pk = CaseConsolidatedCorePeer::doInsert($this, $con);
|
||||
$affectedRows += 1; // we are assuming that there is only 1 row per doInsert() which
|
||||
// should always be true here (even though technically
|
||||
// BasePeer::doInsert() can insert multiple rows).
|
||||
|
||||
$this->setNew(false);
|
||||
} else {
|
||||
$affectedRows += CaseConsolidatedPeer::doUpdate($this, $con);
|
||||
$affectedRows += CaseConsolidatedCorePeer::doUpdate($this, $con);
|
||||
}
|
||||
$this->resetModified(); // [HL] After being saved an object is no longer 'modified'
|
||||
}
|
||||
@@ -394,7 +394,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
$failureMap = array();
|
||||
|
||||
|
||||
if (($retval = CaseConsolidatedPeer::doValidate($this, $columns)) !== true) {
|
||||
if (($retval = CaseConsolidatedCorePeer::doValidate($this, $columns)) !== true) {
|
||||
$failureMap = array_merge($failureMap, $retval);
|
||||
}
|
||||
|
||||
@@ -417,7 +417,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
*/
|
||||
public function getByName($name, $type = BasePeer::TYPE_PHPNAME)
|
||||
{
|
||||
$pos = CaseConsolidatedPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
|
||||
$pos = CaseConsolidatedCorePeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
|
||||
return $this->getByPosition($pos);
|
||||
}
|
||||
|
||||
@@ -461,7 +461,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
*/
|
||||
public function toArray($keyType = BasePeer::TYPE_PHPNAME)
|
||||
{
|
||||
$keys = CaseConsolidatedPeer::getFieldNames($keyType);
|
||||
$keys = CaseConsolidatedCorePeer::getFieldNames($keyType);
|
||||
$result = array(
|
||||
$keys[0] => $this->getTasUid(),
|
||||
$keys[1] => $this->getDynUid(),
|
||||
@@ -483,7 +483,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
*/
|
||||
public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME)
|
||||
{
|
||||
$pos = CaseConsolidatedPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
|
||||
$pos = CaseConsolidatedCorePeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
|
||||
return $this->setByPosition($pos, $value);
|
||||
}
|
||||
|
||||
@@ -531,7 +531,7 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
*/
|
||||
public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME)
|
||||
{
|
||||
$keys = CaseConsolidatedPeer::getFieldNames($keyType);
|
||||
$keys = CaseConsolidatedCorePeer::getFieldNames($keyType);
|
||||
|
||||
if (array_key_exists($keys[0], $arr)) {
|
||||
$this->setTasUid($arr[$keys[0]]);
|
||||
@@ -558,22 +558,22 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
*/
|
||||
public function buildCriteria()
|
||||
{
|
||||
$criteria = new Criteria(CaseConsolidatedPeer::DATABASE_NAME);
|
||||
$criteria = new Criteria(CaseConsolidatedCorePeer::DATABASE_NAME);
|
||||
|
||||
if ($this->isColumnModified(CaseConsolidatedPeer::TAS_UID)) {
|
||||
$criteria->add(CaseConsolidatedPeer::TAS_UID, $this->tas_uid);
|
||||
if ($this->isColumnModified(CaseConsolidatedCorePeer::TAS_UID)) {
|
||||
$criteria->add(CaseConsolidatedCorePeer::TAS_UID, $this->tas_uid);
|
||||
}
|
||||
|
||||
if ($this->isColumnModified(CaseConsolidatedPeer::DYN_UID)) {
|
||||
$criteria->add(CaseConsolidatedPeer::DYN_UID, $this->dyn_uid);
|
||||
if ($this->isColumnModified(CaseConsolidatedCorePeer::DYN_UID)) {
|
||||
$criteria->add(CaseConsolidatedCorePeer::DYN_UID, $this->dyn_uid);
|
||||
}
|
||||
|
||||
if ($this->isColumnModified(CaseConsolidatedPeer::REP_TAB_UID)) {
|
||||
$criteria->add(CaseConsolidatedPeer::REP_TAB_UID, $this->rep_tab_uid);
|
||||
if ($this->isColumnModified(CaseConsolidatedCorePeer::REP_TAB_UID)) {
|
||||
$criteria->add(CaseConsolidatedCorePeer::REP_TAB_UID, $this->rep_tab_uid);
|
||||
}
|
||||
|
||||
if ($this->isColumnModified(CaseConsolidatedPeer::CON_STATUS)) {
|
||||
$criteria->add(CaseConsolidatedPeer::CON_STATUS, $this->con_status);
|
||||
if ($this->isColumnModified(CaseConsolidatedCorePeer::CON_STATUS)) {
|
||||
$criteria->add(CaseConsolidatedCorePeer::CON_STATUS, $this->con_status);
|
||||
}
|
||||
|
||||
|
||||
@@ -590,9 +590,9 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
*/
|
||||
public function buildPkeyCriteria()
|
||||
{
|
||||
$criteria = new Criteria(CaseConsolidatedPeer::DATABASE_NAME);
|
||||
$criteria = new Criteria(CaseConsolidatedCorePeer::DATABASE_NAME);
|
||||
|
||||
$criteria->add(CaseConsolidatedPeer::TAS_UID, $this->tas_uid);
|
||||
$criteria->add(CaseConsolidatedCorePeer::TAS_UID, $this->tas_uid);
|
||||
|
||||
return $criteria;
|
||||
}
|
||||
@@ -671,12 +671,12 @@ abstract class BaseCaseConsolidated extends BaseObject implements Persistent
|
||||
* same instance for all member of this class. The method could therefore
|
||||
* be static, but this would prevent one from overriding the behavior.
|
||||
*
|
||||
* @return CaseConsolidatedPeer
|
||||
* @return CaseConsolidatedCorePeer
|
||||
*/
|
||||
public function getPeer()
|
||||
{
|
||||
if (self::$peer === null) {
|
||||
self::$peer = new CaseConsolidatedPeer();
|
||||
self::$peer = new CaseConsolidatedCorePeer();
|
||||
}
|
||||
return self::$peer;
|
||||
}
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
require_once 'propel/util/BasePeer.php';
|
||||
// The object class -- needed for instanceof checks in this class.
|
||||
// actual class may be a subclass -- as returned by CaseConsolidatedPeer::getOMClass()
|
||||
include_once 'classes/model/CaseConsolidated.php';
|
||||
// actual class may be a subclass -- as returned by CaseConsolidatedCorePeer::getOMClass()
|
||||
include_once 'classes/model/CaseConsolidatedCore.php';
|
||||
|
||||
/**
|
||||
* Base static class for performing query and update operations on the 'CASE_CONSOLIDATED' table.
|
||||
@@ -12,7 +12,7 @@ include_once 'classes/model/CaseConsolidated.php';
|
||||
*
|
||||
* @package workflow.classes.model.om
|
||||
*/
|
||||
abstract class BaseCaseConsolidatedPeer
|
||||
abstract class BaseCaseConsolidatedCorePeer
|
||||
{
|
||||
|
||||
/** the default database name for this class */
|
||||
@@ -22,7 +22,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
const TABLE_NAME = 'CASE_CONSOLIDATED';
|
||||
|
||||
/** A class that can be returned by this peer. */
|
||||
const CLASS_DEFAULT = 'classes.model.CaseConsolidated';
|
||||
const CLASS_DEFAULT = 'classes.model.CaseConsolidatedCore';
|
||||
|
||||
/** The total number of columns. */
|
||||
const NUM_COLUMNS = 4;
|
||||
@@ -55,7 +55,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
*/
|
||||
private static $fieldNames = array (
|
||||
BasePeer::TYPE_PHPNAME => array ('TasUid', 'DynUid', 'RepTabUid', 'ConStatus', ),
|
||||
BasePeer::TYPE_COLNAME => array (CaseConsolidatedPeer::TAS_UID, CaseConsolidatedPeer::DYN_UID, CaseConsolidatedPeer::REP_TAB_UID, CaseConsolidatedPeer::CON_STATUS, ),
|
||||
BasePeer::TYPE_COLNAME => array (CaseConsolidatedCorePeer::TAS_UID, CaseConsolidatedCorePeer::DYN_UID, CaseConsolidatedCorePeer::REP_TAB_UID, CaseConsolidatedCorePeer::CON_STATUS, ),
|
||||
BasePeer::TYPE_FIELDNAME => array ('TAS_UID', 'DYN_UID', 'REP_TAB_UID', 'CON_STATUS', ),
|
||||
BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
|
||||
);
|
||||
@@ -68,7 +68,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
*/
|
||||
private static $fieldKeys = array (
|
||||
BasePeer::TYPE_PHPNAME => array ('TasUid' => 0, 'DynUid' => 1, 'RepTabUid' => 2, 'ConStatus' => 3, ),
|
||||
BasePeer::TYPE_COLNAME => array (CaseConsolidatedPeer::TAS_UID => 0, CaseConsolidatedPeer::DYN_UID => 1, CaseConsolidatedPeer::REP_TAB_UID => 2, CaseConsolidatedPeer::CON_STATUS => 3, ),
|
||||
BasePeer::TYPE_COLNAME => array (CaseConsolidatedCorePeer::TAS_UID => 0, CaseConsolidatedCorePeer::DYN_UID => 1, CaseConsolidatedCorePeer::REP_TAB_UID => 2, CaseConsolidatedCorePeer::CON_STATUS => 3, ),
|
||||
BasePeer::TYPE_FIELDNAME => array ('TAS_UID' => 0, 'DYN_UID' => 1, 'REP_TAB_UID' => 2, 'CON_STATUS' => 3, ),
|
||||
BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
|
||||
);
|
||||
@@ -80,8 +80,8 @@ abstract class BaseCaseConsolidatedPeer
|
||||
*/
|
||||
public static function getMapBuilder()
|
||||
{
|
||||
include_once 'classes/model/map/CaseConsolidatedMapBuilder.php';
|
||||
return BasePeer::getMapBuilder('classes.model.map.CaseConsolidatedMapBuilder');
|
||||
include_once 'classes/model/map/CaseConsolidatedCoreMapBuilder.php';
|
||||
return BasePeer::getMapBuilder('classes.model.map.CaseConsolidatedCoreMapBuilder');
|
||||
}
|
||||
/**
|
||||
* Gets a map (hash) of PHP names to DB column names.
|
||||
@@ -94,7 +94,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
public static function getPhpNameMap()
|
||||
{
|
||||
if (self::$phpNameMap === null) {
|
||||
$map = CaseConsolidatedPeer::getTableMap();
|
||||
$map = CaseConsolidatedCorePeer::getTableMap();
|
||||
$columns = $map->getColumns();
|
||||
$nameMap = array();
|
||||
foreach ($columns as $column) {
|
||||
@@ -149,12 +149,12 @@ abstract class BaseCaseConsolidatedPeer
|
||||
* $c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN);
|
||||
* </code>
|
||||
* @param string $alias The alias for the current table.
|
||||
* @param string $column The column name for current table. (i.e. CaseConsolidatedPeer::COLUMN_NAME).
|
||||
* @param string $column The column name for current table. (i.e. CaseConsolidatedCorePeer::COLUMN_NAME).
|
||||
* @return string
|
||||
*/
|
||||
public static function alias($alias, $column)
|
||||
{
|
||||
return str_replace(CaseConsolidatedPeer::TABLE_NAME.'.', $alias.'.', $column);
|
||||
return str_replace(CaseConsolidatedCorePeer::TABLE_NAME.'.', $alias.'.', $column);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -171,13 +171,13 @@ abstract class BaseCaseConsolidatedPeer
|
||||
public static function addSelectColumns(Criteria $criteria)
|
||||
{
|
||||
|
||||
$criteria->addSelectColumn(CaseConsolidatedPeer::TAS_UID);
|
||||
$criteria->addSelectColumn(CaseConsolidatedCorePeer::TAS_UID);
|
||||
|
||||
$criteria->addSelectColumn(CaseConsolidatedPeer::DYN_UID);
|
||||
$criteria->addSelectColumn(CaseConsolidatedCorePeer::DYN_UID);
|
||||
|
||||
$criteria->addSelectColumn(CaseConsolidatedPeer::REP_TAB_UID);
|
||||
$criteria->addSelectColumn(CaseConsolidatedCorePeer::REP_TAB_UID);
|
||||
|
||||
$criteria->addSelectColumn(CaseConsolidatedPeer::CON_STATUS);
|
||||
$criteria->addSelectColumn(CaseConsolidatedCorePeer::CON_STATUS);
|
||||
|
||||
}
|
||||
|
||||
@@ -200,9 +200,9 @@ abstract class BaseCaseConsolidatedPeer
|
||||
// clear out anything that might confuse the ORDER BY clause
|
||||
$criteria->clearSelectColumns()->clearOrderByColumns();
|
||||
if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
|
||||
$criteria->addSelectColumn(CaseConsolidatedPeer::COUNT_DISTINCT);
|
||||
$criteria->addSelectColumn(CaseConsolidatedCorePeer::COUNT_DISTINCT);
|
||||
} else {
|
||||
$criteria->addSelectColumn(CaseConsolidatedPeer::COUNT);
|
||||
$criteria->addSelectColumn(CaseConsolidatedCorePeer::COUNT);
|
||||
}
|
||||
|
||||
// just in case we're grouping: add those columns to the select statement
|
||||
@@ -210,7 +210,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
$criteria->addSelectColumn($column);
|
||||
}
|
||||
|
||||
$rs = CaseConsolidatedPeer::doSelectRS($criteria, $con);
|
||||
$rs = CaseConsolidatedCorePeer::doSelectRS($criteria, $con);
|
||||
if ($rs->next()) {
|
||||
return $rs->getInt(1);
|
||||
} else {
|
||||
@@ -231,7 +231,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
{
|
||||
$critcopy = clone $criteria;
|
||||
$critcopy->setLimit(1);
|
||||
$objects = CaseConsolidatedPeer::doSelect($critcopy, $con);
|
||||
$objects = CaseConsolidatedCorePeer::doSelect($critcopy, $con);
|
||||
if ($objects) {
|
||||
return $objects[0];
|
||||
}
|
||||
@@ -248,7 +248,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
*/
|
||||
public static function doSelect(Criteria $criteria, $con = null)
|
||||
{
|
||||
return CaseConsolidatedPeer::populateObjects(CaseConsolidatedPeer::doSelectRS($criteria, $con));
|
||||
return CaseConsolidatedCorePeer::populateObjects(CaseConsolidatedCorePeer::doSelectRS($criteria, $con));
|
||||
}
|
||||
/**
|
||||
* Prepares the Criteria object and uses the parent doSelect()
|
||||
@@ -272,7 +272,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
|
||||
if (!$criteria->getSelectColumns()) {
|
||||
$criteria = clone $criteria;
|
||||
CaseConsolidatedPeer::addSelectColumns($criteria);
|
||||
CaseConsolidatedCorePeer::addSelectColumns($criteria);
|
||||
}
|
||||
|
||||
// Set the correct dbName
|
||||
@@ -294,7 +294,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
$results = array();
|
||||
|
||||
// set the class once to avoid overhead in the loop
|
||||
$cls = CaseConsolidatedPeer::getOMClass();
|
||||
$cls = CaseConsolidatedCorePeer::getOMClass();
|
||||
$cls = Propel::import($cls);
|
||||
// populate the object(s)
|
||||
while ($rs->next()) {
|
||||
@@ -329,7 +329,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
*/
|
||||
public static function getOMClass()
|
||||
{
|
||||
return CaseConsolidatedPeer::CLASS_DEFAULT;
|
||||
return CaseConsolidatedCorePeer::CLASS_DEFAULT;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -391,8 +391,8 @@ abstract class BaseCaseConsolidatedPeer
|
||||
if ($values instanceof Criteria) {
|
||||
$criteria = clone $values; // rename for clarity
|
||||
|
||||
$comparison = $criteria->getComparison(CaseConsolidatedPeer::TAS_UID);
|
||||
$selectCriteria->add(CaseConsolidatedPeer::TAS_UID, $criteria->remove(CaseConsolidatedPeer::TAS_UID), $comparison);
|
||||
$comparison = $criteria->getComparison(CaseConsolidatedCorePeer::TAS_UID);
|
||||
$selectCriteria->add(CaseConsolidatedCorePeer::TAS_UID, $criteria->remove(CaseConsolidatedCorePeer::TAS_UID), $comparison);
|
||||
|
||||
} else {
|
||||
$criteria = $values->buildCriteria(); // gets full criteria
|
||||
@@ -420,7 +420,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
// use transaction because $criteria could contain info
|
||||
// for more than one table or we could emulating ON DELETE CASCADE, etc.
|
||||
$con->begin();
|
||||
$affectedRows += BasePeer::doDeleteAll(CaseConsolidatedPeer::TABLE_NAME, $con);
|
||||
$affectedRows += BasePeer::doDeleteAll(CaseConsolidatedCorePeer::TABLE_NAME, $con);
|
||||
$con->commit();
|
||||
return $affectedRows;
|
||||
} catch (PropelException $e) {
|
||||
@@ -444,7 +444,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
public static function doDelete($values, $con = null)
|
||||
{
|
||||
if ($con === null) {
|
||||
$con = Propel::getConnection(CaseConsolidatedPeer::DATABASE_NAME);
|
||||
$con = Propel::getConnection(CaseConsolidatedCorePeer::DATABASE_NAME);
|
||||
}
|
||||
|
||||
if ($values instanceof Criteria) {
|
||||
@@ -455,7 +455,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
} else {
|
||||
// it must be the primary key
|
||||
$criteria = new Criteria(self::DATABASE_NAME);
|
||||
$criteria->add(CaseConsolidatedPeer::TAS_UID, (array) $values, Criteria::IN);
|
||||
$criteria->add(CaseConsolidatedCorePeer::TAS_UID, (array) $values, Criteria::IN);
|
||||
}
|
||||
|
||||
// Set the correct dbName
|
||||
@@ -494,8 +494,8 @@ abstract class BaseCaseConsolidatedPeer
|
||||
$columns = array();
|
||||
|
||||
if ($cols) {
|
||||
$dbMap = Propel::getDatabaseMap(CaseConsolidatedPeer::DATABASE_NAME);
|
||||
$tableMap = $dbMap->getTable(CaseConsolidatedPeer::TABLE_NAME);
|
||||
$dbMap = Propel::getDatabaseMap(CaseConsolidatedCorePeer::DATABASE_NAME);
|
||||
$tableMap = $dbMap->getTable(CaseConsolidatedCorePeer::TABLE_NAME);
|
||||
|
||||
if (! is_array($cols)) {
|
||||
$cols = array($cols);
|
||||
@@ -511,7 +511,7 @@ abstract class BaseCaseConsolidatedPeer
|
||||
|
||||
}
|
||||
|
||||
return BasePeer::doValidate(CaseConsolidatedPeer::DATABASE_NAME, CaseConsolidatedPeer::TABLE_NAME, $columns);
|
||||
return BasePeer::doValidate(CaseConsolidatedCorePeer::DATABASE_NAME, CaseConsolidatedCorePeer::TABLE_NAME, $columns);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -527,12 +527,12 @@ abstract class BaseCaseConsolidatedPeer
|
||||
$con = Propel::getConnection(self::DATABASE_NAME);
|
||||
}
|
||||
|
||||
$criteria = new Criteria(CaseConsolidatedPeer::DATABASE_NAME);
|
||||
$criteria = new Criteria(CaseConsolidatedCorePeer::DATABASE_NAME);
|
||||
|
||||
$criteria->add(CaseConsolidatedPeer::TAS_UID, $pk);
|
||||
$criteria->add(CaseConsolidatedCorePeer::TAS_UID, $pk);
|
||||
|
||||
|
||||
$v = CaseConsolidatedPeer::doSelect($criteria, $con);
|
||||
$v = CaseConsolidatedCorePeer::doSelect($criteria, $con);
|
||||
|
||||
return !empty($v) > 0 ? $v[0] : null;
|
||||
}
|
||||
@@ -556,8 +556,8 @@ abstract class BaseCaseConsolidatedPeer
|
||||
$objs = array();
|
||||
} else {
|
||||
$criteria = new Criteria();
|
||||
$criteria->add(CaseConsolidatedPeer::TAS_UID, $pks, Criteria::IN);
|
||||
$objs = CaseConsolidatedPeer::doSelect($criteria, $con);
|
||||
$criteria->add(CaseConsolidatedCorePeer::TAS_UID, $pks, Criteria::IN);
|
||||
$objs = CaseConsolidatedCorePeer::doSelect($criteria, $con);
|
||||
}
|
||||
return $objs;
|
||||
}
|
||||
@@ -569,14 +569,14 @@ if (Propel::isInit()) {
|
||||
// the MapBuilder classes register themselves with Propel during initialization
|
||||
// so we need to load them here.
|
||||
try {
|
||||
BaseCaseConsolidatedPeer::getMapBuilder();
|
||||
BaseCaseConsolidatedCorePeer::getMapBuilder();
|
||||
} catch (Exception $e) {
|
||||
Propel::log('Could not initialize Peer: ' . $e->getMessage(), Propel::LOG_ERR);
|
||||
}
|
||||
} else {
|
||||
// even if Propel is not yet initialized, the map builder class can be registered
|
||||
// now and then it will be loaded when Propel initializes.
|
||||
require_once 'classes/model/map/CaseConsolidatedMapBuilder.php';
|
||||
Propel::registerMapBuilder('classes.model.map.CaseConsolidatedMapBuilder');
|
||||
require_once 'classes/model/map/CaseConsolidatedCoreMapBuilder.php';
|
||||
Propel::registerMapBuilder('classes.model.map.CaseConsolidatedCoreMapBuilder');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user