Author: sevein
Date: Sun Jul 22 18:07:08 2012
New Revision: 11954
Log:
Object instances are cached in a local array (see for example BaseObject::). In
some situations (like in migrations or search index building) we create lots of
object instances but we don't need them to be cached at all. clearCache() can
be called manually every time you want to clear this local array and free its
memory.
Modified:
trunk/lib/model/map/ActorTableMap.php
trunk/lib/model/map/ObjectTableMap.php
trunk/lib/model/map/TermTableMap.php
trunk/lib/model/om/BaseActorI18n.php
trunk/lib/model/om/BaseContactInformation.php
trunk/lib/model/om/BaseContactInformationI18n.php
trunk/lib/model/om/BaseEventI18n.php
trunk/lib/model/om/BaseFunctionI18n.php
trunk/lib/model/om/BaseInformationObjectI18n.php
trunk/lib/model/om/BaseKeymap.php
trunk/lib/model/om/BaseMenu.php
trunk/lib/model/om/BaseMenuI18n.php
trunk/lib/model/om/BaseNote.php
trunk/lib/model/om/BaseNoteI18n.php
trunk/lib/model/om/BaseOaiHarvest.php
trunk/lib/model/om/BaseOaiRepository.php
trunk/lib/model/om/BaseObject.php
trunk/lib/model/om/BaseOtherName.php
trunk/lib/model/om/BaseOtherNameI18n.php
trunk/lib/model/om/BasePhysicalObjectI18n.php
trunk/lib/model/om/BaseProperty.php
trunk/lib/model/om/BasePropertyI18n.php
trunk/lib/model/om/BaseRelationI18n.php
trunk/lib/model/om/BaseRepositoryI18n.php
trunk/lib/model/om/BaseRightsI18n.php
trunk/lib/model/om/BaseSetting.php
trunk/lib/model/om/BaseSettingI18n.php
trunk/lib/model/om/BaseSlug.php
trunk/lib/model/om/BaseStaticPageI18n.php
trunk/lib/model/om/BaseStatus.php
trunk/lib/model/om/BaseTaxonomyI18n.php
trunk/lib/model/om/BaseTerm.php
trunk/lib/model/om/BaseTermI18n.php
trunk/lib/propel/builder/QubitObjectBuilder.php
Modified: trunk/lib/model/map/ActorTableMap.php
==============================================================================
--- trunk/lib/model/map/ActorTableMap.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/map/ActorTableMap.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -60,6 +60,7 @@
$this->addRelation('termRelatedBydescriptionStatusId', 'term',
RelationMap::MANY_TO_ONE, array('description_status_id' => 'id', ), 'SET NULL',
null);
$this->addRelation('termRelatedBydescriptionDetailId', 'term',
RelationMap::MANY_TO_ONE, array('description_detail_id' => 'id', ), 'SET NULL',
null);
$this->addRelation('actorRelatedByparentId', 'actor',
RelationMap::MANY_TO_ONE, array('parent_id' => 'id', ), null, null);
+ $this->addRelation('donor', 'donor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
$this->addRelation('actorRelatedByparentId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'parent_id', ), null, null);
$this->addRelation('actorI18n', 'actorI18n', RelationMap::ONE_TO_MANY,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('contactInformation', 'contactInformation',
RelationMap::ONE_TO_MANY, array('id' => 'actor_id', ), 'CASCADE', null);
@@ -68,7 +69,6 @@
$this->addRelation('rights', 'rights', RelationMap::ONE_TO_MANY,
array('id' => 'rights_holder_id', ), 'SET NULL', null);
$this->addRelation('rightsHolder', 'rightsHolder',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('user', 'user', RelationMap::ONE_TO_ONE, array('id' =>
'id', ), 'CASCADE', null);
- $this->addRelation('donor', 'donor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
} // buildRelations()
} // ActorTableMap
Modified: trunk/lib/model/map/ObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/ObjectTableMap.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/map/ObjectTableMap.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -49,6 +49,8 @@
*/
public function buildRelations()
{
+ $this->addRelation('accession', 'accession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
+ $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('aclPermission', 'aclPermission',
RelationMap::ONE_TO_MANY, array('id' => 'object_id', ), 'CASCADE', null);
$this->addRelation('actor', 'actor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
$this->addRelation('digitalObject', 'digitalObject',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
@@ -70,8 +72,6 @@
$this->addRelation('status', 'status', RelationMap::ONE_TO_MANY,
array('id' => 'object_id', ), 'CASCADE', null);
$this->addRelation('taxonomy', 'taxonomy', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('term', 'term', RelationMap::ONE_TO_ONE, array('id' =>
'id', ), 'CASCADE', null);
- $this->addRelation('accession', 'accession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
- $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
} // buildRelations()
} // ObjectTableMap
Modified: trunk/lib/model/map/TermTableMap.php
==============================================================================
--- trunk/lib/model/map/TermTableMap.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/map/TermTableMap.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -54,6 +54,11 @@
$this->addRelation('object', 'object', RelationMap::MANY_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('taxonomy', 'taxonomy', RelationMap::MANY_TO_ONE,
array('taxonomy_id' => 'id', ), 'CASCADE', null);
$this->addRelation('termRelatedByparentId', 'term',
RelationMap::MANY_TO_ONE, array('parent_id' => 'id', ), null, null);
+ $this->addRelation('accessionRelatedByacquisitionTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'acquisition_type_id', ), 'SET NULL',
null);
+ $this->addRelation('accessionRelatedByprocessingPriorityId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_priority_id', ), 'SET
NULL', null);
+ $this->addRelation('accessionRelatedByprocessingStatusId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_status_id', ), 'SET NULL',
null);
+ $this->addRelation('accessionRelatedByresourceTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'resource_type_id', ), 'SET NULL',
null);
+ $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_MANY,
array('id' => 'scope_id', ), 'SET NULL', null);
$this->addRelation('actorRelatedByentityTypeId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'entity_type_id', ), 'SET NULL', null);
$this->addRelation('actorRelatedBydescriptionStatusId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'description_status_id', ), 'SET NULL',
null);
$this->addRelation('actorRelatedBydescriptionDetailId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'description_detail_id', ), 'SET NULL',
null);
@@ -81,11 +86,6 @@
$this->addRelation('statusRelatedBystatusId', 'status',
RelationMap::ONE_TO_MANY, array('id' => 'status_id', ), 'CASCADE', null);
$this->addRelation('termRelatedByparentId', 'term',
RelationMap::ONE_TO_MANY, array('id' => 'parent_id', ), null, null);
$this->addRelation('termI18n', 'termI18n', RelationMap::ONE_TO_MANY,
array('id' => 'id', ), 'CASCADE', null);
- $this->addRelation('accessionRelatedByacquisitionTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'acquisition_type_id', ), 'SET NULL',
null);
- $this->addRelation('accessionRelatedByprocessingPriorityId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_priority_id', ), 'SET
NULL', null);
- $this->addRelation('accessionRelatedByprocessingStatusId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_status_id', ), 'SET NULL',
null);
- $this->addRelation('accessionRelatedByresourceTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'resource_type_id', ), 'SET NULL',
null);
- $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_MANY,
array('id' => 'scope_id', ), 'SET NULL', null);
} // buildRelations()
} // TermTableMap
Modified: trunk/lib/model/om/BaseActorI18n.php
==============================================================================
--- trunk/lib/model/om/BaseActorI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseActorI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -73,6 +73,11 @@
return self::$actorI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$actorI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseContactInformation.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformation.php Sun Jul 22 18:00:23
2012 (r11953)
+++ trunk/lib/model/om/BaseContactInformation.php Sun Jul 22 18:07:08
2012 (r11954)
@@ -76,6 +76,11 @@
return self::$contactInformations[$key];
}
+ public static function clearCache()
+ {
+ self::$contactInformations = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseContactInformationI18n.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformationI18n.php Sun Jul 22 18:00:23
2012 (r11953)
+++ trunk/lib/model/om/BaseContactInformationI18n.php Sun Jul 22 18:07:08
2012 (r11954)
@@ -55,6 +55,11 @@
return self::$contactInformationI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$contactInformationI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseEventI18n.php
==============================================================================
--- trunk/lib/model/om/BaseEventI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseEventI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -53,6 +53,11 @@
return self::$eventI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$eventI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseFunctionI18n.php
==============================================================================
--- trunk/lib/model/om/BaseFunctionI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseFunctionI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -67,6 +67,11 @@
return self::$functionI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$functionI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseInformationObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObjectI18n.php Sun Jul 22 18:00:23
2012 (r11953)
+++ trunk/lib/model/om/BaseInformationObjectI18n.php Sun Jul 22 18:07:08
2012 (r11954)
@@ -89,6 +89,11 @@
return self::$informationObjectI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$informationObjectI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseKeymap.php
==============================================================================
--- trunk/lib/model/om/BaseKeymap.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseKeymap.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -54,6 +54,11 @@
return self::$keymaps[$key];
}
+ public static function clearCache()
+ {
+ self::$keymaps = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseMenu.php
==============================================================================
--- trunk/lib/model/om/BaseMenu.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseMenu.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -62,6 +62,11 @@
return self::$menus[$key];
}
+ public static function clearCache()
+ {
+ self::$menus = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseMenuI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMenuI18n.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseMenuI18n.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -51,6 +51,11 @@
return self::$menuI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$menuI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseNote.php
==============================================================================
--- trunk/lib/model/om/BaseNote.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseNote.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -56,6 +56,11 @@
return self::$notes[$key];
}
+ public static function clearCache()
+ {
+ self::$notes = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseNoteI18n.php
==============================================================================
--- trunk/lib/model/om/BaseNoteI18n.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseNoteI18n.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -49,6 +49,11 @@
return self::$noteI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$noteI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseOaiHarvest.php
==============================================================================
--- trunk/lib/model/om/BaseOaiHarvest.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseOaiHarvest.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -62,6 +62,11 @@
return self::$oaiHarvests[$key];
}
+ public static function clearCache()
+ {
+ self::$oaiHarvests = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseOaiRepository.php
==============================================================================
--- trunk/lib/model/om/BaseOaiRepository.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseOaiRepository.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -58,6 +58,11 @@
return self::$oaiRepositorys[$key];
}
+ public static function clearCache()
+ {
+ self::$oaiRepositorys = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseObject.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -52,6 +52,11 @@
return self::$objects[$key];
}
+ public static function clearCache()
+ {
+ self::$objects = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseOtherName.php
==============================================================================
--- trunk/lib/model/om/BaseOtherName.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseOtherName.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -56,6 +56,11 @@
return self::$otherNames[$key];
}
+ public static function clearCache()
+ {
+ self::$otherNames = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseOtherNameI18n.php
==============================================================================
--- trunk/lib/model/om/BaseOtherNameI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseOtherNameI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -53,6 +53,11 @@
return self::$otherNameI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$otherNameI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BasePhysicalObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObjectI18n.php Sun Jul 22 18:00:23
2012 (r11953)
+++ trunk/lib/model/om/BasePhysicalObjectI18n.php Sun Jul 22 18:07:08
2012 (r11954)
@@ -53,6 +53,11 @@
return self::$physicalObjectI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$physicalObjectI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseProperty.php
==============================================================================
--- trunk/lib/model/om/BaseProperty.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseProperty.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -54,6 +54,11 @@
return self::$propertys[$key];
}
+ public static function clearCache()
+ {
+ self::$propertys = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BasePropertyI18n.php
==============================================================================
--- trunk/lib/model/om/BasePropertyI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BasePropertyI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -49,6 +49,11 @@
return self::$propertyI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$propertyI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseRelationI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRelationI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseRelationI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -51,6 +51,11 @@
return self::$relationI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$relationI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseRepositoryI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRepositoryI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseRepositoryI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -77,6 +77,11 @@
return self::$repositoryI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$repositoryI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseRightsI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRightsI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseRightsI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -63,6 +63,11 @@
return self::$rightsI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$rightsI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseSetting.php
==============================================================================
--- trunk/lib/model/om/BaseSetting.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseSetting.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -56,6 +56,11 @@
return self::$settings[$key];
}
+ public static function clearCache()
+ {
+ self::$settings = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseSettingI18n.php
==============================================================================
--- trunk/lib/model/om/BaseSettingI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseSettingI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -49,6 +49,11 @@
return self::$settingI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$settingI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseSlug.php
==============================================================================
--- trunk/lib/model/om/BaseSlug.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseSlug.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -50,6 +50,11 @@
return self::$slugs[$key];
}
+ public static function clearCache()
+ {
+ self::$slugs = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseStaticPageI18n.php
==============================================================================
--- trunk/lib/model/om/BaseStaticPageI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseStaticPageI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -51,6 +51,11 @@
return self::$staticPageI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$staticPageI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseStatus.php
==============================================================================
--- trunk/lib/model/om/BaseStatus.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseStatus.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -52,6 +52,11 @@
return self::$statuss[$key];
}
+ public static function clearCache()
+ {
+ self::$statuss = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseTaxonomyI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomyI18n.php Sun Jul 22 18:00:23 2012
(r11953)
+++ trunk/lib/model/om/BaseTaxonomyI18n.php Sun Jul 22 18:07:08 2012
(r11954)
@@ -51,6 +51,11 @@
return self::$taxonomyI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$taxonomyI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseTerm.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -109,6 +109,31 @@
{
}
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByprocessingStatusId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByresourceTypeId' == $name)
+ {
+ return true;
+ }
+
+ if ('deaccessions' == $name)
+ {
+ return true;
+ }
+
if ('actorsRelatedByentityTypeId' == $name)
{
return true;
@@ -244,31 +269,6 @@
return true;
}
- if ('accessionsRelatedByacquisitionTypeId' == $name)
- {
- return true;
- }
-
- if ('accessionsRelatedByprocessingPriorityId' == $name)
- {
- return true;
- }
-
- if ('accessionsRelatedByprocessingStatusId' == $name)
- {
- return true;
- }
-
- if ('accessionsRelatedByresourceTypeId' == $name)
- {
- return true;
- }
-
- if ('deaccessions' == $name)
- {
- return true;
- }
-
try
{
if (!$value =
call_user_func_array(array($this->getCurrenttermI18n($options), '__isset'),
$args) && !empty($options['cultureFallback']))
@@ -313,6 +313,91 @@
{
}
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByacquisitionTypeId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
self::getaccessionsRelatedByacquisitionTypeIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByacquisitionTypeId'];
+ }
+
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
+ {
+ if
(!isset($this->refFkValues['accessionsRelatedByprocessingPriorityId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
self::getaccessionsRelatedByprocessingPriorityIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByprocessingPriorityId'];
+ }
+
+ if ('accessionsRelatedByprocessingStatusId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByprocessingStatusId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
self::getaccessionsRelatedByprocessingStatusIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByprocessingStatusId'];
+ }
+
+ if ('accessionsRelatedByresourceTypeId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByresourceTypeId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByresourceTypeId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByresourceTypeId'] =
self::getaccessionsRelatedByresourceTypeIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByresourceTypeId'];
+ }
+
+ if ('deaccessions' == $name)
+ {
+ if (!isset($this->refFkValues['deaccessions']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['deaccessions'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['deaccessions'] =
self::getdeaccessionsById($this->id, array('self' => $this) + $options);
+ }
+ }
+
+ return $this->refFkValues['deaccessions'];
+ }
+
if ('actorsRelatedByentityTypeId' == $name)
{
if (!isset($this->refFkValues['actorsRelatedByentityTypeId']))
@@ -772,91 +857,6 @@
return $this->refFkValues['termI18ns'];
}
- if ('accessionsRelatedByacquisitionTypeId' == $name)
- {
- if (!isset($this->refFkValues['accessionsRelatedByacquisitionTypeId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
self::getaccessionsRelatedByacquisitionTypeIdById($this->id, array('self' =>
$this) + $options);
- }
- }
-
- return $this->refFkValues['accessionsRelatedByacquisitionTypeId'];
- }
-
- if ('accessionsRelatedByprocessingPriorityId' == $name)
- {
- if
(!isset($this->refFkValues['accessionsRelatedByprocessingPriorityId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
self::getaccessionsRelatedByprocessingPriorityIdById($this->id, array('self' =>
$this) + $options);
- }
- }
-
- return $this->refFkValues['accessionsRelatedByprocessingPriorityId'];
- }
-
- if ('accessionsRelatedByprocessingStatusId' == $name)
- {
- if (!isset($this->refFkValues['accessionsRelatedByprocessingStatusId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
self::getaccessionsRelatedByprocessingStatusIdById($this->id, array('self' =>
$this) + $options);
- }
- }
-
- return $this->refFkValues['accessionsRelatedByprocessingStatusId'];
- }
-
- if ('accessionsRelatedByresourceTypeId' == $name)
- {
- if (!isset($this->refFkValues['accessionsRelatedByresourceTypeId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['accessionsRelatedByresourceTypeId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['accessionsRelatedByresourceTypeId'] =
self::getaccessionsRelatedByresourceTypeIdById($this->id, array('self' =>
$this) + $options);
- }
- }
-
- return $this->refFkValues['accessionsRelatedByresourceTypeId'];
- }
-
- if ('deaccessions' == $name)
- {
- if (!isset($this->refFkValues['deaccessions']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['deaccessions'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['deaccessions'] =
self::getdeaccessionsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['deaccessions'];
- }
-
try
{
if (1 > strlen($value =
call_user_func_array(array($this->getCurrenttermI18n($options), '__get'),
$args)) && !empty($options['cultureFallback']))
@@ -1082,6 +1082,106 @@
return $criteria;
}
+ public static function
addaccessionsRelatedByacquisitionTypeIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::ACQUISITION_TYPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByacquisitionTypeIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByacquisitionTypeIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $this->id);
+ }
+
+ public static function
addaccessionsRelatedByprocessingPriorityIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::PROCESSING_PRIORITY_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByprocessingPriorityIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByprocessingPriorityIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function
addaccessionsRelatedByprocessingStatusIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::PROCESSING_STATUS_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByprocessingStatusIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByprocessingStatusIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function
addaccessionsRelatedByresourceTypeIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::RESOURCE_TYPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByresourceTypeIdById($id, array
$options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByresourceTypeIdCriteria(Criteria
$criteria)
+ {
+ return self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function adddeaccessionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitDeaccession::SCOPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getdeaccessionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::adddeaccessionsCriteriaById($criteria, $id);
+
+ return QubitDeaccession::get($criteria, $options);
+ }
+
+ public function adddeaccessionsCriteria(Criteria $criteria)
+ {
+ return self::adddeaccessionsCriteriaById($criteria, $this->id);
+ }
+
public static function addactorsRelatedByentityTypeIdCriteriaById(Criteria
$criteria, $id)
{
$criteria->add(QubitActor::ENTITY_TYPE_ID, $id);
@@ -1622,106 +1722,6 @@
return self::addtermI18nsCriteriaById($criteria, $this->id);
}
- public static function
addaccessionsRelatedByacquisitionTypeIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAccession::ACQUISITION_TYPE_ID, $id);
-
- return $criteria;
- }
-
- public static function getaccessionsRelatedByacquisitionTypeIdById($id,
array $options = array())
- {
- $criteria = new Criteria;
- self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $id);
-
- return QubitAccession::get($criteria, $options);
- }
-
- public function addaccessionsRelatedByacquisitionTypeIdCriteria(Criteria
$criteria)
- {
- return
self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $this->id);
- }
-
- public static function
addaccessionsRelatedByprocessingPriorityIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAccession::PROCESSING_PRIORITY_ID, $id);
-
- return $criteria;
- }
-
- public static function getaccessionsRelatedByprocessingPriorityIdById($id,
array $options = array())
- {
- $criteria = new Criteria;
- self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$id);
-
- return QubitAccession::get($criteria, $options);
- }
-
- public function addaccessionsRelatedByprocessingPriorityIdCriteria(Criteria
$criteria)
- {
- return
self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$this->id);
- }
-
- public static function
addaccessionsRelatedByprocessingStatusIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAccession::PROCESSING_STATUS_ID, $id);
-
- return $criteria;
- }
-
- public static function getaccessionsRelatedByprocessingStatusIdById($id,
array $options = array())
- {
- $criteria = new Criteria;
- self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria, $id);
-
- return QubitAccession::get($criteria, $options);
- }
-
- public function addaccessionsRelatedByprocessingStatusIdCriteria(Criteria
$criteria)
- {
- return
self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria,
$this->id);
- }
-
- public static function
addaccessionsRelatedByresourceTypeIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAccession::RESOURCE_TYPE_ID, $id);
-
- return $criteria;
- }
-
- public static function getaccessionsRelatedByresourceTypeIdById($id, array
$options = array())
- {
- $criteria = new Criteria;
- self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria, $id);
-
- return QubitAccession::get($criteria, $options);
- }
-
- public function addaccessionsRelatedByresourceTypeIdCriteria(Criteria
$criteria)
- {
- return self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria,
$this->id);
- }
-
- public static function adddeaccessionsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitDeaccession::SCOPE_ID, $id);
-
- return $criteria;
- }
-
- public static function getdeaccessionsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::adddeaccessionsCriteriaById($criteria, $id);
-
- return QubitDeaccession::get($criteria, $options);
- }
-
- public function adddeaccessionsCriteria(Criteria $criteria)
- {
- return self::adddeaccessionsCriteriaById($criteria, $this->id);
- }
-
public function getCurrenttermI18n(array $options = array())
{
if (!empty($options['sourceCulture']))
Modified: trunk/lib/model/om/BaseTermI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTermI18n.php Sun Jul 22 18:00:23 2012 (r11953)
+++ trunk/lib/model/om/BaseTermI18n.php Sun Jul 22 18:07:08 2012 (r11954)
@@ -49,6 +49,11 @@
return self::$termI18ns[$key];
}
+ public static function clearCache()
+ {
+ self::$termI18ns = array();
+ }
+
public static function get(Criteria $criteria, array $options = array())
{
if (!isset($options['connection']))
Modified: trunk/lib/propel/builder/QubitObjectBuilder.php
==============================================================================
--- trunk/lib/propel/builder/QubitObjectBuilder.php Sun Jul 22 18:00:23
2012 (r11953)
+++ trunk/lib/propel/builder/QubitObjectBuilder.php Sun Jul 22 18:07:08
2012 (r11954)
@@ -302,6 +302,7 @@
$this->addAddSelectColumns($script);
$this->addGetFromRow($script);
+ $this->addClearCache($script);
$this->addGet($script);
$this->addGetAll($script);
@@ -360,6 +361,24 @@
script;
}
+ protected function addClearCache(&$script)
+ {
+ // Cache subclass instances in the base class
+ if (isset($this->inheritanceFk))
+ {
+ return;
+ }
+
+ $script .= <<<script
+
+ public static function clearCache()
+ {
+ self::\${$this->getVarName(true)} = array();
+ }
+
+script;
+ }
+
protected function addGetFromRow(&$script)
{
// Cache subclass instances in the base class
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
