Feat: laravel 6 upgrade bug fix getForeignKeyName, getQualifiedForeignKeyName, and getOwnerKeyName

Author: ajayfroiden

src/ApiController.php

@@ -435,7 +435,7 @@ protected function addIncludes()
                         // We need to select foreign key so that Laravel can match to which records these
                         // need to be attached
                         if ($q instanceof BelongsTo) {
-                            $fields[] = $q->getOwnerKey();
+                            $fields[] = $q->getOwnerKeyName();
 
                             if (strpos($key, ".") !== false) {
                                 $parts = explode(".", $key);

src/ApiModel.php

@@ -265,7 +265,7 @@ public function fill(array $attributes = [])
                         }
                     }
 
-                    $relationKey = $relation->getForeignKey();
+                    $relationKey = $relation->getForeignKeyName();
 
                     $this->setAttribute($relationKey, ($attribute === null) ? null : $model->getKey());
                 }
@@ -302,7 +302,7 @@ public function save(array $options = [])
                     }
                 }
 
-                $relationKey = $relation->getForeignKey();
+                $relationKey = $relation->getForeignKeyName();
 
                 $this->setAttribute($relationKey, ($relationAttribute === null) ? null : $model->getKey());
 
@@ -395,4 +395,4 @@ public function save(array $options = [])
             }
         }
     }
-}
+}

src/RequestParser.php

@@ -426,7 +426,7 @@ private function parseFields($fields)
                         $fieldParts = explode(".", $fieldName);
 
                         if ($relation instanceof BelongsTo) {
-                            $singular = $relation->getForeignKey();
+                            $singular = $relation->getForeignKeyName();
                         }
                         else if ($relation instanceof HasOne || $relation instanceof HasMany) {
                             $singular = $relation->getForeignKeyName();
@@ -475,7 +475,7 @@ private function parseFields($fields)
                             $keyField = explode(".", $relation->getQualifiedParentKeyName())[1];
                         }
                         else if ($relation instanceof BelongsTo) {
-                            $keyField = explode(".", $relation->getQualifiedForeignKey())[1];
+                            $keyField = explode(".", $relation->getQualifiedForeignKeyName())[1];
                         }
 
                         if (isset($keyField) && !in_array($keyField, $this->fields)) {
@@ -507,4 +507,4 @@ private function loadTableName()
         $this->table = call_user_func($this->model."::getTableName");
     }
 
-}
+}