Merge pull request #10 from spiral/join-method-forced

Update AbstractLoader.php
spiral-modules · Jul 27, 2017 · d2b929e · d2b929e
2 parents 2e3125f + 421b354
commit d2b929e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/source/Spiral/ORM/Entities/Loaders/AbstractLoader.php b/source/Spiral/ORM/Entities/Loaders/AbstractLoader.php
@@ -184,8 +184,10 @@ final public function loadRelation(
         }
 
         if ($join) {
-            //Let's tell our loaded that it's method is JOIN (forced)
-            $options['method'] = self::JOIN;
+            if (empty($options['method']) || !in_array($options['method'], [self::JOIN, self::LEFT_JOIN])) {
+                //Let's tell our loaded that it's method is JOIN (forced)
+                $options['method'] = self::JOIN;
+            }
         }
 
         if (isset($loaders[$relation])) {
@@ -364,4 +366,4 @@ private function loadChain(string $chain, array $options, bool $join): LoaderInt
             $join
         );
     }
-}
+}