Add auto-incrementing column to both pivot tables

Closes #382
JosephSilber · Jan 15, 2019 · d2c2a8a · d2c2a8a
1 parent f143275
commit d2c2a8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/migrations/create_bouncer_tables.php b/migrations/create_bouncer_tables.php
@@ -42,6 +42,7 @@ public function up()
         });
 
         Schema::create(Models::table('assigned_roles'), function (Blueprint $table) {
+            $table->increments('id');
             $table->integer('role_id')->unsigned()->index();
             $table->integer('entity_id')->unsigned();
             $table->string('entity_type');
@@ -60,6 +61,7 @@ public function up()
         });
 
         Schema::create(Models::table('permissions'), function (Blueprint $table) {
+            $table->increments('id');
             $table->integer('ability_id')->unsigned()->index();
             $table->integer('entity_id')->unsigned();
             $table->string('entity_type');

diff --git a/src/Conductors/Concerns/AssociatesAbilities.php b/src/Conductors/Concerns/AssociatesAbilities.php
@@ -28,17 +28,20 @@ protected function getAuthority()
      *
      * @param  \Illuminate\Database\Eloquent\Model  $authority
      * @param  array  $abilityIds
-     * @param  bool $forbidden
+     * @param  bool  $forbidden
      * @return array
      */
     protected function getAssociatedAbilityIds(Model $authority, array $abilityIds, $forbidden)
     {
         $relation = $authority->abilities();
 
-        $relation->whereIn('id', $abilityIds)->wherePivot('forbidden', '=', $forbidden);
+        $table = Models::table('abilities');
+
+        $relation->whereIn("{$table}.id", $abilityIds)
+                 ->wherePivot('forbidden', '=', $forbidden);
 
         Models::scope()->applyToRelation($relation);
 
-        return $relation->get(['id'])->pluck('id')->all();
+        return $relation->get(["{$table}.id"])->pluck('id')->all();
     }
 }