fix: extra constraint that does not apply to subselect query

JosephSilber#508

src/BouncerServiceProvider.php

@@ -33,6 +33,7 @@ public function register()
     public function boot()
     {
         $this->registerMorphs();
+        $this->setTablePrefix();
         $this->setUserModel();
 
         $this->registerAtGate();
@@ -78,6 +79,32 @@ protected function registerMorphs()
         Models::updateMorphMap();
     }
 
+    /**
+     * Set the table prefix for Bouncer's tables.
+     *
+     * @return void
+     */
+    protected function setTablePrefix()
+    {
+        if ($prefix = $this->getTablePrefix()) {
+            Models::setPrefix($prefix);
+        }
+    }
+
+    /**
+     * Get the configured table prefix.
+     *
+     * @return string|null
+     */
+    protected function getTablePrefix()
+    {
+        $config = $this->app->config['database'];
+
+        $connection = Arr::get($config, 'default');
+
+        return Arr::get($config, "connections.{$connection}.prefix");
+    }
+
     /**
      * Publish the package's middleware.
      *

src/Database/Models.php

@@ -13,6 +13,13 @@
 
 class Models
 {
+    /**
+     * The prefix for all tables.
+     *
+     * @var string
+     */
+    protected static $prefix = '';
+
     /**
      * Map of bouncer's models.
      *
@@ -93,6 +100,17 @@ public static function setTables(array $map)
         static::updateMorphMap();
     }
 
+    /**
+     * Set the prefix for the tables.
+     *
+     * @param  string  $prefix
+     * @return void
+     */
+    public static function setPrefix($prefix)
+    {
+        static::$prefix = $prefix;
+    }
+
     /**
      * Get a custom table name mapping for the given table.
      *
@@ -108,6 +126,16 @@ public static function table($table)
         return $table;
     }
 
+    /**
+     * Get the prefix for the tables.
+     *
+     * @return string
+     */
+    public static function prefix()
+    {
+        return static::$prefix;
+    }
+
     /**
      * Get or set the model scoping instance.
      *

src/Database/Queries/Abilities.php

@@ -49,6 +49,7 @@ protected static function getRoleConstraint(Model $authority, $allowed)
         return function ($query) use ($authority, $allowed) {
             $permissions = Models::table('permissions');
             $roles       = Models::table('roles');
+            $prefix      = Models::prefix();
 
             $query->from($roles)
                   ->select("{$prefix}{$permissions}.ability_id")
@@ -77,6 +78,7 @@ protected static function getAuthorityRoleConstraint(Model $authority)
             $pivot  = Models::table('assigned_roles');
             $roles  = Models::table('roles');
             $table  = $authority->getTable();
+            $prefix = Models::prefix();
 
             $query->from($table)
                   ->select("{$prefix}{$pivot}.role_id")
@@ -102,6 +104,7 @@ protected static function getAuthorityConstraint(Model $authority, $allowed)
             $permissions = Models::table('permissions');
             $abilities   = Models::table('abilities');
             $table       = $authority->getTable();
+            $prefix      = Models::prefix();
 
             $query->from($table)
                   ->select("{$prefix}{$permissions}.ability_id")