Multiple joins (lookups) and unwinds in a query

TCB13 · Oct 31, 2019 · b5dd045 · b5dd045
1 parent 246067a
commit b5dd045
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
@@ -120,13 +120,13 @@ public function findAll(): self
             $pipeline = [];
         }
 
-        if (!empty($this->lookup)) // Lookups should ALWAYS be the first ones
-        {
-            $pipeline[] = $this->lookup;
+        // Lookups should ALWAYS be the first ones
+        if (!empty($this->lookup)) {
+            $pipeline = array_merge($pipeline, $this->lookup);
         }
 
         if (!empty($this->unwind)) {
-            $pipeline[] = $this->unwind;
+            $pipeline = array_merge($pipeline, $this->unwind);
         }
 
         if (!empty($this->addFields)) {
@@ -423,7 +423,7 @@ public function join($collection, $localField, $operatorOrForeignField, $foreign
             ]
         ];
 
-        $this->lookup = [
+        $this->lookup[] = [
             "\$lookup" => [
                 "from"     => key($collection),
                 "let"      => [reset($foreignField) => "\$" . $localField],
@@ -432,7 +432,7 @@ public function join($collection, $localField, $operatorOrForeignField, $foreign
             ],
         ];
 
-        $this->unwind = [
+        $this->unwind[] = [
             "\$unwind" => ["path" => "\$" . reset($collection)]
         ];