fix relationship type guesser

Fixes directus#730
softdzx · Jan 25, 2019 · 47d6aa3 · 47d6aa3
1 parent a3d7dc1
commit 47d6aa3
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/core/Directus/Database/Schema/Object/FieldRelationship.php b/src/core/Directus/Database/Schema/Object/FieldRelationship.php
@@ -108,24 +108,28 @@ public function isOneToMany()
      */
     protected function guessType()
     {
-        $fieldName = $this->fromField->getName();
-        $isAlias = $this->fromField->isAlias();
         $type = null;
 
         if (!$this->fromField) {
-            $type = null;
-        } else if (
+            return $type;
+        }
+
+        $fieldName = $this->fromField->getName();
+        $fieldCollectionName = $this->fromField->getCollectionName();
+        $isAlias = $this->fromField->isAlias();
+
+        if (
             !$isAlias                   &&
             $this->getCollectionOne()   !== null &&
             $this->getFieldMany()       === $fieldName &&
-            $this->getCollectionMany()  !== null
+            $this->getCollectionMany()  === $fieldCollectionName
         ) {
             $type = static::MANY_TO_ONE;
         } else if (
             $isAlias                    &&
             $this->getCollectionMany()  !== null &&
             $this->getFieldOne()        === $fieldName &&
-            $this->getCollectionOne()   !== null
+            $this->getCollectionOne()   === $fieldCollectionName
         ) {
             $type = static::ONE_TO_MANY;
         }