Merge pull request #104 from moufmouf/ref_no_prim_key_reverse

Reverse relationship on beans with foreign key on non primary key fails

Author: moufmouf

src/Utils/DirectForeignKeyMethodDescriptor.php

@@ -120,11 +120,11 @@ private function getFilters(ForeignKeyConstraint $fk) : string
         $counter = 0;
         $parameters = [];
 
-        $pkColumns = TDBMDaoGenerator::getPrimaryKeyColumnsOrFail($this->mainTable);
+        $fkForeignColumns = $fk->getUnquotedForeignColumns();
 
         foreach ($fk->getUnquotedLocalColumns() as $columnName) {
-            $pkColumn = $pkColumns[$counter];
-            $parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($fk->getLocalTableName().'.'.$columnName, true), var_export($pkColumn, true), var_export($this->fk->getForeignTableName(), true));
+            $fkColumn = $fkForeignColumns[$counter];
+            $parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($fk->getLocalTableName().'.'.$columnName, true), var_export($fkColumn, true), var_export($this->fk->getForeignTableName(), true));
             ++$counter;
         }
         $parametersCode = '['.implode(', ', $parameters).']';

tests/TDBMDaoGeneratorTest.php

@@ -1602,6 +1602,9 @@ public function testForeignKeyPointingToNonPrimaryKey()
         $newBean = new RefNoPrimKeyBean($bean, 'baz');
         $dao->save($newBean);
         $this->assertSame('foo', $newBean->getFrom()->getTo());
+
+        $resultSet = $bean->getRefNoPrimKey();
+        $this->assertCount(2, $resultSet);
     }
 
     /**