Fixes ambiguous column error in ExistsIn, fixes #5877

cakephp · Feb 12, 2015 · 0b65594 · markstory · Feb 13, 2015 · 0b65594
1 parent deca637
commit 0b65594
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/ORM/Rule/ExistsIn.php b/src/ORM/Rule/ExistsIn.php
@@ -78,8 +78,15 @@ public function __invoke(EntityInterface $entity, array $options)
             return true;
         }
 
+        $alias = $this->_repository->alias();
+        $primary = array_map(
+            function ($key) use ($alias) {
+                return "$alias.$key";
+            },
+            (array)$this->_repository->primaryKey()
+        );
         $conditions = array_combine(
-            (array)$this->_repository->primaryKey(),
+            $primary,
             $entity->extract($this->_fields)
         );
         return $this->_repository->exists($conditions);

diff --git a/tests/TestCase/ORM/RulesCheckerIntegrationTest.php b/tests/TestCase/ORM/RulesCheckerIntegrationTest.php
@@ -548,6 +548,32 @@ public function testExistsInWithCleanFields()
         $this->assertSame($entity, $table->save($entity));
     }
 
+    /**
+     * Tests the existsIn with coflicting columns
+     *
+     * @group save
+     * @return void
+     */
+    public function testExistsInAliasPrefix()
+    {
+        $entity = new Entity([
+            'title' => 'An Article',
+            'author_id' => 500
+        ]);
+
+        $table = TableRegistry::get('Articles');
+        $table->belongsTo('Authors');
+        $rules = $table->rulesChecker();
+        $rules->add($rules->existsIn('author_id', 'Authors'));
+
+        $table->Authors->eventManager()->on('Model.beforeFind', function ($event, $query) {
+            $query->leftJoin(['a2' => 'authors']);
+        });
+
+        $this->assertFalse($table->save($entity));
+        $this->assertEquals(['_existsIn' => 'This value does not exist'], $entity->errors('author_id'));
+    }
+
     /**
      * Tests using rules to prevent delete operations
      *