Re: r8741 - in trunk: lib/model/om lib/propel/builder plugins/qbAclPlugin/lib/model/om

Mon, 01 Nov 2010 12:51:35 -0700 

Wow, nice one. Thanks Jack! :)

D


On 1-Nov-10, at 11:55 AM, [email protected] wrote:


Author: jablko
Date: Mon Nov  1 11:55:19 2010
New Revision: 8741

Log:
On update, build "WHERE" clause from $keys, vs. $row, which may be incomplete
$row is loaded on demand. This is because, in case of multi-table inheritance, the class (and hence the tables to load from) isn't known until after the instance is loaded
e.g. QubitActor::getById(...) may be a QubitRepository, QubitUser, or simply a QubitActor. So we don't know whether to build $row by joining the "repository" or "user" table. So if it's a QubitRepository or QubitUser, then $row is initially incomplete
->update() doesn't load the complete $row because there's no demand: old values aren't needed to update a row, only new values and primary key (and optimistic lock) are needed. Primary key (and optimistic lock) is stored in the base table, which is always loaded, and according to multi-table inheritance, primary keys of subclasses' tables are all identical 

Modified:
  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/BaseMap.php
  trunk/lib/model/om/BaseMapI18n.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/BasePlaceI18n.php
  trunk/lib/model/om/BaseProperty.php
  trunk/lib/model/om/BasePropertyI18n.php
  trunk/lib/model/om/BaseRepositoryI18n.php
  trunk/lib/model/om/BaseRights.php
  trunk/lib/model/om/BaseRightsI18n.php
  trunk/lib/model/om/BaseRightsTermRelation.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/BaseSystemEvent.php
  trunk/lib/model/om/BaseTaxonomyI18n.php
  trunk/lib/model/om/BaseTermI18n.php
  trunk/lib/propel/builder/QubitObjectBuilder.php
  trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
  trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
  trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
  trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php

Modified: trunk/lib/model/om/BaseActorI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseActorI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseActorI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -488,7 +488,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseContactInformation.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseContactInformation.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseContactInformation.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -561,7 +561,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseContactInformationI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseContactInformationI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseContactInformationI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -470,7 +470,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseEventI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseEventI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseEventI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -468,7 +468,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseFunctionI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseFunctionI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseFunctionI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -482,7 +482,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseInformationObjectI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseInformationObjectI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseInformationObjectI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -504,7 +504,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseMap.php
= = = = = = = = ====================================================================== 
--- trunk/lib/model/om/BaseMap.php      Mon Nov  1 11:30:17 2010        (r8740)
+++ trunk/lib/model/om/BaseMap.php      Mon Nov  1 11:55:19 2010        (r8741)
@@ -559,7 +559,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseMapI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseMapI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseMapI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -466,7 +466,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseMenu.php
= = = = = = = = ====================================================================== 
--- trunk/lib/model/om/BaseMenu.php     Mon Nov  1 11:30:17 2010        (r8740)
+++ trunk/lib/model/om/BaseMenu.php     Mon Nov  1 11:55:19 2010        (r8741)
@@ -665,7 +665,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseMenuI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseMenuI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseMenuI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -466,7 +466,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseNote.php
= = = = = = = = ====================================================================== 
--- trunk/lib/model/om/BaseNote.php     Mon Nov  1 11:30:17 2010        (r8740)
+++ trunk/lib/model/om/BaseNote.php     Mon Nov  1 11:55:19 2010        (r8741)
@@ -669,7 +669,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseNoteI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseNoteI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseNoteI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -464,7 +464,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseOaiHarvest.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseOaiHarvest.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseOaiHarvest.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -475,7 +475,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseOaiRepository.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseOaiRepository.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseOaiRepository.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -493,7 +493,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseObject.php
= = = = = = = = ====================================================================== 
--- trunk/lib/model/om/BaseObject.php   Mon Nov  1 11:30:17 2010        (r8740)
+++ trunk/lib/model/om/BaseObject.php   Mon Nov  1 11:55:19 2010        (r8741)
@@ -687,7 +687,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseOtherName.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseOtherName.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseOtherName.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -541,7 +541,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseOtherNameI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseOtherNameI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseOtherNameI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -466,7 +466,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BasePhysicalObjectI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BasePhysicalObjectI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BasePhysicalObjectI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -468,7 +468,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BasePlaceI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BasePlaceI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BasePlaceI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -470,7 +470,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseProperty.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseProperty.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseProperty.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -543,7 +543,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BasePropertyI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BasePropertyI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BasePropertyI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -464,7 +464,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseRepositoryI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseRepositoryI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseRepositoryI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -492,7 +492,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseRights.php
= = = = = = = = ====================================================================== 
--- trunk/lib/model/om/BaseRights.php   Mon Nov  1 11:30:17 2010        (r8740)
+++ trunk/lib/model/om/BaseRights.php   Mon Nov  1 11:55:19 2010        (r8741)
@@ -585,7 +585,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseRightsI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseRightsI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseRightsI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -464,7 +464,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseRightsTermRelation.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseRightsTermRelation.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseRightsTermRelation.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -471,7 +471,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseSetting.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseSetting.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseSetting.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -541,7 +541,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseSettingI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseSettingI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseSettingI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -464,7 +464,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseSlug.php
= = = = = = = = ====================================================================== 
--- trunk/lib/model/om/BaseSlug.php     Mon Nov  1 11:30:17 2010        (r8740)
+++ trunk/lib/model/om/BaseSlug.php     Mon Nov  1 11:55:19 2010        (r8741)
@@ -463,7 +463,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseStaticPageI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseStaticPageI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseStaticPageI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -466,7 +466,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseStatus.php
= = = = = = = = ====================================================================== 
--- trunk/lib/model/om/BaseStatus.php   Mon Nov  1 11:30:17 2010        (r8740)
+++ trunk/lib/model/om/BaseStatus.php   Mon Nov  1 11:55:19 2010        (r8741)
@@ -469,7 +469,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseSystemEvent.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseSystemEvent.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseSystemEvent.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -477,7 +477,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseTaxonomyI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseTaxonomyI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseTaxonomyI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -466,7 +466,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/model/om/BaseTermI18n.php
= = = = = = = = ====================================================================== --- trunk/lib/model/om/BaseTermI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/model/om/BaseTermI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -464,7 +464,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/lib/propel/builder/QubitObjectBuilder.php
= = = = = = = = ====================================================================== --- trunk/lib/propel/builder/QubitObjectBuilder.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/lib/propel/builder/QubitObjectBuilder.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -1592,7 +1592,7 @@

        if (\$column->isPrimaryKey())
        {
- \$selectCriteria->add(\$column->getFullyQualifiedName(), \ $this->row[\$offset]); + \$selectCriteria->add(\$column->getFullyQualifiedName(), \ $this->keys[\$column->getPhpName()]); 
        }

        \$offset++;

Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php
= = = = = = = = ====================================================================== --- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroup.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -705,7 +705,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
= = = = = = = = ====================================================================== --- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -466,7 +466,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php
= = = = = = = = ====================================================================== --- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclPermission.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -477,7 +477,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

Modified: trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php
= = = = = = = = ====================================================================== --- trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Mon Nov 1 11:30:17 2010 (r8740) +++ trunk/plugins/qbAclPlugin/lib/model/om/BaseAclUserGroup.php Mon Nov 1 11:55:19 2010 (r8741) 
@@ -463,7 +463,7 @@

        if ($column->isPrimaryKey())
        {
- $selectCriteria->add($column->getFullyQualifiedName(), $this->row[$offset]); + $selectCriteria->add($column->getFullyQualifiedName(), $this->keys[$column->getPhpName()]); 
        }

        $offset++;

--
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 . 



David Juhasz,
Software Engineer, Artefactual Systems Inc.
http://www.artefactual.com | P: 604.527.2056 | F: 604.521.2059

--
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.

Reply via email to