fix for #513

Author: mevdschee

api.php

@@ -4931,12 +4931,10 @@ private function addJoinsForTables(ReflectedTable $t1, PathTree $joins, array &$
             if ($belongsTo) {
                 $fkValues = $this->getFkEmptyValues($t1, $t2, $records);
                 $this->addFkRecords($t2, $fkValues, $params, $db, $newRecords);
-            }
-            if ($hasMany) {
+            } elseif ($hasMany) {
                 $pkValues = $this->getPkEmptyValues($t1, $records);
                 $this->addPkRecords($t1, $t2, $pkValues, $params, $db, $newRecords);
-            }
-            if ($hasAndBelongsToMany) {
+            } elseif ($hasAndBelongsToMany) {
                 $habtmValues = $this->getHabtmEmptyValues($t1, $t2, $t3, $db, $records);
                 $this->addFkRecords($t2, $habtmValues->fkValues, $params, $db, $newRecords);
             }
@@ -4946,12 +4944,10 @@ private function addJoinsForTables(ReflectedTable $t1, PathTree $joins, array &$
             if ($fkValues != null) {
                 $this->fillFkValues($t2, $newRecords, $fkValues);
                 $this->setFkValues($t1, $t2, $records, $fkValues);
-            }
-            if ($pkValues != null) {
+            } elseif ($pkValues != null) {
                 $this->fillPkValues($t1, $t2, $newRecords, $pkValues);
                 $this->setPkValues($t1, $t2, $records, $pkValues);
-            }
-            if ($habtmValues != null) {
+            } elseif ($habtmValues != null) {
                 $this->fillFkValues($t2, $newRecords, $habtmValues->fkValues);
                 $this->setHabtmValues($t1, $t3, $records, $habtmValues);
             }

src/Tqdev/PhpCrudApi/Record/RelationJoiner.php

@@ -107,12 +107,10 @@ private function addJoinsForTables(ReflectedTable $t1, PathTree $joins, array &$
             if ($belongsTo) {
                 $fkValues = $this->getFkEmptyValues($t1, $t2, $records);
                 $this->addFkRecords($t2, $fkValues, $params, $db, $newRecords);
-            }
-            if ($hasMany) {
+            } elseif ($hasMany) {
                 $pkValues = $this->getPkEmptyValues($t1, $records);
                 $this->addPkRecords($t1, $t2, $pkValues, $params, $db, $newRecords);
-            }
-            if ($hasAndBelongsToMany) {
+            } elseif ($hasAndBelongsToMany) {
                 $habtmValues = $this->getHabtmEmptyValues($t1, $t2, $t3, $db, $records);
                 $this->addFkRecords($t2, $habtmValues->fkValues, $params, $db, $newRecords);
             }
@@ -122,12 +120,10 @@ private function addJoinsForTables(ReflectedTable $t1, PathTree $joins, array &$
             if ($fkValues != null) {
                 $this->fillFkValues($t2, $newRecords, $fkValues);
                 $this->setFkValues($t1, $t2, $records, $fkValues);
-            }
-            if ($pkValues != null) {
+            } elseif ($pkValues != null) {
                 $this->fillPkValues($t1, $t2, $newRecords, $pkValues);
                 $this->setPkValues($t1, $t2, $records, $pkValues);
-            }
-            if ($habtmValues != null) {
+            } elseif ($habtmValues != null) {
                 $this->fillFkValues($t2, $newRecords, $habtmValues->fkValues);
                 $this->setHabtmValues($t1, $t3, $records, $habtmValues);
             }