From 76bfce21b12d353028ebfde59429347972386716 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 8 Apr 2013 14:42:37 -0400 Subject: [PATCH] CC-4961: Show linking -modified db --- .../configs/classmap-airtime-conf.php | 21 +- .../models/airtime/map/CcBlockTableMap.php | 2 +- .../models/airtime/map/CcFilesTableMap.php | 2 +- .../models/airtime/map/CcPlaylistTableMap.php | 2 +- .../airtime/map/CcShowInstancesTableMap.php | 2 +- .../models/airtime/map/CcShowTableMap.php | 2 +- .../airtime/map/CcWebstreamTableMap.php | 2 +- .../models/airtime/om/BaseCcBlock.php | 159 ++++++-------- .../models/airtime/om/BaseCcBlockPeer.php | 4 +- .../models/airtime/om/BaseCcBlockQuery.php | 32 +-- .../models/airtime/om/BaseCcFiles.php | 159 ++++++-------- .../models/airtime/om/BaseCcFilesPeer.php | 4 +- .../models/airtime/om/BaseCcFilesQuery.php | 32 +-- .../models/airtime/om/BaseCcPlaylist.php | 159 ++++++-------- .../models/airtime/om/BaseCcPlaylistPeer.php | 4 +- .../models/airtime/om/BaseCcPlaylistQuery.php | 32 +-- .../models/airtime/om/BaseCcShow.php | 202 +++++------------- .../models/airtime/om/BaseCcShowInstances.php | 202 +++++------------- .../airtime/om/BaseCcShowInstancesPeer.php | 4 +- .../airtime/om/BaseCcShowInstancesQuery.php | 32 +-- .../models/airtime/om/BaseCcShowPeer.php | 4 +- .../models/airtime/om/BaseCcShowQuery.php | 32 +-- .../models/airtime/om/BaseCcWebstream.php | 159 ++++++-------- .../models/airtime/om/BaseCcWebstreamPeer.php | 4 +- .../airtime/om/BaseCcWebstreamQuery.php | 32 +-- airtime_mvc/build/schema.xml | 33 +-- airtime_mvc/build/sql/schema.sql | 44 ++-- 27 files changed, 550 insertions(+), 816 deletions(-) diff --git a/airtime_mvc/application/configs/classmap-airtime-conf.php b/airtime_mvc/application/configs/classmap-airtime-conf.php index 9eacbf563..7f5e03d42 100644 --- a/airtime_mvc/application/configs/classmap-airtime-conf.php +++ b/airtime_mvc/application/configs/classmap-airtime-conf.php @@ -204,11 +204,18 @@ return array ( 'BaseCcLocalePeer' => 'airtime/om/BaseCcLocalePeer.php', 'BaseCcLocale' => 'airtime/om/BaseCcLocale.php', 'BaseCcLocaleQuery' => 'airtime/om/BaseCcLocaleQuery.php', - 'CcShowStampTableMap' => 'airtime/map/CcShowStampTableMap.php', - 'CcShowStampPeer' => 'airtime/CcShowStampPeer.php', - 'CcShowStamp' => 'airtime/CcShowStamp.php', - 'CcShowStampQuery' => 'airtime/CcShowStampQuery.php', - 'BaseCcShowStampPeer' => 'airtime/om/BaseCcShowStampPeer.php', - 'BaseCcShowStamp' => 'airtime/om/BaseCcShowStamp.php', - 'BaseCcShowStampQuery' => 'airtime/om/BaseCcShowStampQuery.php', + 'CcStampContentsTableMap' => 'airtime/map/CcStampContentsTableMap.php', + 'CcStampContentsPeer' => 'airtime/CcStampContentsPeer.php', + 'CcStampContents' => 'airtime/CcStampContents.php', + 'CcStampContentsQuery' => 'airtime/CcStampContentsQuery.php', + 'BaseCcStampContentsPeer' => 'airtime/om/BaseCcStampContentsPeer.php', + 'BaseCcStampContents' => 'airtime/om/BaseCcStampContents.php', + 'BaseCcStampContentsQuery' => 'airtime/om/BaseCcStampContentsQuery.php', + 'CcStampTableMap' => 'airtime/map/CcStampTableMap.php', + 'CcStampPeer' => 'airtime/CcStampPeer.php', + 'CcStamp' => 'airtime/CcStamp.php', + 'CcStampQuery' => 'airtime/CcStampQuery.php', + 'BaseCcStampPeer' => 'airtime/om/BaseCcStampPeer.php', + 'BaseCcStamp' => 'airtime/om/BaseCcStamp.php', + 'BaseCcStampQuery' => 'airtime/om/BaseCcStampQuery.php', ); \ No newline at end of file diff --git a/airtime_mvc/application/models/airtime/map/CcBlockTableMap.php b/airtime_mvc/application/models/airtime/map/CcBlockTableMap.php index b5d31f72e..558bb9a6e 100644 --- a/airtime_mvc/application/models/airtime/map/CcBlockTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcBlockTableMap.php @@ -58,7 +58,7 @@ class CcBlockTableMap extends TableMap { $this->addRelation('CcPlaylistcontents', 'CcPlaylistcontents', RelationMap::ONE_TO_MANY, array('id' => 'block_id', ), 'CASCADE', null); $this->addRelation('CcBlockcontents', 'CcBlockcontents', RelationMap::ONE_TO_MANY, array('id' => 'block_id', ), 'CASCADE', null); $this->addRelation('CcBlockcriteria', 'CcBlockcriteria', RelationMap::ONE_TO_MANY, array('id' => 'block_id', ), 'CASCADE', null); - $this->addRelation('CcShowStamp', 'CcShowStamp', RelationMap::ONE_TO_MANY, array('id' => 'block_id', ), 'CASCADE', null); + $this->addRelation('CcStampContents', 'CcStampContents', RelationMap::ONE_TO_MANY, array('id' => 'block_id', ), 'CASCADE', null); } // buildRelations() /** diff --git a/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php b/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php index 7f0a33679..295372810 100644 --- a/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcFilesTableMap.php @@ -123,7 +123,7 @@ class CcFilesTableMap extends TableMap { $this->addRelation('CcPlaylistcontents', 'CcPlaylistcontents', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null); $this->addRelation('CcBlockcontents', 'CcBlockcontents', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null); $this->addRelation('CcSchedule', 'CcSchedule', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null); - $this->addRelation('CcShowStamp', 'CcShowStamp', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null); + $this->addRelation('CcStampContents', 'CcStampContents', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null); } // buildRelations() } // CcFilesTableMap diff --git a/airtime_mvc/application/models/airtime/map/CcPlaylistTableMap.php b/airtime_mvc/application/models/airtime/map/CcPlaylistTableMap.php index 3ba124cb6..ddaa78192 100644 --- a/airtime_mvc/application/models/airtime/map/CcPlaylistTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcPlaylistTableMap.php @@ -55,7 +55,7 @@ class CcPlaylistTableMap extends TableMap { { $this->addRelation('CcSubjs', 'CcSubjs', RelationMap::MANY_TO_ONE, array('creator_id' => 'id', ), 'CASCADE', null); $this->addRelation('CcPlaylistcontents', 'CcPlaylistcontents', RelationMap::ONE_TO_MANY, array('id' => 'playlist_id', ), 'CASCADE', null); - $this->addRelation('CcShowStamp', 'CcShowStamp', RelationMap::ONE_TO_MANY, array('id' => 'playlist_id', ), 'CASCADE', null); + $this->addRelation('CcStampContents', 'CcStampContents', RelationMap::ONE_TO_MANY, array('id' => 'playlist_id', ), 'CASCADE', null); } // buildRelations() /** diff --git a/airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php b/airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php index f556b1853..2ecb4f1db 100644 --- a/airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php @@ -63,7 +63,7 @@ class CcShowInstancesTableMap extends TableMap { $this->addRelation('CcFiles', 'CcFiles', RelationMap::MANY_TO_ONE, array('file_id' => 'id', ), 'CASCADE', null); $this->addRelation('CcShowInstancesRelatedByDbId', 'CcShowInstances', RelationMap::ONE_TO_MANY, array('id' => 'instance_id', ), 'CASCADE', null); $this->addRelation('CcSchedule', 'CcSchedule', RelationMap::ONE_TO_MANY, array('id' => 'instance_id', ), 'CASCADE', null); - $this->addRelation('CcShowStamp', 'CcShowStamp', RelationMap::ONE_TO_MANY, array('id' => 'instance_id', ), 'CASCADE', null); + $this->addRelation('CcStamp', 'CcStamp', RelationMap::ONE_TO_MANY, array('id' => 'instance_id', ), 'CASCADE', null); } // buildRelations() } // CcShowInstancesTableMap diff --git a/airtime_mvc/application/models/airtime/map/CcShowTableMap.php b/airtime_mvc/application/models/airtime/map/CcShowTableMap.php index 6acde02cd..ba62c1647 100644 --- a/airtime_mvc/application/models/airtime/map/CcShowTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcShowTableMap.php @@ -62,7 +62,7 @@ class CcShowTableMap extends TableMap { $this->addRelation('CcShowDays', 'CcShowDays', RelationMap::ONE_TO_MANY, array('id' => 'show_id', ), 'CASCADE', null); $this->addRelation('CcShowRebroadcast', 'CcShowRebroadcast', RelationMap::ONE_TO_MANY, array('id' => 'show_id', ), 'CASCADE', null); $this->addRelation('CcShowHosts', 'CcShowHosts', RelationMap::ONE_TO_MANY, array('id' => 'show_id', ), 'CASCADE', null); - $this->addRelation('CcShowStamp', 'CcShowStamp', RelationMap::ONE_TO_MANY, array('id' => 'show_id', ), 'CASCADE', null); + $this->addRelation('CcStamp', 'CcStamp', RelationMap::ONE_TO_MANY, array('id' => 'show_id', ), 'CASCADE', null); } // buildRelations() } // CcShowTableMap diff --git a/airtime_mvc/application/models/airtime/map/CcWebstreamTableMap.php b/airtime_mvc/application/models/airtime/map/CcWebstreamTableMap.php index 979c7034e..5370e7952 100644 --- a/airtime_mvc/application/models/airtime/map/CcWebstreamTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcWebstreamTableMap.php @@ -57,7 +57,7 @@ class CcWebstreamTableMap extends TableMap { public function buildRelations() { $this->addRelation('CcSchedule', 'CcSchedule', RelationMap::ONE_TO_MANY, array('id' => 'stream_id', ), 'CASCADE', null); - $this->addRelation('CcShowStamp', 'CcShowStamp', RelationMap::ONE_TO_MANY, array('id' => 'stream_id', ), 'CASCADE', null); + $this->addRelation('CcStampContents', 'CcStampContents', RelationMap::ONE_TO_MANY, array('id' => 'stream_id', ), 'CASCADE', null); } // buildRelations() } // CcWebstreamTableMap diff --git a/airtime_mvc/application/models/airtime/om/BaseCcBlock.php b/airtime_mvc/application/models/airtime/om/BaseCcBlock.php index 4314af05f..89a9cfbf1 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcBlock.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcBlock.php @@ -96,9 +96,9 @@ abstract class BaseCcBlock extends BaseObject implements Persistent protected $collCcBlockcriterias; /** - * @var array CcShowStamp[] Collection to store aggregation of CcShowStamp objects. + * @var array CcStampContents[] Collection to store aggregation of CcStampContents objects. */ - protected $collCcShowStamps; + protected $collCcStampContentss; /** * Flag to prevent endless save loop, if this object is referenced @@ -617,7 +617,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent $this->collCcBlockcriterias = null; - $this->collCcShowStamps = null; + $this->collCcStampContentss = null; } // if (deep) } @@ -788,8 +788,8 @@ abstract class BaseCcBlock extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStampContentss !== null) { + foreach ($this->collCcStampContentss as $referrerFK) { if (!$referrerFK->isDeleted()) { $affectedRows += $referrerFK->save($con); } @@ -903,8 +903,8 @@ abstract class BaseCcBlock extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStampContentss !== null) { + foreach ($this->collCcStampContentss as $referrerFK) { if (!$referrerFK->validate($columns)) { $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); } @@ -1203,9 +1203,9 @@ abstract class BaseCcBlock extends BaseObject implements Persistent } } - foreach ($this->getCcShowStamps() as $relObj) { + foreach ($this->getCcStampContentss() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addCcShowStamp($relObj->copy($deepCopy)); + $copyObj->addCcStampContents($relObj->copy($deepCopy)); } } @@ -1706,36 +1706,36 @@ abstract class BaseCcBlock extends BaseObject implements Persistent } /** - * Clears out the collCcShowStamps collection + * Clears out the collCcStampContentss collection * * This does not modify the database; however, it will remove any associated objects, causing * them to be refetched by subsequent calls to accessor method. * * @return void - * @see addCcShowStamps() + * @see addCcStampContentss() */ - public function clearCcShowStamps() + public function clearCcStampContentss() { - $this->collCcShowStamps = null; // important to set this to NULL since that means it is uninitialized + $this->collCcStampContentss = null; // important to set this to NULL since that means it is uninitialized } /** - * Initializes the collCcShowStamps collection. + * Initializes the collCcStampContentss collection. * - * By default this just sets the collCcShowStamps collection to an empty array (like clearcollCcShowStamps()); + * By default this just sets the collCcStampContentss collection to an empty array (like clearcollCcStampContentss()); * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * * @return void */ - public function initCcShowStamps() + public function initCcStampContentss() { - $this->collCcShowStamps = new PropelObjectCollection(); - $this->collCcShowStamps->setModel('CcShowStamp'); + $this->collCcStampContentss = new PropelObjectCollection(); + $this->collCcStampContentss->setModel('CcStampContents'); } /** - * Gets an array of CcShowStamp objects which contain a foreign key that references this object. + * Gets an array of CcStampContents objects which contain a foreign key that references this object. * * If the $criteria is not null, it is used to always fetch the results from the database. * Otherwise the results are fetched from the database the first time, then cached. @@ -1745,44 +1745,44 @@ abstract class BaseCcBlock extends BaseObject implements Persistent * * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects * @throws PropelException */ - public function getCcShowStamps($criteria = null, PropelPDO $con = null) + public function getCcStampContentss($criteria = null, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStampContentss || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStampContentss) { // return empty collection - $this->initCcShowStamps(); + $this->initCcStampContentss(); } else { - $collCcShowStamps = CcShowStampQuery::create(null, $criteria) + $collCcStampContentss = CcStampContentsQuery::create(null, $criteria) ->filterByCcBlock($this) ->find($con); if (null !== $criteria) { - return $collCcShowStamps; + return $collCcStampContentss; } - $this->collCcShowStamps = $collCcShowStamps; + $this->collCcStampContentss = $collCcStampContentss; } } - return $this->collCcShowStamps; + return $this->collCcStampContentss; } /** - * Returns the number of related CcShowStamp objects. + * Returns the number of related CcStampContents objects. * * @param Criteria $criteria * @param boolean $distinct * @param PropelPDO $con - * @return int Count of related CcShowStamp objects. + * @return int Count of related CcStampContents objects. * @throws PropelException */ - public function countCcShowStamps(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) + public function countCcStampContentss(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStampContentss || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStampContentss) { return 0; } else { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); if($distinct) { $query->distinct(); } @@ -1791,25 +1791,25 @@ abstract class BaseCcBlock extends BaseObject implements Persistent ->count($con); } } else { - return count($this->collCcShowStamps); + return count($this->collCcStampContentss); } } /** - * Method called to associate a CcShowStamp object to this object - * through the CcShowStamp foreign key attribute. + * Method called to associate a CcStampContents object to this object + * through the CcStampContents foreign key attribute. * - * @param CcShowStamp $l CcShowStamp + * @param CcStampContents $l CcStampContents * @return void * @throws PropelException */ - public function addCcShowStamp(CcShowStamp $l) + public function addCcStampContents(CcStampContents $l) { - if ($this->collCcShowStamps === null) { - $this->initCcShowStamps(); + if ($this->collCcStampContentss === null) { + $this->initCcStampContentss(); } - if (!$this->collCcShowStamps->contains($l)) { // only add it if the **same** object is not already associated - $this->collCcShowStamps[]= $l; + if (!$this->collCcStampContentss->contains($l)) { // only add it if the **same** object is not already associated + $this->collCcStampContentss[]= $l; $l->setCcBlock($this); } } @@ -1820,7 +1820,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcBlock is new, it will return * an empty collection; or if this CcBlock has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1829,14 +1829,14 @@ abstract class BaseCcBlock extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcShow($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcStamp($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcShow', $join_behavior); + $query = CcStampContentsQuery::create(null, $criteria); + $query->joinWith('CcStamp', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -1845,7 +1845,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcBlock is new, it will return * an empty collection; or if this CcBlock has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1854,39 +1854,14 @@ abstract class BaseCcBlock extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcShowInstances($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcFiles($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcShowInstances', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcBlock is new, it will return - * an empty collection; or if this CcBlock has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcBlock. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcFiles($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcFiles', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -1895,7 +1870,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcBlock is new, it will return * an empty collection; or if this CcBlock has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1904,14 +1879,14 @@ abstract class BaseCcBlock extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcWebstream($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcWebstream($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcWebstream', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -1920,7 +1895,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcBlock is new, it will return * an empty collection; or if this CcBlock has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1929,14 +1904,14 @@ abstract class BaseCcBlock extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcPlaylist($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcPlaylist($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcPlaylist', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } /** @@ -1988,8 +1963,8 @@ abstract class BaseCcBlock extends BaseObject implements Persistent $o->clearAllReferences($deep); } } - if ($this->collCcShowStamps) { - foreach ((array) $this->collCcShowStamps as $o) { + if ($this->collCcStampContentss) { + foreach ((array) $this->collCcStampContentss as $o) { $o->clearAllReferences($deep); } } @@ -1998,7 +1973,7 @@ abstract class BaseCcBlock extends BaseObject implements Persistent $this->collCcPlaylistcontentss = null; $this->collCcBlockcontentss = null; $this->collCcBlockcriterias = null; - $this->collCcShowStamps = null; + $this->collCcStampContentss = null; $this->aCcSubjs = null; } diff --git a/airtime_mvc/application/models/airtime/om/BaseCcBlockPeer.php b/airtime_mvc/application/models/airtime/om/BaseCcBlockPeer.php index a5063dd8b..965069d3b 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcBlockPeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcBlockPeer.php @@ -382,9 +382,9 @@ abstract class BaseCcBlockPeer { // Invalidate objects in CcBlockcriteriaPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcBlockcriteriaPeer::clearInstancePool(); - // Invalidate objects in CcShowStampPeer instance pool, + // Invalidate objects in CcStampContentsPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - CcShowStampPeer::clearInstancePool(); + CcStampContentsPeer::clearInstancePool(); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcBlockQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcBlockQuery.php index ac160a1d2..eeecf413f 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcBlockQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcBlockQuery.php @@ -44,9 +44,9 @@ * @method CcBlockQuery rightJoinCcBlockcriteria($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcBlockcriteria relation * @method CcBlockQuery innerJoinCcBlockcriteria($relationAlias = '') Adds a INNER JOIN clause to the query using the CcBlockcriteria relation * - * @method CcBlockQuery leftJoinCcShowStamp($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcShowStamp relation - * @method CcBlockQuery rightJoinCcShowStamp($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcShowStamp relation - * @method CcBlockQuery innerJoinCcShowStamp($relationAlias = '') Adds a INNER JOIN clause to the query using the CcShowStamp relation + * @method CcBlockQuery leftJoinCcStampContents($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcStampContents relation + * @method CcBlockQuery rightJoinCcStampContents($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcStampContents relation + * @method CcBlockQuery innerJoinCcStampContents($relationAlias = '') Adds a INNER JOIN clause to the query using the CcStampContents relation * * @method CcBlock findOne(PropelPDO $con = null) Return the first CcBlock matching the query * @method CcBlock findOneOrCreate(PropelPDO $con = null) Return the first CcBlock matching the query, or a new CcBlock object populated from the query conditions when no match is found @@ -632,31 +632,31 @@ abstract class BaseCcBlockQuery extends ModelCriteria } /** - * Filter the query by a related CcShowStamp object + * Filter the query by a related CcStampContents object * - * @param CcShowStamp $ccShowStamp the related object to use as filter + * @param CcStampContents $ccStampContents the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcBlockQuery The current query, for fluid interface */ - public function filterByCcShowStamp($ccShowStamp, $comparison = null) + public function filterByCcStampContents($ccStampContents, $comparison = null) { return $this - ->addUsingAlias(CcBlockPeer::ID, $ccShowStamp->getDbBlockId(), $comparison); + ->addUsingAlias(CcBlockPeer::ID, $ccStampContents->getDbBlockId(), $comparison); } /** - * Adds a JOIN clause to the query using the CcShowStamp relation + * Adds a JOIN clause to the query using the CcStampContents relation * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return CcBlockQuery The current query, for fluid interface */ - public function joinCcShowStamp($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function joinCcStampContents($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('CcShowStamp'); + $relationMap = $tableMap->getRelation('CcStampContents'); // create a ModelJoin object for this join $join = new ModelJoin(); @@ -671,14 +671,14 @@ abstract class BaseCcBlockQuery extends ModelCriteria $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); $this->addJoinObject($join, $relationAlias); } else { - $this->addJoinObject($join, 'CcShowStamp'); + $this->addJoinObject($join, 'CcStampContents'); } return $this; } /** - * Use the CcShowStamp relation CcShowStamp object + * Use the CcStampContents relation CcStampContents object * * @see useQuery() * @@ -686,13 +686,13 @@ abstract class BaseCcBlockQuery extends ModelCriteria * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return CcShowStampQuery A secondary query class using the current class as primary query + * @return CcStampContentsQuery A secondary query class using the current class as primary query */ - public function useCcShowStampQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function useCcStampContentsQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { return $this - ->joinCcShowStamp($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'CcShowStamp', 'CcShowStampQuery'); + ->joinCcStampContents($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CcStampContents', 'CcStampContentsQuery'); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFiles.php b/airtime_mvc/application/models/airtime/om/BaseCcFiles.php index 6d995eaac..a8bed0eaa 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcFiles.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcFiles.php @@ -494,9 +494,9 @@ abstract class BaseCcFiles extends BaseObject implements Persistent protected $collCcSchedules; /** - * @var array CcShowStamp[] Collection to store aggregation of CcShowStamp objects. + * @var array CcStampContents[] Collection to store aggregation of CcStampContents objects. */ - protected $collCcShowStamps; + protected $collCcStampContentss; /** * Flag to prevent endless save loop, if this object is referenced @@ -3114,7 +3114,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->collCcSchedules = null; - $this->collCcShowStamps = null; + $this->collCcStampContentss = null; } // if (deep) } @@ -3307,8 +3307,8 @@ abstract class BaseCcFiles extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStampContentss !== null) { + foreach ($this->collCcStampContentss as $referrerFK) { if (!$referrerFK->isDeleted()) { $affectedRows += $referrerFK->save($con); } @@ -3442,8 +3442,8 @@ abstract class BaseCcFiles extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStampContentss !== null) { + foreach ($this->collCcStampContentss as $referrerFK) { if (!$referrerFK->validate($columns)) { $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); } @@ -4374,9 +4374,9 @@ abstract class BaseCcFiles extends BaseObject implements Persistent } } - foreach ($this->getCcShowStamps() as $relObj) { + foreach ($this->getCcStampContentss() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addCcShowStamp($relObj->copy($deepCopy)); + $copyObj->addCcStampContents($relObj->copy($deepCopy)); } } @@ -5184,36 +5184,36 @@ abstract class BaseCcFiles extends BaseObject implements Persistent } /** - * Clears out the collCcShowStamps collection + * Clears out the collCcStampContentss collection * * This does not modify the database; however, it will remove any associated objects, causing * them to be refetched by subsequent calls to accessor method. * * @return void - * @see addCcShowStamps() + * @see addCcStampContentss() */ - public function clearCcShowStamps() + public function clearCcStampContentss() { - $this->collCcShowStamps = null; // important to set this to NULL since that means it is uninitialized + $this->collCcStampContentss = null; // important to set this to NULL since that means it is uninitialized } /** - * Initializes the collCcShowStamps collection. + * Initializes the collCcStampContentss collection. * - * By default this just sets the collCcShowStamps collection to an empty array (like clearcollCcShowStamps()); + * By default this just sets the collCcStampContentss collection to an empty array (like clearcollCcStampContentss()); * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * * @return void */ - public function initCcShowStamps() + public function initCcStampContentss() { - $this->collCcShowStamps = new PropelObjectCollection(); - $this->collCcShowStamps->setModel('CcShowStamp'); + $this->collCcStampContentss = new PropelObjectCollection(); + $this->collCcStampContentss->setModel('CcStampContents'); } /** - * Gets an array of CcShowStamp objects which contain a foreign key that references this object. + * Gets an array of CcStampContents objects which contain a foreign key that references this object. * * If the $criteria is not null, it is used to always fetch the results from the database. * Otherwise the results are fetched from the database the first time, then cached. @@ -5223,44 +5223,44 @@ abstract class BaseCcFiles extends BaseObject implements Persistent * * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects * @throws PropelException */ - public function getCcShowStamps($criteria = null, PropelPDO $con = null) + public function getCcStampContentss($criteria = null, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStampContentss || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStampContentss) { // return empty collection - $this->initCcShowStamps(); + $this->initCcStampContentss(); } else { - $collCcShowStamps = CcShowStampQuery::create(null, $criteria) + $collCcStampContentss = CcStampContentsQuery::create(null, $criteria) ->filterByCcFiles($this) ->find($con); if (null !== $criteria) { - return $collCcShowStamps; + return $collCcStampContentss; } - $this->collCcShowStamps = $collCcShowStamps; + $this->collCcStampContentss = $collCcStampContentss; } } - return $this->collCcShowStamps; + return $this->collCcStampContentss; } /** - * Returns the number of related CcShowStamp objects. + * Returns the number of related CcStampContents objects. * * @param Criteria $criteria * @param boolean $distinct * @param PropelPDO $con - * @return int Count of related CcShowStamp objects. + * @return int Count of related CcStampContents objects. * @throws PropelException */ - public function countCcShowStamps(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) + public function countCcStampContentss(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStampContentss || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStampContentss) { return 0; } else { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); if($distinct) { $query->distinct(); } @@ -5269,25 +5269,25 @@ abstract class BaseCcFiles extends BaseObject implements Persistent ->count($con); } } else { - return count($this->collCcShowStamps); + return count($this->collCcStampContentss); } } /** - * Method called to associate a CcShowStamp object to this object - * through the CcShowStamp foreign key attribute. + * Method called to associate a CcStampContents object to this object + * through the CcStampContents foreign key attribute. * - * @param CcShowStamp $l CcShowStamp + * @param CcStampContents $l CcStampContents * @return void * @throws PropelException */ - public function addCcShowStamp(CcShowStamp $l) + public function addCcStampContents(CcStampContents $l) { - if ($this->collCcShowStamps === null) { - $this->initCcShowStamps(); + if ($this->collCcStampContentss === null) { + $this->initCcStampContentss(); } - if (!$this->collCcShowStamps->contains($l)) { // only add it if the **same** object is not already associated - $this->collCcShowStamps[]= $l; + if (!$this->collCcStampContentss->contains($l)) { // only add it if the **same** object is not already associated + $this->collCcStampContentss[]= $l; $l->setCcFiles($this); } } @@ -5298,7 +5298,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcFiles is new, it will return * an empty collection; or if this CcFiles has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -5307,14 +5307,14 @@ abstract class BaseCcFiles extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcShow($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcStamp($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcShow', $join_behavior); + $query = CcStampContentsQuery::create(null, $criteria); + $query->joinWith('CcStamp', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -5323,7 +5323,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcFiles is new, it will return * an empty collection; or if this CcFiles has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -5332,39 +5332,14 @@ abstract class BaseCcFiles extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcShowInstances($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcWebstream($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcShowInstances', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcFiles is new, it will return - * an empty collection; or if this CcFiles has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcFiles. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcWebstream($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcWebstream', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -5373,7 +5348,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcFiles is new, it will return * an empty collection; or if this CcFiles has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -5382,14 +5357,14 @@ abstract class BaseCcFiles extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcBlock($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcBlock($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcBlock', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -5398,7 +5373,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcFiles is new, it will return * an empty collection; or if this CcFiles has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -5407,14 +5382,14 @@ abstract class BaseCcFiles extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcPlaylist($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcPlaylist($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcPlaylist', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } /** @@ -5533,8 +5508,8 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $o->clearAllReferences($deep); } } - if ($this->collCcShowStamps) { - foreach ((array) $this->collCcShowStamps as $o) { + if ($this->collCcStampContentss) { + foreach ((array) $this->collCcStampContentss as $o) { $o->clearAllReferences($deep); } } @@ -5544,7 +5519,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->collCcPlaylistcontentss = null; $this->collCcBlockcontentss = null; $this->collCcSchedules = null; - $this->collCcShowStamps = null; + $this->collCcStampContentss = null; $this->aFkOwner = null; $this->aCcSubjsRelatedByDbEditedby = null; $this->aCcMusicDirs = null; diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php b/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php index 331dc1bfd..0f5ecc02f 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php @@ -695,9 +695,9 @@ abstract class BaseCcFilesPeer { // Invalidate objects in CcSchedulePeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcSchedulePeer::clearInstancePool(); - // Invalidate objects in CcShowStampPeer instance pool, + // Invalidate objects in CcStampContentsPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - CcShowStampPeer::clearInstancePool(); + CcStampContentsPeer::clearInstancePool(); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php index ae5c46c28..5a9113904 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php @@ -180,9 +180,9 @@ * @method CcFilesQuery rightJoinCcSchedule($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcSchedule relation * @method CcFilesQuery innerJoinCcSchedule($relationAlias = '') Adds a INNER JOIN clause to the query using the CcSchedule relation * - * @method CcFilesQuery leftJoinCcShowStamp($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcShowStamp relation - * @method CcFilesQuery rightJoinCcShowStamp($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcShowStamp relation - * @method CcFilesQuery innerJoinCcShowStamp($relationAlias = '') Adds a INNER JOIN clause to the query using the CcShowStamp relation + * @method CcFilesQuery leftJoinCcStampContents($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcStampContents relation + * @method CcFilesQuery rightJoinCcStampContents($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcStampContents relation + * @method CcFilesQuery innerJoinCcStampContents($relationAlias = '') Adds a INNER JOIN clause to the query using the CcStampContents relation * * @method CcFiles findOne(PropelPDO $con = null) Return the first CcFiles matching the query * @method CcFiles findOneOrCreate(PropelPDO $con = null) Return the first CcFiles matching the query, or a new CcFiles object populated from the query conditions when no match is found @@ -2540,31 +2540,31 @@ abstract class BaseCcFilesQuery extends ModelCriteria } /** - * Filter the query by a related CcShowStamp object + * Filter the query by a related CcStampContents object * - * @param CcShowStamp $ccShowStamp the related object to use as filter + * @param CcStampContents $ccStampContents the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcFilesQuery The current query, for fluid interface */ - public function filterByCcShowStamp($ccShowStamp, $comparison = null) + public function filterByCcStampContents($ccStampContents, $comparison = null) { return $this - ->addUsingAlias(CcFilesPeer::ID, $ccShowStamp->getDbFileId(), $comparison); + ->addUsingAlias(CcFilesPeer::ID, $ccStampContents->getDbFileId(), $comparison); } /** - * Adds a JOIN clause to the query using the CcShowStamp relation + * Adds a JOIN clause to the query using the CcStampContents relation * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return CcFilesQuery The current query, for fluid interface */ - public function joinCcShowStamp($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function joinCcStampContents($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('CcShowStamp'); + $relationMap = $tableMap->getRelation('CcStampContents'); // create a ModelJoin object for this join $join = new ModelJoin(); @@ -2579,14 +2579,14 @@ abstract class BaseCcFilesQuery extends ModelCriteria $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); $this->addJoinObject($join, $relationAlias); } else { - $this->addJoinObject($join, 'CcShowStamp'); + $this->addJoinObject($join, 'CcStampContents'); } return $this; } /** - * Use the CcShowStamp relation CcShowStamp object + * Use the CcStampContents relation CcStampContents object * * @see useQuery() * @@ -2594,13 +2594,13 @@ abstract class BaseCcFilesQuery extends ModelCriteria * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return CcShowStampQuery A secondary query class using the current class as primary query + * @return CcStampContentsQuery A secondary query class using the current class as primary query */ - public function useCcShowStampQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function useCcStampContentsQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { return $this - ->joinCcShowStamp($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'CcShowStamp', 'CcShowStampQuery'); + ->joinCcStampContents($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CcStampContents', 'CcStampContentsQuery'); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcPlaylist.php b/airtime_mvc/application/models/airtime/om/BaseCcPlaylist.php index fb822e999..e41337be9 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcPlaylist.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcPlaylist.php @@ -79,9 +79,9 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent protected $collCcPlaylistcontentss; /** - * @var array CcShowStamp[] Collection to store aggregation of CcShowStamp objects. + * @var array CcStampContents[] Collection to store aggregation of CcStampContents objects. */ - protected $collCcShowStamps; + protected $collCcStampContentss; /** * Flag to prevent endless save loop, if this object is referenced @@ -560,7 +560,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent $this->aCcSubjs = null; $this->collCcPlaylistcontentss = null; - $this->collCcShowStamps = null; + $this->collCcStampContentss = null; } // if (deep) } @@ -715,8 +715,8 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStampContentss !== null) { + foreach ($this->collCcStampContentss as $referrerFK) { if (!$referrerFK->isDeleted()) { $affectedRows += $referrerFK->save($con); } @@ -814,8 +814,8 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStampContentss !== null) { + foreach ($this->collCcStampContentss as $referrerFK) { if (!$referrerFK->validate($columns)) { $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); } @@ -1092,9 +1092,9 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } } - foreach ($this->getCcShowStamps() as $relObj) { + foreach ($this->getCcStampContentss() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addCcShowStamp($relObj->copy($deepCopy)); + $copyObj->addCcStampContents($relObj->copy($deepCopy)); } } @@ -1352,36 +1352,36 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent } /** - * Clears out the collCcShowStamps collection + * Clears out the collCcStampContentss collection * * This does not modify the database; however, it will remove any associated objects, causing * them to be refetched by subsequent calls to accessor method. * * @return void - * @see addCcShowStamps() + * @see addCcStampContentss() */ - public function clearCcShowStamps() + public function clearCcStampContentss() { - $this->collCcShowStamps = null; // important to set this to NULL since that means it is uninitialized + $this->collCcStampContentss = null; // important to set this to NULL since that means it is uninitialized } /** - * Initializes the collCcShowStamps collection. + * Initializes the collCcStampContentss collection. * - * By default this just sets the collCcShowStamps collection to an empty array (like clearcollCcShowStamps()); + * By default this just sets the collCcStampContentss collection to an empty array (like clearcollCcStampContentss()); * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * * @return void */ - public function initCcShowStamps() + public function initCcStampContentss() { - $this->collCcShowStamps = new PropelObjectCollection(); - $this->collCcShowStamps->setModel('CcShowStamp'); + $this->collCcStampContentss = new PropelObjectCollection(); + $this->collCcStampContentss->setModel('CcStampContents'); } /** - * Gets an array of CcShowStamp objects which contain a foreign key that references this object. + * Gets an array of CcStampContents objects which contain a foreign key that references this object. * * If the $criteria is not null, it is used to always fetch the results from the database. * Otherwise the results are fetched from the database the first time, then cached. @@ -1391,44 +1391,44 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects * @throws PropelException */ - public function getCcShowStamps($criteria = null, PropelPDO $con = null) + public function getCcStampContentss($criteria = null, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStampContentss || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStampContentss) { // return empty collection - $this->initCcShowStamps(); + $this->initCcStampContentss(); } else { - $collCcShowStamps = CcShowStampQuery::create(null, $criteria) + $collCcStampContentss = CcStampContentsQuery::create(null, $criteria) ->filterByCcPlaylist($this) ->find($con); if (null !== $criteria) { - return $collCcShowStamps; + return $collCcStampContentss; } - $this->collCcShowStamps = $collCcShowStamps; + $this->collCcStampContentss = $collCcStampContentss; } } - return $this->collCcShowStamps; + return $this->collCcStampContentss; } /** - * Returns the number of related CcShowStamp objects. + * Returns the number of related CcStampContents objects. * * @param Criteria $criteria * @param boolean $distinct * @param PropelPDO $con - * @return int Count of related CcShowStamp objects. + * @return int Count of related CcStampContents objects. * @throws PropelException */ - public function countCcShowStamps(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) + public function countCcStampContentss(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStampContentss || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStampContentss) { return 0; } else { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); if($distinct) { $query->distinct(); } @@ -1437,25 +1437,25 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent ->count($con); } } else { - return count($this->collCcShowStamps); + return count($this->collCcStampContentss); } } /** - * Method called to associate a CcShowStamp object to this object - * through the CcShowStamp foreign key attribute. + * Method called to associate a CcStampContents object to this object + * through the CcStampContents foreign key attribute. * - * @param CcShowStamp $l CcShowStamp + * @param CcStampContents $l CcStampContents * @return void * @throws PropelException */ - public function addCcShowStamp(CcShowStamp $l) + public function addCcStampContents(CcStampContents $l) { - if ($this->collCcShowStamps === null) { - $this->initCcShowStamps(); + if ($this->collCcStampContentss === null) { + $this->initCcStampContentss(); } - if (!$this->collCcShowStamps->contains($l)) { // only add it if the **same** object is not already associated - $this->collCcShowStamps[]= $l; + if (!$this->collCcStampContentss->contains($l)) { // only add it if the **same** object is not already associated + $this->collCcStampContentss[]= $l; $l->setCcPlaylist($this); } } @@ -1466,7 +1466,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcPlaylist is new, it will return * an empty collection; or if this CcPlaylist has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1475,14 +1475,14 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcShow($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcStamp($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcShow', $join_behavior); + $query = CcStampContentsQuery::create(null, $criteria); + $query->joinWith('CcStamp', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -1491,7 +1491,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcPlaylist is new, it will return * an empty collection; or if this CcPlaylist has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1500,39 +1500,14 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcShowInstances($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcFiles($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcShowInstances', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcPlaylist is new, it will return - * an empty collection; or if this CcPlaylist has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcPlaylist. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcFiles($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcFiles', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -1541,7 +1516,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcPlaylist is new, it will return * an empty collection; or if this CcPlaylist has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1550,14 +1525,14 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcWebstream($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcWebstream($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcWebstream', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -1566,7 +1541,7 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcPlaylist is new, it will return * an empty collection; or if this CcPlaylist has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1575,14 +1550,14 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcBlock($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcBlock($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcBlock', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } /** @@ -1623,15 +1598,15 @@ abstract class BaseCcPlaylist extends BaseObject implements Persistent $o->clearAllReferences($deep); } } - if ($this->collCcShowStamps) { - foreach ((array) $this->collCcShowStamps as $o) { + if ($this->collCcStampContentss) { + foreach ((array) $this->collCcStampContentss as $o) { $o->clearAllReferences($deep); } } } // if ($deep) $this->collCcPlaylistcontentss = null; - $this->collCcShowStamps = null; + $this->collCcStampContentss = null; $this->aCcSubjs = null; } diff --git a/airtime_mvc/application/models/airtime/om/BaseCcPlaylistPeer.php b/airtime_mvc/application/models/airtime/om/BaseCcPlaylistPeer.php index b8f2ce721..36c810648 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcPlaylistPeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcPlaylistPeer.php @@ -371,9 +371,9 @@ abstract class BaseCcPlaylistPeer { // Invalidate objects in CcPlaylistcontentsPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcPlaylistcontentsPeer::clearInstancePool(); - // Invalidate objects in CcShowStampPeer instance pool, + // Invalidate objects in CcStampContentsPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - CcShowStampPeer::clearInstancePool(); + CcStampContentsPeer::clearInstancePool(); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcPlaylistQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcPlaylistQuery.php index 6b365ed5a..3ca7d19a7 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcPlaylistQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcPlaylistQuery.php @@ -34,9 +34,9 @@ * @method CcPlaylistQuery rightJoinCcPlaylistcontents($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcPlaylistcontents relation * @method CcPlaylistQuery innerJoinCcPlaylistcontents($relationAlias = '') Adds a INNER JOIN clause to the query using the CcPlaylistcontents relation * - * @method CcPlaylistQuery leftJoinCcShowStamp($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcShowStamp relation - * @method CcPlaylistQuery rightJoinCcShowStamp($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcShowStamp relation - * @method CcPlaylistQuery innerJoinCcShowStamp($relationAlias = '') Adds a INNER JOIN clause to the query using the CcShowStamp relation + * @method CcPlaylistQuery leftJoinCcStampContents($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcStampContents relation + * @method CcPlaylistQuery rightJoinCcStampContents($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcStampContents relation + * @method CcPlaylistQuery innerJoinCcStampContents($relationAlias = '') Adds a INNER JOIN clause to the query using the CcStampContents relation * * @method CcPlaylist findOne(PropelPDO $con = null) Return the first CcPlaylist matching the query * @method CcPlaylist findOneOrCreate(PropelPDO $con = null) Return the first CcPlaylist matching the query, or a new CcPlaylist object populated from the query conditions when no match is found @@ -470,31 +470,31 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria } /** - * Filter the query by a related CcShowStamp object + * Filter the query by a related CcStampContents object * - * @param CcShowStamp $ccShowStamp the related object to use as filter + * @param CcStampContents $ccStampContents the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcPlaylistQuery The current query, for fluid interface */ - public function filterByCcShowStamp($ccShowStamp, $comparison = null) + public function filterByCcStampContents($ccStampContents, $comparison = null) { return $this - ->addUsingAlias(CcPlaylistPeer::ID, $ccShowStamp->getDbPlaylistId(), $comparison); + ->addUsingAlias(CcPlaylistPeer::ID, $ccStampContents->getDbPlaylistId(), $comparison); } /** - * Adds a JOIN clause to the query using the CcShowStamp relation + * Adds a JOIN clause to the query using the CcStampContents relation * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return CcPlaylistQuery The current query, for fluid interface */ - public function joinCcShowStamp($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function joinCcStampContents($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('CcShowStamp'); + $relationMap = $tableMap->getRelation('CcStampContents'); // create a ModelJoin object for this join $join = new ModelJoin(); @@ -509,14 +509,14 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); $this->addJoinObject($join, $relationAlias); } else { - $this->addJoinObject($join, 'CcShowStamp'); + $this->addJoinObject($join, 'CcStampContents'); } return $this; } /** - * Use the CcShowStamp relation CcShowStamp object + * Use the CcStampContents relation CcStampContents object * * @see useQuery() * @@ -524,13 +524,13 @@ abstract class BaseCcPlaylistQuery extends ModelCriteria * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return CcShowStampQuery A secondary query class using the current class as primary query + * @return CcStampContentsQuery A secondary query class using the current class as primary query */ - public function useCcShowStampQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function useCcStampContentsQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { return $this - ->joinCcShowStamp($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'CcShowStamp', 'CcShowStampQuery'); + ->joinCcStampContents($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CcStampContents', 'CcStampContentsQuery'); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcShow.php b/airtime_mvc/application/models/airtime/om/BaseCcShow.php index 662ce9cff..311b33969 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcShow.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcShow.php @@ -123,9 +123,9 @@ abstract class BaseCcShow extends BaseObject implements Persistent protected $collCcShowHostss; /** - * @var array CcShowStamp[] Collection to store aggregation of CcShowStamp objects. + * @var array CcStamp[] Collection to store aggregation of CcStamp objects. */ - protected $collCcShowStamps; + protected $collCcStamps; /** * Flag to prevent endless save loop, if this object is referenced @@ -673,7 +673,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent $this->collCcShowHostss = null; - $this->collCcShowStamps = null; + $this->collCcStamps = null; } // if (deep) } @@ -840,8 +840,8 @@ abstract class BaseCcShow extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStamps !== null) { + foreach ($this->collCcStamps as $referrerFK) { if (!$referrerFK->isDeleted()) { $affectedRows += $referrerFK->save($con); } @@ -951,8 +951,8 @@ abstract class BaseCcShow extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStamps !== null) { + foreach ($this->collCcStamps as $referrerFK) { if (!$referrerFK->validate($columns)) { $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); } @@ -1291,9 +1291,9 @@ abstract class BaseCcShow extends BaseObject implements Persistent } } - foreach ($this->getCcShowStamps() as $relObj) { + foreach ($this->getCcStamps() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addCcShowStamp($relObj->copy($deepCopy)); + $copyObj->addCcStamp($relObj->copy($deepCopy)); } } @@ -1854,36 +1854,36 @@ abstract class BaseCcShow extends BaseObject implements Persistent } /** - * Clears out the collCcShowStamps collection + * Clears out the collCcStamps collection * * This does not modify the database; however, it will remove any associated objects, causing * them to be refetched by subsequent calls to accessor method. * * @return void - * @see addCcShowStamps() + * @see addCcStamps() */ - public function clearCcShowStamps() + public function clearCcStamps() { - $this->collCcShowStamps = null; // important to set this to NULL since that means it is uninitialized + $this->collCcStamps = null; // important to set this to NULL since that means it is uninitialized } /** - * Initializes the collCcShowStamps collection. + * Initializes the collCcStamps collection. * - * By default this just sets the collCcShowStamps collection to an empty array (like clearcollCcShowStamps()); + * By default this just sets the collCcStamps collection to an empty array (like clearcollCcStamps()); * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * * @return void */ - public function initCcShowStamps() + public function initCcStamps() { - $this->collCcShowStamps = new PropelObjectCollection(); - $this->collCcShowStamps->setModel('CcShowStamp'); + $this->collCcStamps = new PropelObjectCollection(); + $this->collCcStamps->setModel('CcStamp'); } /** - * Gets an array of CcShowStamp objects which contain a foreign key that references this object. + * Gets an array of CcStamp objects which contain a foreign key that references this object. * * If the $criteria is not null, it is used to always fetch the results from the database. * Otherwise the results are fetched from the database the first time, then cached. @@ -1893,44 +1893,44 @@ abstract class BaseCcShow extends BaseObject implements Persistent * * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStamp[] List of CcStamp objects * @throws PropelException */ - public function getCcShowStamps($criteria = null, PropelPDO $con = null) + public function getCcStamps($criteria = null, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStamps || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStamps) { // return empty collection - $this->initCcShowStamps(); + $this->initCcStamps(); } else { - $collCcShowStamps = CcShowStampQuery::create(null, $criteria) + $collCcStamps = CcStampQuery::create(null, $criteria) ->filterByCcShow($this) ->find($con); if (null !== $criteria) { - return $collCcShowStamps; + return $collCcStamps; } - $this->collCcShowStamps = $collCcShowStamps; + $this->collCcStamps = $collCcStamps; } } - return $this->collCcShowStamps; + return $this->collCcStamps; } /** - * Returns the number of related CcShowStamp objects. + * Returns the number of related CcStamp objects. * * @param Criteria $criteria * @param boolean $distinct * @param PropelPDO $con - * @return int Count of related CcShowStamp objects. + * @return int Count of related CcStamp objects. * @throws PropelException */ - public function countCcShowStamps(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) + public function countCcStamps(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStamps || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStamps) { return 0; } else { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampQuery::create(null, $criteria); if($distinct) { $query->distinct(); } @@ -1939,25 +1939,25 @@ abstract class BaseCcShow extends BaseObject implements Persistent ->count($con); } } else { - return count($this->collCcShowStamps); + return count($this->collCcStamps); } } /** - * Method called to associate a CcShowStamp object to this object - * through the CcShowStamp foreign key attribute. + * Method called to associate a CcStamp object to this object + * through the CcStamp foreign key attribute. * - * @param CcShowStamp $l CcShowStamp + * @param CcStamp $l CcStamp * @return void * @throws PropelException */ - public function addCcShowStamp(CcShowStamp $l) + public function addCcStamp(CcStamp $l) { - if ($this->collCcShowStamps === null) { - $this->initCcShowStamps(); + if ($this->collCcStamps === null) { + $this->initCcStamps(); } - if (!$this->collCcShowStamps->contains($l)) { // only add it if the **same** object is not already associated - $this->collCcShowStamps[]= $l; + if (!$this->collCcStamps->contains($l)) { // only add it if the **same** object is not already associated + $this->collCcStamps[]= $l; $l->setCcShow($this); } } @@ -1968,7 +1968,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcShow is new, it will return * an empty collection; or if this CcShow has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStamps from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1977,114 +1977,14 @@ abstract class BaseCcShow extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStamp[] List of CcStamp objects */ - public function getCcShowStampsJoinCcShowInstances($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampsJoinCcShowInstances($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampQuery::create(null, $criteria); $query->joinWith('CcShowInstances', $join_behavior); - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcShow is new, it will return - * an empty collection; or if this CcShow has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcShow. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcFiles($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcFiles', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcShow is new, it will return - * an empty collection; or if this CcShow has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcShow. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcWebstream($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcWebstream', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcShow is new, it will return - * an empty collection; or if this CcShow has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcShow. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcBlock($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcBlock', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcShow is new, it will return - * an empty collection; or if this CcShow has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcShow. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcPlaylist($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcPlaylist', $join_behavior); - - return $this->getCcShowStamps($query, $con); + return $this->getCcStamps($query, $con); } /** @@ -2145,8 +2045,8 @@ abstract class BaseCcShow extends BaseObject implements Persistent $o->clearAllReferences($deep); } } - if ($this->collCcShowStamps) { - foreach ((array) $this->collCcShowStamps as $o) { + if ($this->collCcStamps) { + foreach ((array) $this->collCcStamps as $o) { $o->clearAllReferences($deep); } } @@ -2156,7 +2056,7 @@ abstract class BaseCcShow extends BaseObject implements Persistent $this->collCcShowDayss = null; $this->collCcShowRebroadcasts = null; $this->collCcShowHostss = null; - $this->collCcShowStamps = null; + $this->collCcStamps = null; } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php b/airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php index 674929694..8ea2a9dd1 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php @@ -126,9 +126,9 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent protected $collCcSchedules; /** - * @var array CcShowStamp[] Collection to store aggregation of CcShowStamp objects. + * @var array CcStamp[] Collection to store aggregation of CcStamp objects. */ - protected $collCcShowStamps; + protected $collCcStamps; /** * Flag to prevent endless save loop, if this object is referenced @@ -894,7 +894,7 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent $this->collCcSchedules = null; - $this->collCcShowStamps = null; + $this->collCcStamps = null; } // if (deep) } @@ -1071,8 +1071,8 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStamps !== null) { + foreach ($this->collCcStamps as $referrerFK) { if (!$referrerFK->isDeleted()) { $affectedRows += $referrerFK->save($con); } @@ -1190,8 +1190,8 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStamps !== null) { + foreach ($this->collCcStamps as $referrerFK) { if (!$referrerFK->validate($columns)) { $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); } @@ -1530,9 +1530,9 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent } } - foreach ($this->getCcShowStamps() as $relObj) { + foreach ($this->getCcStamps() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addCcShowStamp($relObj->copy($deepCopy)); + $copyObj->addCcStamp($relObj->copy($deepCopy)); } } @@ -2047,36 +2047,36 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent } /** - * Clears out the collCcShowStamps collection + * Clears out the collCcStamps collection * * This does not modify the database; however, it will remove any associated objects, causing * them to be refetched by subsequent calls to accessor method. * * @return void - * @see addCcShowStamps() + * @see addCcStamps() */ - public function clearCcShowStamps() + public function clearCcStamps() { - $this->collCcShowStamps = null; // important to set this to NULL since that means it is uninitialized + $this->collCcStamps = null; // important to set this to NULL since that means it is uninitialized } /** - * Initializes the collCcShowStamps collection. + * Initializes the collCcStamps collection. * - * By default this just sets the collCcShowStamps collection to an empty array (like clearcollCcShowStamps()); + * By default this just sets the collCcStamps collection to an empty array (like clearcollCcStamps()); * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * * @return void */ - public function initCcShowStamps() + public function initCcStamps() { - $this->collCcShowStamps = new PropelObjectCollection(); - $this->collCcShowStamps->setModel('CcShowStamp'); + $this->collCcStamps = new PropelObjectCollection(); + $this->collCcStamps->setModel('CcStamp'); } /** - * Gets an array of CcShowStamp objects which contain a foreign key that references this object. + * Gets an array of CcStamp objects which contain a foreign key that references this object. * * If the $criteria is not null, it is used to always fetch the results from the database. * Otherwise the results are fetched from the database the first time, then cached. @@ -2086,44 +2086,44 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent * * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStamp[] List of CcStamp objects * @throws PropelException */ - public function getCcShowStamps($criteria = null, PropelPDO $con = null) + public function getCcStamps($criteria = null, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStamps || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStamps) { // return empty collection - $this->initCcShowStamps(); + $this->initCcStamps(); } else { - $collCcShowStamps = CcShowStampQuery::create(null, $criteria) + $collCcStamps = CcStampQuery::create(null, $criteria) ->filterByCcShowInstances($this) ->find($con); if (null !== $criteria) { - return $collCcShowStamps; + return $collCcStamps; } - $this->collCcShowStamps = $collCcShowStamps; + $this->collCcStamps = $collCcStamps; } } - return $this->collCcShowStamps; + return $this->collCcStamps; } /** - * Returns the number of related CcShowStamp objects. + * Returns the number of related CcStamp objects. * * @param Criteria $criteria * @param boolean $distinct * @param PropelPDO $con - * @return int Count of related CcShowStamp objects. + * @return int Count of related CcStamp objects. * @throws PropelException */ - public function countCcShowStamps(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) + public function countCcStamps(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStamps || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStamps) { return 0; } else { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampQuery::create(null, $criteria); if($distinct) { $query->distinct(); } @@ -2132,25 +2132,25 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent ->count($con); } } else { - return count($this->collCcShowStamps); + return count($this->collCcStamps); } } /** - * Method called to associate a CcShowStamp object to this object - * through the CcShowStamp foreign key attribute. + * Method called to associate a CcStamp object to this object + * through the CcStamp foreign key attribute. * - * @param CcShowStamp $l CcShowStamp + * @param CcStamp $l CcStamp * @return void * @throws PropelException */ - public function addCcShowStamp(CcShowStamp $l) + public function addCcStamp(CcStamp $l) { - if ($this->collCcShowStamps === null) { - $this->initCcShowStamps(); + if ($this->collCcStamps === null) { + $this->initCcStamps(); } - if (!$this->collCcShowStamps->contains($l)) { // only add it if the **same** object is not already associated - $this->collCcShowStamps[]= $l; + if (!$this->collCcStamps->contains($l)) { // only add it if the **same** object is not already associated + $this->collCcStamps[]= $l; $l->setCcShowInstances($this); } } @@ -2161,7 +2161,7 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcShowInstances is new, it will return * an empty collection; or if this CcShowInstances has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStamps from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -2170,114 +2170,14 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStamp[] List of CcStamp objects */ - public function getCcShowStampsJoinCcShow($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampsJoinCcShow($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampQuery::create(null, $criteria); $query->joinWith('CcShow', $join_behavior); - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcShowInstances is new, it will return - * an empty collection; or if this CcShowInstances has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcShowInstances. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcFiles($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcFiles', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcShowInstances is new, it will return - * an empty collection; or if this CcShowInstances has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcShowInstances. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcWebstream($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcWebstream', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcShowInstances is new, it will return - * an empty collection; or if this CcShowInstances has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcShowInstances. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcBlock($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcBlock', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcShowInstances is new, it will return - * an empty collection; or if this CcShowInstances has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcShowInstances. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcPlaylist($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcPlaylist', $join_behavior); - - return $this->getCcShowStamps($query, $con); + return $this->getCcStamps($query, $con); } /** @@ -2328,8 +2228,8 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent $o->clearAllReferences($deep); } } - if ($this->collCcShowStamps) { - foreach ((array) $this->collCcShowStamps as $o) { + if ($this->collCcStamps) { + foreach ((array) $this->collCcStamps as $o) { $o->clearAllReferences($deep); } } @@ -2337,7 +2237,7 @@ abstract class BaseCcShowInstances extends BaseObject implements Persistent $this->collCcShowInstancessRelatedByDbId = null; $this->collCcSchedules = null; - $this->collCcShowStamps = null; + $this->collCcStamps = null; $this->aCcShow = null; $this->aCcShowInstancesRelatedByDbOriginalShow = null; $this->aCcFiles = null; diff --git a/airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php b/airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php index 0223926b2..9a371d34e 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php @@ -399,9 +399,9 @@ abstract class BaseCcShowInstancesPeer { // Invalidate objects in CcSchedulePeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcSchedulePeer::clearInstancePool(); - // Invalidate objects in CcShowStampPeer instance pool, + // Invalidate objects in CcStampPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - CcShowStampPeer::clearInstancePool(); + CcStampPeer::clearInstancePool(); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php index 30ffdd523..b550cd2b5 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php @@ -56,9 +56,9 @@ * @method CcShowInstancesQuery rightJoinCcSchedule($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcSchedule relation * @method CcShowInstancesQuery innerJoinCcSchedule($relationAlias = '') Adds a INNER JOIN clause to the query using the CcSchedule relation * - * @method CcShowInstancesQuery leftJoinCcShowStamp($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcShowStamp relation - * @method CcShowInstancesQuery rightJoinCcShowStamp($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcShowStamp relation - * @method CcShowInstancesQuery innerJoinCcShowStamp($relationAlias = '') Adds a INNER JOIN clause to the query using the CcShowStamp relation + * @method CcShowInstancesQuery leftJoinCcStamp($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcStamp relation + * @method CcShowInstancesQuery rightJoinCcStamp($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcStamp relation + * @method CcShowInstancesQuery innerJoinCcStamp($relationAlias = '') Adds a INNER JOIN clause to the query using the CcStamp relation * * @method CcShowInstances findOne(PropelPDO $con = null) Return the first CcShowInstances matching the query * @method CcShowInstances findOneOrCreate(PropelPDO $con = null) Return the first CcShowInstances matching the query, or a new CcShowInstances object populated from the query conditions when no match is found @@ -853,31 +853,31 @@ abstract class BaseCcShowInstancesQuery extends ModelCriteria } /** - * Filter the query by a related CcShowStamp object + * Filter the query by a related CcStamp object * - * @param CcShowStamp $ccShowStamp the related object to use as filter + * @param CcStamp $ccStamp the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcShowInstancesQuery The current query, for fluid interface */ - public function filterByCcShowStamp($ccShowStamp, $comparison = null) + public function filterByCcStamp($ccStamp, $comparison = null) { return $this - ->addUsingAlias(CcShowInstancesPeer::ID, $ccShowStamp->getDbInstanceId(), $comparison); + ->addUsingAlias(CcShowInstancesPeer::ID, $ccStamp->getDbInstanceId(), $comparison); } /** - * Adds a JOIN clause to the query using the CcShowStamp relation + * Adds a JOIN clause to the query using the CcStamp relation * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return CcShowInstancesQuery The current query, for fluid interface */ - public function joinCcShowStamp($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function joinCcStamp($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('CcShowStamp'); + $relationMap = $tableMap->getRelation('CcStamp'); // create a ModelJoin object for this join $join = new ModelJoin(); @@ -892,14 +892,14 @@ abstract class BaseCcShowInstancesQuery extends ModelCriteria $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); $this->addJoinObject($join, $relationAlias); } else { - $this->addJoinObject($join, 'CcShowStamp'); + $this->addJoinObject($join, 'CcStamp'); } return $this; } /** - * Use the CcShowStamp relation CcShowStamp object + * Use the CcStamp relation CcStamp object * * @see useQuery() * @@ -907,13 +907,13 @@ abstract class BaseCcShowInstancesQuery extends ModelCriteria * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return CcShowStampQuery A secondary query class using the current class as primary query + * @return CcStampQuery A secondary query class using the current class as primary query */ - public function useCcShowStampQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function useCcStampQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { return $this - ->joinCcShowStamp($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'CcShowStamp', 'CcShowStampQuery'); + ->joinCcStamp($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CcStamp', 'CcStampQuery'); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php b/airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php index f19fa875d..02c2800cf 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php @@ -405,9 +405,9 @@ abstract class BaseCcShowPeer { // Invalidate objects in CcShowHostsPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcShowHostsPeer::clearInstancePool(); - // Invalidate objects in CcShowStampPeer instance pool, + // Invalidate objects in CcStampPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - CcShowStampPeer::clearInstancePool(); + CcStampPeer::clearInstancePool(); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php index d7a849308..c7d9c2788 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php @@ -52,9 +52,9 @@ * @method CcShowQuery rightJoinCcShowHosts($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcShowHosts relation * @method CcShowQuery innerJoinCcShowHosts($relationAlias = '') Adds a INNER JOIN clause to the query using the CcShowHosts relation * - * @method CcShowQuery leftJoinCcShowStamp($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcShowStamp relation - * @method CcShowQuery rightJoinCcShowStamp($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcShowStamp relation - * @method CcShowQuery innerJoinCcShowStamp($relationAlias = '') Adds a INNER JOIN clause to the query using the CcShowStamp relation + * @method CcShowQuery leftJoinCcStamp($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcStamp relation + * @method CcShowQuery rightJoinCcStamp($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcStamp relation + * @method CcShowQuery innerJoinCcStamp($relationAlias = '') Adds a INNER JOIN clause to the query using the CcStamp relation * * @method CcShow findOne(PropelPDO $con = null) Return the first CcShow matching the query * @method CcShow findOneOrCreate(PropelPDO $con = null) Return the first CcShow matching the query, or a new CcShow object populated from the query conditions when no match is found @@ -694,31 +694,31 @@ abstract class BaseCcShowQuery extends ModelCriteria } /** - * Filter the query by a related CcShowStamp object + * Filter the query by a related CcStamp object * - * @param CcShowStamp $ccShowStamp the related object to use as filter + * @param CcStamp $ccStamp the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcShowQuery The current query, for fluid interface */ - public function filterByCcShowStamp($ccShowStamp, $comparison = null) + public function filterByCcStamp($ccStamp, $comparison = null) { return $this - ->addUsingAlias(CcShowPeer::ID, $ccShowStamp->getDbShowId(), $comparison); + ->addUsingAlias(CcShowPeer::ID, $ccStamp->getDbShowId(), $comparison); } /** - * Adds a JOIN clause to the query using the CcShowStamp relation + * Adds a JOIN clause to the query using the CcStamp relation * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return CcShowQuery The current query, for fluid interface */ - public function joinCcShowStamp($relationAlias = '', $joinType = Criteria::INNER_JOIN) + public function joinCcStamp($relationAlias = '', $joinType = Criteria::INNER_JOIN) { $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('CcShowStamp'); + $relationMap = $tableMap->getRelation('CcStamp'); // create a ModelJoin object for this join $join = new ModelJoin(); @@ -733,14 +733,14 @@ abstract class BaseCcShowQuery extends ModelCriteria $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); $this->addJoinObject($join, $relationAlias); } else { - $this->addJoinObject($join, 'CcShowStamp'); + $this->addJoinObject($join, 'CcStamp'); } return $this; } /** - * Use the CcShowStamp relation CcShowStamp object + * Use the CcStamp relation CcStamp object * * @see useQuery() * @@ -748,13 +748,13 @@ abstract class BaseCcShowQuery extends ModelCriteria * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return CcShowStampQuery A secondary query class using the current class as primary query + * @return CcStampQuery A secondary query class using the current class as primary query */ - public function useCcShowStampQuery($relationAlias = '', $joinType = Criteria::INNER_JOIN) + public function useCcStampQuery($relationAlias = '', $joinType = Criteria::INNER_JOIN) { return $this - ->joinCcShowStamp($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'CcShowStamp', 'CcShowStampQuery'); + ->joinCcStamp($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CcStamp', 'CcStampQuery'); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcWebstream.php b/airtime_mvc/application/models/airtime/om/BaseCcWebstream.php index 2b6587984..5b6a66111 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcWebstream.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcWebstream.php @@ -91,9 +91,9 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent protected $collCcSchedules; /** - * @var array CcShowStamp[] Collection to store aggregation of CcShowStamp objects. + * @var array CcStampContents[] Collection to store aggregation of CcStampContents objects. */ - protected $collCcShowStamps; + protected $collCcStampContentss; /** * Flag to prevent endless save loop, if this object is referenced @@ -704,7 +704,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent $this->collCcSchedules = null; - $this->collCcShowStamps = null; + $this->collCcStampContentss = null; } // if (deep) } @@ -847,8 +847,8 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStampContentss !== null) { + foreach ($this->collCcStampContentss as $referrerFK) { if (!$referrerFK->isDeleted()) { $affectedRows += $referrerFK->save($con); } @@ -934,8 +934,8 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent } } - if ($this->collCcShowStamps !== null) { - foreach ($this->collCcShowStamps as $referrerFK) { + if ($this->collCcStampContentss !== null) { + foreach ($this->collCcStampContentss as $referrerFK) { if (!$referrerFK->validate($columns)) { $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); } @@ -1236,9 +1236,9 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent } } - foreach ($this->getCcShowStamps() as $relObj) { + foreach ($this->getCcStampContentss() as $relObj) { if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves - $copyObj->addCcShowStamp($relObj->copy($deepCopy)); + $copyObj->addCcStampContents($relObj->copy($deepCopy)); } } @@ -1447,36 +1447,36 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent } /** - * Clears out the collCcShowStamps collection + * Clears out the collCcStampContentss collection * * This does not modify the database; however, it will remove any associated objects, causing * them to be refetched by subsequent calls to accessor method. * * @return void - * @see addCcShowStamps() + * @see addCcStampContentss() */ - public function clearCcShowStamps() + public function clearCcStampContentss() { - $this->collCcShowStamps = null; // important to set this to NULL since that means it is uninitialized + $this->collCcStampContentss = null; // important to set this to NULL since that means it is uninitialized } /** - * Initializes the collCcShowStamps collection. + * Initializes the collCcStampContentss collection. * - * By default this just sets the collCcShowStamps collection to an empty array (like clearcollCcShowStamps()); + * By default this just sets the collCcStampContentss collection to an empty array (like clearcollCcStampContentss()); * however, you may wish to override this method in your stub class to provide setting appropriate * to your application -- for example, setting the initial array to the values stored in database. * * @return void */ - public function initCcShowStamps() + public function initCcStampContentss() { - $this->collCcShowStamps = new PropelObjectCollection(); - $this->collCcShowStamps->setModel('CcShowStamp'); + $this->collCcStampContentss = new PropelObjectCollection(); + $this->collCcStampContentss->setModel('CcStampContents'); } /** - * Gets an array of CcShowStamp objects which contain a foreign key that references this object. + * Gets an array of CcStampContents objects which contain a foreign key that references this object. * * If the $criteria is not null, it is used to always fetch the results from the database. * Otherwise the results are fetched from the database the first time, then cached. @@ -1486,44 +1486,44 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent * * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects * @throws PropelException */ - public function getCcShowStamps($criteria = null, PropelPDO $con = null) + public function getCcStampContentss($criteria = null, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStampContentss || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStampContentss) { // return empty collection - $this->initCcShowStamps(); + $this->initCcStampContentss(); } else { - $collCcShowStamps = CcShowStampQuery::create(null, $criteria) + $collCcStampContentss = CcStampContentsQuery::create(null, $criteria) ->filterByCcWebstream($this) ->find($con); if (null !== $criteria) { - return $collCcShowStamps; + return $collCcStampContentss; } - $this->collCcShowStamps = $collCcShowStamps; + $this->collCcStampContentss = $collCcStampContentss; } } - return $this->collCcShowStamps; + return $this->collCcStampContentss; } /** - * Returns the number of related CcShowStamp objects. + * Returns the number of related CcStampContents objects. * * @param Criteria $criteria * @param boolean $distinct * @param PropelPDO $con - * @return int Count of related CcShowStamp objects. + * @return int Count of related CcStampContents objects. * @throws PropelException */ - public function countCcShowStamps(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) + public function countCcStampContentss(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) { - if(null === $this->collCcShowStamps || null !== $criteria) { - if ($this->isNew() && null === $this->collCcShowStamps) { + if(null === $this->collCcStampContentss || null !== $criteria) { + if ($this->isNew() && null === $this->collCcStampContentss) { return 0; } else { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); if($distinct) { $query->distinct(); } @@ -1532,25 +1532,25 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent ->count($con); } } else { - return count($this->collCcShowStamps); + return count($this->collCcStampContentss); } } /** - * Method called to associate a CcShowStamp object to this object - * through the CcShowStamp foreign key attribute. + * Method called to associate a CcStampContents object to this object + * through the CcStampContents foreign key attribute. * - * @param CcShowStamp $l CcShowStamp + * @param CcStampContents $l CcStampContents * @return void * @throws PropelException */ - public function addCcShowStamp(CcShowStamp $l) + public function addCcStampContents(CcStampContents $l) { - if ($this->collCcShowStamps === null) { - $this->initCcShowStamps(); + if ($this->collCcStampContentss === null) { + $this->initCcStampContentss(); } - if (!$this->collCcShowStamps->contains($l)) { // only add it if the **same** object is not already associated - $this->collCcShowStamps[]= $l; + if (!$this->collCcStampContentss->contains($l)) { // only add it if the **same** object is not already associated + $this->collCcStampContentss[]= $l; $l->setCcWebstream($this); } } @@ -1561,7 +1561,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcWebstream is new, it will return * an empty collection; or if this CcWebstream has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1570,14 +1570,14 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcShow($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcStamp($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcShow', $join_behavior); + $query = CcStampContentsQuery::create(null, $criteria); + $query->joinWith('CcStamp', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -1586,7 +1586,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcWebstream is new, it will return * an empty collection; or if this CcWebstream has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1595,39 +1595,14 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcShowInstances($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcFiles($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); - $query->joinWith('CcShowInstances', $join_behavior); - - return $this->getCcShowStamps($query, $con); - } - - - /** - * If this collection has already been initialized with - * an identical criteria, it returns the collection. - * Otherwise if this CcWebstream is new, it will return - * an empty collection; or if this CcWebstream has previously - * been saved, it will retrieve related CcShowStamps from storage. - * - * This method is protected by default in order to keep the public - * api reasonable. You can provide public methods for those you - * actually need in CcWebstream. - * - * @param Criteria $criteria optional Criteria object to narrow the query - * @param PropelPDO $con optional connection object - * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects - */ - public function getCcShowStampsJoinCcFiles($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) - { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcFiles', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -1636,7 +1611,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcWebstream is new, it will return * an empty collection; or if this CcWebstream has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1645,14 +1620,14 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcBlock($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcBlock($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcBlock', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } @@ -1661,7 +1636,7 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent * an identical criteria, it returns the collection. * Otherwise if this CcWebstream is new, it will return * an empty collection; or if this CcWebstream has previously - * been saved, it will retrieve related CcShowStamps from storage. + * been saved, it will retrieve related CcStampContentss from storage. * * This method is protected by default in order to keep the public * api reasonable. You can provide public methods for those you @@ -1670,14 +1645,14 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent * @param Criteria $criteria optional Criteria object to narrow the query * @param PropelPDO $con optional connection object * @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN) - * @return PropelCollection|array CcShowStamp[] List of CcShowStamp objects + * @return PropelCollection|array CcStampContents[] List of CcStampContents objects */ - public function getCcShowStampsJoinCcPlaylist($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) + public function getCcStampContentssJoinCcPlaylist($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN) { - $query = CcShowStampQuery::create(null, $criteria); + $query = CcStampContentsQuery::create(null, $criteria); $query->joinWith('CcPlaylist', $join_behavior); - return $this->getCcShowStamps($query, $con); + return $this->getCcStampContentss($query, $con); } /** @@ -1721,15 +1696,15 @@ abstract class BaseCcWebstream extends BaseObject implements Persistent $o->clearAllReferences($deep); } } - if ($this->collCcShowStamps) { - foreach ((array) $this->collCcShowStamps as $o) { + if ($this->collCcStampContentss) { + foreach ((array) $this->collCcStampContentss as $o) { $o->clearAllReferences($deep); } } } // if ($deep) $this->collCcSchedules = null; - $this->collCcShowStamps = null; + $this->collCcStampContentss = null; } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcWebstreamPeer.php b/airtime_mvc/application/models/airtime/om/BaseCcWebstreamPeer.php index 1965b1bf2..81bcb2b27 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcWebstreamPeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcWebstreamPeer.php @@ -386,9 +386,9 @@ abstract class BaseCcWebstreamPeer { // Invalidate objects in CcSchedulePeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcSchedulePeer::clearInstancePool(); - // Invalidate objects in CcShowStampPeer instance pool, + // Invalidate objects in CcStampContentsPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. - CcShowStampPeer::clearInstancePool(); + CcStampContentsPeer::clearInstancePool(); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcWebstreamQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcWebstreamQuery.php index 1f62828e7..6ad062e18 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcWebstreamQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcWebstreamQuery.php @@ -36,9 +36,9 @@ * @method CcWebstreamQuery rightJoinCcSchedule($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcSchedule relation * @method CcWebstreamQuery innerJoinCcSchedule($relationAlias = '') Adds a INNER JOIN clause to the query using the CcSchedule relation * - * @method CcWebstreamQuery leftJoinCcShowStamp($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcShowStamp relation - * @method CcWebstreamQuery rightJoinCcShowStamp($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcShowStamp relation - * @method CcWebstreamQuery innerJoinCcShowStamp($relationAlias = '') Adds a INNER JOIN clause to the query using the CcShowStamp relation + * @method CcWebstreamQuery leftJoinCcStampContents($relationAlias = '') Adds a LEFT JOIN clause to the query using the CcStampContents relation + * @method CcWebstreamQuery rightJoinCcStampContents($relationAlias = '') Adds a RIGHT JOIN clause to the query using the CcStampContents relation + * @method CcWebstreamQuery innerJoinCcStampContents($relationAlias = '') Adds a INNER JOIN clause to the query using the CcStampContents relation * * @method CcWebstream findOne(PropelPDO $con = null) Return the first CcWebstream matching the query * @method CcWebstream findOneOrCreate(PropelPDO $con = null) Return the first CcWebstream matching the query, or a new CcWebstream object populated from the query conditions when no match is found @@ -489,31 +489,31 @@ abstract class BaseCcWebstreamQuery extends ModelCriteria } /** - * Filter the query by a related CcShowStamp object + * Filter the query by a related CcStampContents object * - * @param CcShowStamp $ccShowStamp the related object to use as filter + * @param CcStampContents $ccStampContents the related object to use as filter * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL * * @return CcWebstreamQuery The current query, for fluid interface */ - public function filterByCcShowStamp($ccShowStamp, $comparison = null) + public function filterByCcStampContents($ccStampContents, $comparison = null) { return $this - ->addUsingAlias(CcWebstreamPeer::ID, $ccShowStamp->getDbStreamId(), $comparison); + ->addUsingAlias(CcWebstreamPeer::ID, $ccStampContents->getDbStreamId(), $comparison); } /** - * Adds a JOIN clause to the query using the CcShowStamp relation + * Adds a JOIN clause to the query using the CcStampContents relation * * @param string $relationAlias optional alias for the relation * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * * @return CcWebstreamQuery The current query, for fluid interface */ - public function joinCcShowStamp($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function joinCcStampContents($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { $tableMap = $this->getTableMap(); - $relationMap = $tableMap->getRelation('CcShowStamp'); + $relationMap = $tableMap->getRelation('CcStampContents'); // create a ModelJoin object for this join $join = new ModelJoin(); @@ -528,14 +528,14 @@ abstract class BaseCcWebstreamQuery extends ModelCriteria $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); $this->addJoinObject($join, $relationAlias); } else { - $this->addJoinObject($join, 'CcShowStamp'); + $this->addJoinObject($join, 'CcStampContents'); } return $this; } /** - * Use the CcShowStamp relation CcShowStamp object + * Use the CcStampContents relation CcStampContents object * * @see useQuery() * @@ -543,13 +543,13 @@ abstract class BaseCcWebstreamQuery extends ModelCriteria * to be used as main alias in the secondary query * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' * - * @return CcShowStampQuery A secondary query class using the current class as primary query + * @return CcStampContentsQuery A secondary query class using the current class as primary query */ - public function useCcShowStampQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) + public function useCcStampContentsQuery($relationAlias = '', $joinType = Criteria::LEFT_JOIN) { return $this - ->joinCcShowStamp($relationAlias, $joinType) - ->useQuery($relationAlias ? $relationAlias : 'CcShowStamp', 'CcShowStampQuery'); + ->joinCcStampContents($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CcStampContents', 'CcStampContentsQuery'); } /** diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml index 49ff7cffa..bbcd7f0fe 100644 --- a/airtime_mvc/build/schema.xml +++ b/airtime_mvc/build/schema.xml @@ -341,7 +341,7 @@ - @@ -477,10 +477,9 @@ - +
- - + @@ -491,23 +490,31 @@ - - + + - - - - + - + - + - +
+ + + + + + + + + + +
diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql index 9d9040164..5e8af4018 100644 --- a/airtime_mvc/build/sql/schema.sql +++ b/airtime_mvc/build/sql/schema.sql @@ -751,17 +751,16 @@ COMMENT ON TABLE "cc_locale" IS ''; SET search_path TO public; ----------------------------------------------------------------------------- --- cc_show_stamp +-- cc_stamp_contents ----------------------------------------------------------------------------- -DROP TABLE "cc_show_stamp" CASCADE; +DROP TABLE "cc_stamp_contents" CASCADE; -CREATE TABLE "cc_show_stamp" +CREATE TABLE "cc_stamp_contents" ( "id" serial NOT NULL, - "show_id" INTEGER NOT NULL, - "instance_id" INTEGER, + "stamp_id" INTEGER NOT NULL, "file_id" INTEGER, "stream_id" INTEGER, "block_id" INTEGER, @@ -775,7 +774,26 @@ CREATE TABLE "cc_show_stamp" PRIMARY KEY ("id") ); -COMMENT ON TABLE "cc_show_stamp" IS ''; +COMMENT ON TABLE "cc_stamp_contents" IS ''; + + +SET search_path TO public; +----------------------------------------------------------------------------- +-- cc_stamp +----------------------------------------------------------------------------- + +DROP TABLE "cc_stamp" CASCADE; + + +CREATE TABLE "cc_stamp" +( + "id" serial NOT NULL, + "show_id" INTEGER NOT NULL, + "instance_id" INTEGER, + PRIMARY KEY ("id") +); + +COMMENT ON TABLE "cc_stamp" IS ''; SET search_path TO public; @@ -835,14 +853,16 @@ ALTER TABLE "cc_listener_count" ADD CONSTRAINT "cc_timestamp_inst_fkey" FOREIGN ALTER TABLE "cc_listener_count" ADD CONSTRAINT "cc_mount_name_inst_fkey" FOREIGN KEY ("mount_name_id") REFERENCES "cc_mount_name" ("id") ON DELETE CASCADE; -ALTER TABLE "cc_show_stamp" ADD CONSTRAINT "cc_show_stamp_show_id_fkey" FOREIGN KEY ("show_id") REFERENCES "cc_show" ("id") ON DELETE CASCADE; +ALTER TABLE "cc_stamp_contents" ADD CONSTRAINT "cc_stamp_contents_stamp_id_fkey" FOREIGN KEY ("stamp_id") REFERENCES "cc_stamp" ("id") ON DELETE CASCADE; -ALTER TABLE "cc_show_stamp" ADD CONSTRAINT "cc_show_stamp_instance_id_fkey" FOREIGN KEY ("instance_id") REFERENCES "cc_show_instances" ("id") ON DELETE CASCADE; +ALTER TABLE "cc_stamp_contents" ADD CONSTRAINT "cc_stamp_contents_file_id_fkey" FOREIGN KEY ("file_id") REFERENCES "cc_files" ("id") ON DELETE CASCADE; -ALTER TABLE "cc_show_stamp" ADD CONSTRAINT "cc_show_stamp_file_id_fkey" FOREIGN KEY ("file_id") REFERENCES "cc_files" ("id") ON DELETE CASCADE; +ALTER TABLE "cc_stamp_contents" ADD CONSTRAINT "cc_stamp_contents_stream_id_fkey" FOREIGN KEY ("stream_id") REFERENCES "cc_webstream" ("id") ON DELETE CASCADE; -ALTER TABLE "cc_show_stamp" ADD CONSTRAINT "cc_show_stamp_stream_id_fkey" FOREIGN KEY ("stream_id") REFERENCES "cc_webstream" ("id") ON DELETE CASCADE; +ALTER TABLE "cc_stamp_contents" ADD CONSTRAINT "cc_stamp_contents_block_id_fkey" FOREIGN KEY ("block_id") REFERENCES "cc_block" ("id") ON DELETE CASCADE; -ALTER TABLE "cc_show_stamp" ADD CONSTRAINT "cc_show_stamp_block_id_fkey" FOREIGN KEY ("block_id") REFERENCES "cc_block" ("id") ON DELETE CASCADE; +ALTER TABLE "cc_stamp_contents" ADD CONSTRAINT "cc_stamp_contents_playlist_id_fkey" FOREIGN KEY ("playlist_id") REFERENCES "cc_playlist" ("id") ON DELETE CASCADE; -ALTER TABLE "cc_show_stamp" ADD CONSTRAINT "cc_show_stamp_playlist_id_fkey" FOREIGN KEY ("playlist_id") REFERENCES "cc_playlist" ("id") ON DELETE CASCADE; +ALTER TABLE "cc_stamp" ADD CONSTRAINT "cc_stamp_show_id_fkey" FOREIGN KEY ("show_id") REFERENCES "cc_show" ("id") ON DELETE CASCADE; + +ALTER TABLE "cc_stamp" ADD CONSTRAINT "cc_stamp_instance_id_fkey" FOREIGN KEY ("instance_id") REFERENCES "cc_show_instances" ("id") ON DELETE CASCADE;