Avoiding table field name collisions while searching for associated d…

…ata by primary key
cakephp · Mar 17, 2015 · 266f6d2 · 266f6d2
1 parent 93105f8
commit 266f6d2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -108,9 +108,10 @@ public function one(array $data, array $options = [])
         $primaryKey = $schema->primaryKey();
 
         if (array_intersect($primaryKey, array_keys($data)) == $primaryKey) {
+            $tableName=$this->_table->table();
             $record = $this->_table->find('all');
             foreach ($primaryKey as $pkey) {
-                $record->where(["$pkey" => $data[$pkey] ]);
+                $record->where(["$tableName.$pkey" => $data[$pkey] ]);
             }
 
             $record = $record->first();