improvements to hasOne, hasMany, belongsTo to only get correct related data

Author: David Nahodyl

src/Database/Eloquent/Concerns/FMHasRelationships.php

@@ -4,6 +4,8 @@
 namespace BlueFeather\EloquentFileMaker\Database\Eloquent\Concerns;
 
 use BlueFeather\EloquentFileMaker\Database\Eloquent\Relations\BelongsTo;
+use BlueFeather\EloquentFileMaker\Database\Eloquent\Relations\HasMany;
+use BlueFeather\EloquentFileMaker\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
@@ -58,12 +60,43 @@ public function hasMany($related, $foreignKey = null, $localKey = null)
      * @param string $foreignKey
      * @param string $ownerKey
      * @param string $relation
+     * @return BelongsTo
      */
     protected function newBelongsTo(Builder $query, Model $child, $foreignKey, $ownerKey, $relation)
     {
         // custom version of this so we can return our own BelongsTo class with a custom constraint for FM
         return new BelongsTo($query, $child, $foreignKey, $ownerKey, $relation);
     }
 
+    /**
+     * Instantiate a new HasMany relationship.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param \Illuminate\Database\Eloquent\Model $parent
+     * @param string $foreignKey
+     * @param string $localKey
+     * @return HasMany
+     */
+    protected function newHasMany(Builder $query, Model $parent, $foreignKey, $localKey)
+    {
+        // custom version of this so we can return our own BelongsTo class with a custom constraint for FM
+        return new HasMany($query, $parent, $foreignKey, $localKey);
+    }
+
+    /**
+     * Instantiate a new HasOne relationship.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param \Illuminate\Database\Eloquent\Model $parent
+     * @param string $foreignKey
+     * @param string $localKey
+     * @return HasOne
+     */
+    protected function newHasOne(Builder $query, Model $parent, $foreignKey, $localKey)
+    {
+        // custom version of this so we can return our own BelongsTo class with a custom constraint for FM
+        return new HasOne($query, $parent, $foreignKey, $localKey);
+    }
+
 
 }

src/Database/Eloquent/Relations/BelongsTo.php

@@ -19,7 +19,7 @@ public function addConstraints()
             // of the related models matching on the foreign key that's on a parent.
             $table = $this->related->getTable();
 
-            $this->query->where($this->ownerKey, $this->child->{$this->foreignKey});
+            $this->query->where($this->ownerKey, '=', $this->child->{$this->foreignKey});
         }
     }
 }

src/Database/Eloquent/Relations/HasMany.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace BlueFeather\EloquentFileMaker\Database\Eloquent\Relations;
+
+
+class HasMany extends \Illuminate\Database\Eloquent\Relations\HasMany
+{
+
+    /**
+     * Set the base constraints on the relation query.
+     *
+     * @return void
+     */
+    public function addConstraints()
+    {
+        if (static::$constraints) {
+            $this->query->where($this->foreignKey, '=', $this->getParentKey());
+        }
+    }
+
+}

src/Database/Eloquent/Relations/HasOne.php

@@ -0,0 +1,20 @@
+<?php
+
+
+namespace BlueFeather\EloquentFileMaker\Database\Eloquent\Relations;
+
+
+class HasOne extends \Illuminate\Database\Eloquent\Relations\HasOne
+{
+    /**
+     * Set the base constraints on the relation query.
+     *
+     * @return void
+     */
+    public function addConstraints()
+    {
+        if (static::$constraints) {
+            $this->query->where($this->foreignKey, '=', $this->getParentKey());
+        }
+    }
+}