Improved relation support

libern · Aug 16, 2018 · d5450bf · d5450bf
1 parent dc303ac
commit d5450bf
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/Database/Eloquent/Concerns/HasAttributes.php b/src/Database/Eloquent/Concerns/HasAttributes.php
@@ -4,6 +4,9 @@
 
 namespace Libern\LaravelClickHouse\Database\Eloquent\Concerns;
 
+use LogicException;
+use Illuminate\Database\Eloquent\Relations\Relation as BaseRelation;
+use Libern\LaravelClickHouse\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\Concerns\HasAttributes as BaseHasAttributes;
 
 trait HasAttributes
@@ -24,4 +27,19 @@ protected function getDateFormat(): string
     {
         return $this->dateFormat ?? 'Y-m-d H:i:s';
     }
+
+    protected function getRelationshipFromMethod($method)
+    {
+        $relation = $this->$method();
+
+        if (! ($relation instanceof Relation || $relation instanceof BaseRelation)) {
+            throw new LogicException(sprintf(
+                '%s::%s must return a relationship instance.', static::class, $method
+            ));
+        }
+
+        return tap($relation->getResults(), function ($results) use ($method) {
+            $this->setRelation($method, $results);
+        });
+    }
 }