Fix support for pivot models

wintercms · Jul 29, 2024 · c4abef8 · c4abef8
1 parent 3fcb603
commit c4abef8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Database/Model.php b/src/Database/Model.php
@@ -849,12 +849,10 @@ public function newPivot(EloquentModel $parent, array $attributes, $table, $exis
      */
     public function newRelationPivot($relationName, $parent, $attributes, $table, $exists)
     {
-        $definition = $this->getRelationDefinition($relationName);
+        $relation = $this->{$relationName}();
+        $pivotModel = $relation->getPivotClass();
 
-        if (!is_null($definition) && array_key_exists('pivotModel', $definition)) {
-            $pivotModel = $definition['pivotModel'];
-            return $pivotModel::fromAttributes($parent, $attributes, $table, $exists);
-        }
+        return $pivotModel::fromAttributes($parent, $attributes, $table, $exists);
     }
 
     //

diff --git a/src/Database/Relations/BelongsToMany.php b/src/Database/Relations/BelongsToMany.php
@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsToMany as BelongsToManyBase;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
+use Winter\Storm\Database\Pivot;
 
 class BelongsToMany extends BelongsToManyBase implements Relation
 {
@@ -35,6 +36,14 @@ public function __construct(
         $this->extendableRelationConstruct();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function getPivotClass()
+    {
+        return $this->using ?? Pivot::class;
+    }
+
     /**
      * {@inheritDoc}
      */