Correct PK column constant in parent classes for tablePrefix

VanTanev · Dec 5, 2014 · db9fc29 · db9fc29
1 parent ae192b1
commit db9fc29
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/EqualNestParentBehaviorObjectBuilderModifier.php b/src/EqualNestParentBehaviorObjectBuilderModifier.php
@@ -155,7 +155,7 @@ protected function addGetRelatedCollection($builder)
             'queryClassname'        => $builder->getStubQueryBuilder()->getClassname(),
             'varListRelatedPKs'     => $this->getEqualNestListPksName($builder),
             'varRelatedObjectsColl' => $this->getEqualNestCollectionName($builder),
-            'pk'                    => $this->behavior->getFirstPrimaryKey(),
+            'pk'                    => $builder->getStubObjectBuilder()->getColumnConstant( $this->behavior->getFirstPrimaryKey() ),
         ), '/templates/parent/');
     }
 
@@ -215,7 +215,7 @@ protected function countObjectsInRelatedCollection($builder)
             'varListRelatedPKs'     => $this->getEqualNestListPksName($builder),
             'varRelatedObjectsColl' => $this->getEqualNestCollectionName($builder),
             'queryClassname'        => $builder->getStubQueryBuilder()->getClassname(),
-            'pk'                    => $this->behavior->getFirstPrimaryKey(),
+            'pk'                    => $builder->getStubObjectBuilder()->getColumnConstant( $this->behavior->getFirstPrimaryKey() ),
         ), '/templates/parent/');
     }
 

diff --git a/src/templates/parent/addGetRelatedCollection.php b/src/templates/parent/addGetRelatedCollection.php
@@ -24,7 +24,7 @@ public function get<?php echo $pluralRefTableName ?>(Criteria $criteria = null,
             $this->init<?php echo $pluralRefTableName ?>();
         } else {
             $newCollection = <?php echo $queryClassname ?>::create(null, $criteria)
-                ->addUsingAlias(<?php echo $pk->getConstantName() ?>, $this-><?php echo $varListRelatedPKs ?>, Criteria::IN)
+                ->addUsingAlias(<?php echo $pk ?>, $this-><?php echo $varListRelatedPKs ?>, Criteria::IN)
                 ->find($con);
 
             if (null !== $criteria) {

diff --git a/src/templates/parent/countObjectsInRelatedCollection.php b/src/templates/parent/countObjectsInRelatedCollection.php
@@ -24,7 +24,7 @@ public function count<?php echo $pluralRefTableName ?>(Criteria $criteria = null
             }
 
             return $query
-                ->addUsingAlias(<?php echo $pk->getConstantName() ?>, $this-><?php echo $varListRelatedPKs ?>, Criteria::IN)
+                ->addUsingAlias(<?php echo $pk ?>, $this-><?php echo $varListRelatedPKs ?>, Criteria::IN)
                 ->count($con);
         }
     } else {