Alias fields to avoid ambiguity.

Closes #6794
cakephp · Jun 12, 2015 · 8397027 · 8397027
1 parent 2062361
commit 8397027
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/ORM/Behavior/TreeBehavior.php b/src/ORM/Behavior/TreeBehavior.php
@@ -772,19 +772,20 @@ protected function _recoverTree($counter = 0, $parentId = null, $level = -1)
     {
         $config = $this->config();
         list($parent, $left, $right) = [$config['parent'], $config['left'], $config['right']];
-        $pk = (array)$this->_table->primaryKey();
+        $primaryKey = $this->_getPrimaryKey();
+        $aliasedPrimaryKey = $this->_table->aliasField($primaryKey);
 
         $query = $this->_scope($this->_table->query())
-            ->select($pk)
-            ->where([$parent . ' IS' => $parentId])
-            ->order($pk)
+            ->select([$aliasedPrimaryKey])
+            ->where([$this->_table->aliasField($parent) . ' IS' => $parentId])
+            ->order([$aliasedPrimaryKey])
             ->hydrate(false);
 
         $leftCounter = $counter;
         $nextLevel = $level + 1;
         foreach ($query as $row) {
             $counter++;
-            $counter = $this->_recoverTree($counter, $row[$pk[0]], $nextLevel);
+            $counter = $this->_recoverTree($counter, $row[$primaryKey], $nextLevel);
         }
 
         if ($parentId === null) {
@@ -798,7 +799,7 @@ protected function _recoverTree($counter = 0, $parentId = null, $level = -1)
 
         $this->_table->updateAll(
             $fields,
-            [$pk[0] => $parentId]
+            [$primaryKey => $parentId]
         );
 
         return $counter + 1;