Merge pull request #14 from divine/pr/13

merge

Author: divine

Dockerfile

@@ -1,11 +1,11 @@
 ARG PHP_VERSION=7.2
 ARG COMPOSER_VERSION=1.8
 
-FROM composer:${COMPOSER_VERSION}
+FROM composer:${COMPOSER_VERSION} as composer
 FROM php:${PHP_VERSION}-cli
 
 RUN apt-get update && \
-    apt-get install -y autoconf pkg-config libssl-dev git libzip-dev zlib1g-dev && \
+    apt-get install -y autoconf pkg-config libssl-dev git libzip-dev zlib1g-dev unzip --no-install-recommends && \
     pecl install mongodb && docker-php-ext-enable mongodb && \
     pecl install xdebug && docker-php-ext-enable xdebug && \
     docker-php-ext-install -j$(nproc) pdo_mysql zip

docker-compose.yml

@@ -7,7 +7,7 @@ services:
             context: .
             dockerfile: Dockerfile
         volumes:
-            - .:/code
+            - ./:/code
         working_dir: /code
         depends_on:
           - mongodb

src/Jenssegers/Mongodb/Relations/BelongsTo.php

@@ -3,6 +3,7 @@
 namespace Jenssegers\Mongodb\Relations;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
 
 class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo
@@ -25,7 +26,9 @@ public function addConstraints()
             // For belongs to relationships, which are essentially the inverse of has one
             // or has many relationships, we need to actually query on the primary key
             // of the related models matching on the foreign key that's on a parent.
-            $this->query->where($this->getOwnerKey(), '=', $this->parent->{$this->foreignKey});
+            $this->query
+                ->where($this->getOwnerKey(), '=', $this->parent->{$this->foreignKey})
+                ->orWhere($this->getOwnerKey().'._id', '=', $this->parent->{$this->foreignKey});
         }
     }
 
@@ -69,4 +72,34 @@ protected function whereInMethod(EloquentModel $model, $key)
     {
         return 'whereIn';
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function match(array $models, Collection $results, $relation)
+    {
+        $foreign = $this->foreignKey;
+
+        $owner = $this->ownerKey;
+
+        // First we will get to build a dictionary of the child models by their primary
+        // key of the relationship, then we can easily match the children back onto
+        // the parents using that dictionary and the primary key of the children.
+        $dictionary = [];
+
+        foreach ($results as $result) {
+            $dictionary[$result->getAttribute($owner)] = $result;
+        }
+
+        // Once we have the dictionary constructed, we can loop through all the parents
+        // and match back onto their children using these keys of the dictionary and
+        // the primary key of the children to map them onto the correct instances.
+        foreach ($models as $model) {
+            if (isset($dictionary[(string) $model->{$foreign}])) {
+                $model->setRelation($relation, $dictionary[(string) $model->{$foreign}]);
+            }
+        }
+
+        return $models;
+    }
 }