Author: jablko
Date: 2008-12-15 12:22:52 -0800 (Mon, 15 Dec 2008)
New Revision: 1684
Modified:
trunk/qubit/lib/model/om/BaseActor.php
trunk/qubit/lib/model/om/BaseActorName.php
trunk/qubit/lib/model/om/BaseContactInformation.php
trunk/qubit/lib/model/om/BaseDigitalObject.php
trunk/qubit/lib/model/om/BaseEvent.php
trunk/qubit/lib/model/om/BaseFunction.php
trunk/qubit/lib/model/om/BaseHistoricalEvent.php
trunk/qubit/lib/model/om/BaseInformationObject.php
trunk/qubit/lib/model/om/BaseNote.php
trunk/qubit/lib/model/om/BaseObjectTermRelation.php
trunk/qubit/lib/model/om/BasePermissionScope.php
trunk/qubit/lib/model/om/BasePhysicalObject.php
trunk/qubit/lib/model/om/BasePlace.php
trunk/qubit/lib/model/om/BasePlaceMapRelation.php
trunk/qubit/lib/model/om/BaseProperty.php
trunk/qubit/lib/model/om/BaseRelation.php
trunk/qubit/lib/model/om/BaseRepository.php
trunk/qubit/lib/model/om/BaseRights.php
trunk/qubit/lib/model/om/BaseRightsActorRelation.php
trunk/qubit/lib/model/om/BaseRightsTermRelation.php
trunk/qubit/lib/model/om/BaseRolePermissionRelation.php
trunk/qubit/lib/model/om/BaseSystemEvent.php
trunk/qubit/lib/model/om/BaseTerm.php
trunk/qubit/lib/model/om/BaseUserRoleRelation.php
trunk/qubit/lib/propel/builder/QubitObjectBuilder.php
Log:
Make getFkPhpName() lower camel case. Missing from r1667
Modified: trunk/qubit/lib/model/om/BaseActor.php
===================================================================
--- trunk/qubit/lib/model/om/BaseActor.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseActor.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -157,28 +157,28 @@
return $affectedRows;
}
- public static function addJoinEntityTypeCriteria(Criteria $criteria)
+ public static function addJoinentityTypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitActor::ENTITY_TYPE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinDescriptionStatusCriteria(Criteria $criteria)
+ public static function addJoindescriptionStatusCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitActor::DESCRIPTION_STATUS_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinDescriptionDetailCriteria(Criteria $criteria)
+ public static function addJoindescriptionDetailCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitActor::DESCRIPTION_DETAIL_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinParentCriteria(Criteria $criteria)
+ public static function addJoinparentCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitActor::PARENT_ID, QubitActor::ID);
Modified: trunk/qubit/lib/model/om/BaseActorName.php
===================================================================
--- trunk/qubit/lib/model/om/BaseActorName.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseActorName.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -460,14 +460,14 @@
$this->setid($key);
}
- public static function addJoinActorCriteria(Criteria $criteria)
+ public static function addJoinactorCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitActorName::ACTOR_ID, QubitActor::ID);
return $criteria;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitActorName::TYPE_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BaseContactInformation.php
===================================================================
--- trunk/qubit/lib/model/om/BaseContactInformation.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BaseContactInformation.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -480,7 +480,7 @@
$this->setid($key);
}
- public static function addJoinActorCriteria(Criteria $criteria)
+ public static function addJoinactorCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitContactInformation::ACTOR_ID, QubitActor::ID);
Modified: trunk/qubit/lib/model/om/BaseDigitalObject.php
===================================================================
--- trunk/qubit/lib/model/om/BaseDigitalObject.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BaseDigitalObject.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -144,35 +144,35 @@
return $affectedRows;
}
- public static function addJoinInformationObjectCriteria(Criteria $criteria)
+ public static function addJoininformationObjectCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitDigitalObject::INFORMATION_OBJECT_ID,
QubitInformationObject::ID);
return $criteria;
}
- public static function addJoinUsageCriteria(Criteria $criteria)
+ public static function addJoinusageCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitDigitalObject::USAGE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinMediaTypeCriteria(Criteria $criteria)
+ public static function addJoinmediaTypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitDigitalObject::MEDIA_TYPE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinChecksumTypeCriteria(Criteria $criteria)
+ public static function addJoinchecksumTypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitDigitalObject::CHECKSUM_TYPE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinParentCriteria(Criteria $criteria)
+ public static function addJoinparentCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitDigitalObject::PARENT_ID, QubitDigitalObject::ID);
@@ -329,7 +329,7 @@
$delta = $this->rgt - $this->lft + 1;
}
- if (null === $parent = $this->offsetGet('Parent', array('connection' =>
$connection)))
+ if (null === $parent = $this->offsetGet('parent', array('connection' =>
$connection)))
{
$statement = $connection->prepare('
SELECT MAX('.QubitDigitalObject::RGT.')
Modified: trunk/qubit/lib/model/om/BaseEvent.php
===================================================================
--- trunk/qubit/lib/model/om/BaseEvent.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseEvent.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -155,21 +155,21 @@
return $affectedRows;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitEvent::TYPE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinInformationObjectCriteria(Criteria $criteria)
+ public static function addJoininformationObjectCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitEvent::INFORMATION_OBJECT_ID,
QubitInformationObject::ID);
return $criteria;
}
- public static function addJoinActorCriteria(Criteria $criteria)
+ public static function addJoinactorCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitEvent::ACTOR_ID, QubitActor::ID);
Modified: trunk/qubit/lib/model/om/BaseFunction.php
===================================================================
--- trunk/qubit/lib/model/om/BaseFunction.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseFunction.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -145,21 +145,21 @@
return $affectedRows;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitFunction::TYPE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinDescriptionStatusCriteria(Criteria $criteria)
+ public static function addJoindescriptionStatusCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitFunction::DESCRIPTION_STATUS_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinDescriptionLevelCriteria(Criteria $criteria)
+ public static function addJoindescriptionLevelCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitFunction::DESCRIPTION_LEVEL_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BaseHistoricalEvent.php
===================================================================
--- trunk/qubit/lib/model/om/BaseHistoricalEvent.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BaseHistoricalEvent.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -68,7 +68,7 @@
$this->tables[] =
Propel::getDatabaseMap(QubitHistoricalEvent::DATABASE_NAME)->getTable(QubitHistoricalEvent::TABLE_NAME);
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitHistoricalEvent::TYPE_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BaseInformationObject.php
===================================================================
--- trunk/qubit/lib/model/om/BaseInformationObject.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BaseInformationObject.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -219,42 +219,42 @@
return $affectedRows;
}
- public static function addJoinLevelOfDescriptionCriteria(Criteria $criteria)
+ public static function addJoinlevelOfDescriptionCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitInformationObject::LEVEL_OF_DESCRIPTION_ID,
QubitTerm::ID);
return $criteria;
}
- public static function addJoinCollectionTypeCriteria(Criteria $criteria)
+ public static function addJoincollectionTypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitInformationObject::COLLECTION_TYPE_ID,
QubitTerm::ID);
return $criteria;
}
- public static function addJoinRepositoryCriteria(Criteria $criteria)
+ public static function addJoinrepositoryCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitInformationObject::REPOSITORY_ID,
QubitRepository::ID);
return $criteria;
}
- public static function addJoinParentCriteria(Criteria $criteria)
+ public static function addJoinparentCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitInformationObject::PARENT_ID,
QubitInformationObject::ID);
return $criteria;
}
- public static function addJoinDescriptionStatusCriteria(Criteria $criteria)
+ public static function addJoindescriptionStatusCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitInformationObject::DESCRIPTION_STATUS_ID,
QubitTerm::ID);
return $criteria;
}
- public static function addJoinDescriptionDetailCriteria(Criteria $criteria)
+ public static function addJoindescriptionDetailCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitInformationObject::DESCRIPTION_DETAIL_ID,
QubitTerm::ID);
@@ -514,7 +514,7 @@
$delta = $this->rgt - $this->lft + 1;
}
- if (null === $parent = $this->offsetGet('Parent', array('connection' =>
$connection)))
+ if (null === $parent = $this->offsetGet('parent', array('connection' =>
$connection)))
{
$statement = $connection->prepare('
SELECT MAX('.QubitInformationObject::RGT.')
Modified: trunk/qubit/lib/model/om/BaseNote.php
===================================================================
--- trunk/qubit/lib/model/om/BaseNote.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseNote.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -494,28 +494,28 @@
$this->setid($key);
}
- public static function addJoinObjectCriteria(Criteria $criteria)
+ public static function addJoinobjectCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitNote::OBJECT_ID, QubitObject::ID);
return $criteria;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitNote::TYPE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinUserCriteria(Criteria $criteria)
+ public static function addJoinuserCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitNote::USER_ID, QubitUser::ID);
return $criteria;
}
- public static function addJoinParentCriteria(Criteria $criteria)
+ public static function addJoinparentCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitNote::PARENT_ID, QubitNote::ID);
@@ -697,7 +697,7 @@
$delta = $this->rgt - $this->lft + 1;
}
- if (null === $parent = $this->offsetGet('Parent', array('connection' =>
$connection)))
+ if (null === $parent = $this->offsetGet('parent', array('connection' =>
$connection)))
{
$statement = $connection->prepare('
SELECT MAX('.QubitNote::RGT.')
Modified: trunk/qubit/lib/model/om/BaseObjectTermRelation.php
===================================================================
--- trunk/qubit/lib/model/om/BaseObjectTermRelation.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BaseObjectTermRelation.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -70,14 +70,14 @@
$this->tables[] =
Propel::getDatabaseMap(QubitObjectTermRelation::DATABASE_NAME)->getTable(QubitObjectTermRelation::TABLE_NAME);
}
- public static function addJoinObjectCriteria(Criteria $criteria)
+ public static function addJoinobjectCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitObjectTermRelation::OBJECT_ID, QubitObject::ID);
return $criteria;
}
- public static function addJoinTermCriteria(Criteria $criteria)
+ public static function addJointermCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitObjectTermRelation::TERM_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BasePermissionScope.php
===================================================================
--- trunk/qubit/lib/model/om/BasePermissionScope.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BasePermissionScope.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -424,21 +424,21 @@
$this->setid($key);
}
- public static function addJoinPermissionCriteria(Criteria $criteria)
+ public static function addJoinpermissionCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPermissionScope::PERMISSION_ID,
QubitPermission::ID);
return $criteria;
}
- public static function addJoinRoleCriteria(Criteria $criteria)
+ public static function addJoinroleCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPermissionScope::ROLE_ID, QubitRole::ID);
return $criteria;
}
- public static function addJoinUserCriteria(Criteria $criteria)
+ public static function addJoinuserCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPermissionScope::USER_ID, QubitUser::ID);
Modified: trunk/qubit/lib/model/om/BasePhysicalObject.php
===================================================================
--- trunk/qubit/lib/model/om/BasePhysicalObject.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BasePhysicalObject.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -205,14 +205,14 @@
return $affectedRows;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPhysicalObject::TYPE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinParentCriteria(Criteria $criteria)
+ public static function addJoinparentCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPhysicalObject::PARENT_ID,
QubitPhysicalObject::ID);
@@ -394,7 +394,7 @@
$delta = $this->rgt - $this->lft + 1;
}
- if (null === $parent = $this->offsetGet('Parent', array('connection' =>
$connection)))
+ if (null === $parent = $this->offsetGet('parent', array('connection' =>
$connection)))
{
$statement = $connection->prepare('
SELECT MAX('.QubitPhysicalObject::RGT.')
Modified: trunk/qubit/lib/model/om/BasePlace.php
===================================================================
--- trunk/qubit/lib/model/om/BasePlace.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BasePlace.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -147,14 +147,14 @@
return $affectedRows;
}
- public static function addJoinCountryCriteria(Criteria $criteria)
+ public static function addJoincountryCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPlace::COUNTRY_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPlace::TYPE_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BasePlaceMapRelation.php
===================================================================
--- trunk/qubit/lib/model/om/BasePlaceMapRelation.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BasePlaceMapRelation.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -72,28 +72,28 @@
$this->tables[] =
Propel::getDatabaseMap(QubitPlaceMapRelation::DATABASE_NAME)->getTable(QubitPlaceMapRelation::TABLE_NAME);
}
- public static function addJoinPlaceCriteria(Criteria $criteria)
+ public static function addJoinplaceCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPlaceMapRelation::PLACE_ID, QubitPlace::ID);
return $criteria;
}
- public static function addJoinMapCriteria(Criteria $criteria)
+ public static function addJoinmapCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPlaceMapRelation::MAP_ID, QubitMap::ID);
return $criteria;
}
- public static function addJoinMapIconImageCriteria(Criteria $criteria)
+ public static function addJoinmapIconImageCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPlaceMapRelation::MAP_ICON_IMAGE_ID,
QubitDigitalObject::ID);
return $criteria;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitPlaceMapRelation::TYPE_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BaseProperty.php
===================================================================
--- trunk/qubit/lib/model/om/BaseProperty.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseProperty.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -462,7 +462,7 @@
$this->setid($key);
}
- public static function addJoinObjectCriteria(Criteria $criteria)
+ public static function addJoinobjectCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitProperty::OBJECT_ID, QubitObject::ID);
Modified: trunk/qubit/lib/model/om/BaseRelation.php
===================================================================
--- trunk/qubit/lib/model/om/BaseRelation.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseRelation.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -72,21 +72,21 @@
$this->tables[] =
Propel::getDatabaseMap(QubitRelation::DATABASE_NAME)->getTable(QubitRelation::TABLE_NAME);
}
- public static function addJoinSubjectCriteria(Criteria $criteria)
+ public static function addJoinsubjectCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRelation::SUBJECT_ID, QubitObject::ID);
return $criteria;
}
- public static function addJoinObjectCriteria(Criteria $criteria)
+ public static function addJoinobjectCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRelation::OBJECT_ID, QubitObject::ID);
return $criteria;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRelation::TYPE_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BaseRepository.php
===================================================================
--- trunk/qubit/lib/model/om/BaseRepository.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseRepository.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -147,21 +147,21 @@
return $affectedRows;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRepository::TYPE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinDescStatusCriteria(Criteria $criteria)
+ public static function addJoindescStatusCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRepository::DESC_STATUS_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinDescDetailCriteria(Criteria $criteria)
+ public static function addJoindescDetailCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRepository::DESC_DETAIL_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BaseRights.php
===================================================================
--- trunk/qubit/lib/model/om/BaseRights.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseRights.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -460,14 +460,14 @@
$this->setid($key);
}
- public static function addJoinObjectCriteria(Criteria $criteria)
+ public static function addJoinobjectCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRights::OBJECT_ID, QubitObject::ID);
return $criteria;
}
- public static function addJoinPermissionCriteria(Criteria $criteria)
+ public static function addJoinpermissionCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRights::PERMISSION_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BaseRightsActorRelation.php
===================================================================
--- trunk/qubit/lib/model/om/BaseRightsActorRelation.php 2008-12-15
18:39:20 UTC (rev 1683)
+++ trunk/qubit/lib/model/om/BaseRightsActorRelation.php 2008-12-15
20:22:52 UTC (rev 1684)
@@ -68,21 +68,21 @@
$this->tables[] =
Propel::getDatabaseMap(QubitRightsActorRelation::DATABASE_NAME)->getTable(QubitRightsActorRelation::TABLE_NAME);
}
- public static function addJoinRightsCriteria(Criteria $criteria)
+ public static function addJoinrightsCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRightsActorRelation::RIGHTS_ID, QubitRights::ID);
return $criteria;
}
- public static function addJoinActorCriteria(Criteria $criteria)
+ public static function addJoinactorCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRightsActorRelation::ACTOR_ID, QubitActor::ID);
return $criteria;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRightsActorRelation::TYPE_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BaseRightsTermRelation.php
===================================================================
--- trunk/qubit/lib/model/om/BaseRightsTermRelation.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BaseRightsTermRelation.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -426,21 +426,21 @@
$this->setid($key);
}
- public static function addJoinRightsCriteria(Criteria $criteria)
+ public static function addJoinrightsCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRightsTermRelation::RIGHTS_ID, QubitRights::ID);
return $criteria;
}
- public static function addJoinTermCriteria(Criteria $criteria)
+ public static function addJointermCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRightsTermRelation::TERM_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRightsTermRelation::TYPE_ID, QubitTerm::ID);
Modified: trunk/qubit/lib/model/om/BaseRolePermissionRelation.php
===================================================================
--- trunk/qubit/lib/model/om/BaseRolePermissionRelation.php 2008-12-15
18:39:20 UTC (rev 1683)
+++ trunk/qubit/lib/model/om/BaseRolePermissionRelation.php 2008-12-15
20:22:52 UTC (rev 1684)
@@ -418,14 +418,14 @@
$this->setid($key);
}
- public static function addJoinRoleCriteria(Criteria $criteria)
+ public static function addJoinroleCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRolePermissionRelation::ROLE_ID, QubitRole::ID);
return $criteria;
}
- public static function addJoinPermissionCriteria(Criteria $criteria)
+ public static function addJoinpermissionCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitRolePermissionRelation::PERMISSION_ID,
QubitPermission::ID);
Modified: trunk/qubit/lib/model/om/BaseSystemEvent.php
===================================================================
--- trunk/qubit/lib/model/om/BaseSystemEvent.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BaseSystemEvent.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -432,14 +432,14 @@
$this->setid($key);
}
- public static function addJoinTypeCriteria(Criteria $criteria)
+ public static function addJointypeCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitSystemEvent::TYPE_ID, QubitTerm::ID);
return $criteria;
}
- public static function addJoinUserCriteria(Criteria $criteria)
+ public static function addJoinuserCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitSystemEvent::USER_ID, QubitUser::ID);
Modified: trunk/qubit/lib/model/om/BaseTerm.php
===================================================================
--- trunk/qubit/lib/model/om/BaseTerm.php 2008-12-15 18:39:20 UTC (rev
1683)
+++ trunk/qubit/lib/model/om/BaseTerm.php 2008-12-15 20:22:52 UTC (rev
1684)
@@ -207,14 +207,14 @@
return $affectedRows;
}
- public static function addJoinTaxonomyCriteria(Criteria $criteria)
+ public static function addJointaxonomyCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitTerm::TAXONOMY_ID, QubitTaxonomy::ID);
return $criteria;
}
- public static function addJoinParentCriteria(Criteria $criteria)
+ public static function addJoinparentCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitTerm::PARENT_ID, QubitTerm::ID);
@@ -1605,7 +1605,7 @@
$delta = $this->rgt - $this->lft + 1;
}
- if (null === $parent = $this->offsetGet('Parent', array('connection' =>
$connection)))
+ if (null === $parent = $this->offsetGet('parent', array('connection' =>
$connection)))
{
$statement = $connection->prepare('
SELECT MAX('.QubitTerm::RGT.')
Modified: trunk/qubit/lib/model/om/BaseUserRoleRelation.php
===================================================================
--- trunk/qubit/lib/model/om/BaseUserRoleRelation.php 2008-12-15 18:39:20 UTC
(rev 1683)
+++ trunk/qubit/lib/model/om/BaseUserRoleRelation.php 2008-12-15 20:22:52 UTC
(rev 1684)
@@ -418,14 +418,14 @@
$this->setid($key);
}
- public static function addJoinUserCriteria(Criteria $criteria)
+ public static function addJoinuserCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitUserRoleRelation::USER_ID, QubitUser::ID);
return $criteria;
}
- public static function addJoinRoleCriteria(Criteria $criteria)
+ public static function addJoinroleCriteria(Criteria $criteria)
{
$criteria->addJoin(QubitUserRoleRelation::ROLE_ID, QubitRole::ID);
Modified: trunk/qubit/lib/propel/builder/QubitObjectBuilder.php
===================================================================
--- trunk/qubit/lib/propel/builder/QubitObjectBuilder.php 2008-12-15
18:39:20 UTC (rev 1683)
+++ trunk/qubit/lib/propel/builder/QubitObjectBuilder.php 2008-12-15
20:22:52 UTC (rev 1684)
@@ -1421,12 +1421,12 @@
public function getFkPhpName(ForeignKey $fk)
{
- if (count($localNames = $fk->getLocalColumns()) != 1 ||
substr($localNames[0], -3) != '_id')
+ if (count($localNames = $fk->getLocalColumns()) < 2 && '_id' ==
substr($localNames[0], -3))
{
- return $this->getFkPhpNameAffix($fk);
+ return
substr($this->getTable()->getColumn($localNames[0])->getPhpName(), 0, -2);
}
- return sfInflector::camelize(substr($localNames[0], 0, -3));
+ return $this->getFkPhpNameAffix($fk);
}
public function getFkVarName(ForeignKey $fk)
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
