Fix #372 since whereColumn automatically prepend table prefix (#508)

JosephSilber · Mar 20, 2020 · 9f54c9d · 9f54c9d
1 parent c624eda
commit 9f54c9d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 65 deletions.
diff --git a/src/BouncerServiceProvider.php b/src/BouncerServiceProvider.php
@@ -32,7 +32,6 @@ public function register()
     public function boot()
     {
         $this->registerMorphs();
-        $this->setTablePrefix();
         $this->setUserModel();
 
         $this->registerAtGate();
@@ -78,32 +77,6 @@ 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.
      *

diff --git a/src/Database/Models.php b/src/Database/Models.php
@@ -13,13 +13,6 @@
 
 class Models
 {
-    /**
-     * The prefix for all tables.
-     *
-     * @var string
-     */
-    protected static $prefix = '';
-
     /**
      * Map of bouncer's models.
      *
@@ -100,17 +93,6 @@ 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.
      *
@@ -126,16 +108,6 @@ 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.
      *

diff --git a/src/Database/Queries/Abilities.php b/src/Database/Queries/Abilities.php
@@ -49,11 +49,10 @@ protected static function getRoleConstraint(Model $authority, $allowed)
             $permissions = Models::table('permissions');
             $abilities   = Models::table('abilities');
             $roles       = Models::table('roles');
-            $prefix      = Models::prefix();
 
             $query->from($roles)
                   ->join($permissions, $roles.'.id', '=', $permissions.'.entity_id')
-                  ->whereColumn("{$prefix}{$permissions}.ability_id", "{$prefix}{$abilities}.id")
+                  ->whereColumn("{$permissions}.ability_id", "{$abilities}.id")
                   ->where($permissions.".forbidden", ! $allowed)
                   ->where($permissions.".entity_type", Models::role()->getMorphClass());
 
@@ -101,11 +100,10 @@ protected static function getAuthorityRoleConstraint(Model $authority)
             $pivot  = Models::table('assigned_roles');
             $roles  = Models::table('roles');
             $table  = $authority->getTable();
-            $prefix = Models::prefix();
 
             $query->from($table)
                   ->join($pivot, "{$table}.{$authority->getKeyName()}", '=', $pivot.'.entity_id')
-                  ->whereColumn("{$prefix}{$pivot}.role_id", "{$prefix}{$roles}.id")
+                  ->whereColumn("{$pivot}.role_id", "{$roles}.id")
                   ->where($pivot.'.entity_type', $authority->getMorphClass())
                   ->where("{$table}.{$authority->getKeyName()}", $authority->getKey());
 
@@ -127,11 +125,10 @@ protected static function getAuthorityConstraint(Model $authority, $allowed)
             $permissions = Models::table('permissions');
             $abilities   = Models::table('abilities');
             $table       = $authority->getTable();
-            $prefix      = Models::prefix();
 
             $query->from($table)
                   ->join($permissions, "{$table}.{$authority->getKeyName()}", '=', $permissions.'.entity_id')
-                  ->whereColumn("{$prefix}{$permissions}.ability_id", "{$prefix}{$abilities}.id")
+                  ->whereColumn("{$permissions}.ability_id", "{$abilities}.id")
                   ->where("{$permissions}.forbidden", ! $allowed)
                   ->where("{$permissions}.entity_type", $authority->getMorphClass())
                   ->where("{$table}.{$authority->getKeyName()}", $authority->getKey());
@@ -152,10 +149,9 @@ protected static function getEveryoneConstraint($allowed)
         return function ($query) use ($allowed) {
             $permissions = Models::table('permissions');
             $abilities   = Models::table('abilities');
-            $prefix      = Models::prefix();
 
             $query->from($permissions)
-                  ->whereColumn("{$prefix}{$permissions}.ability_id", "{$prefix}{$abilities}.id")
+                  ->whereColumn("{$permissions}.ability_id", "{$abilities}.id")
                   ->where("{$permissions}.forbidden", ! $allowed)
                   ->whereNull('entity_id');
 

diff --git a/src/Database/Queries/Roles.php b/src/Database/Queries/Roles.php
@@ -66,11 +66,10 @@ public function constrainWhereAssignedTo($query, $model, array $keys = null)
             $key    = "{$table}.{$model->getKeyName()}";
             $pivot  = Models::table('assigned_roles');
             $roles  = Models::table('roles');
-            $prefix = Models::prefix();
 
             $query->from($table)
                   ->join($pivot, $key, '=', $pivot.'.entity_id')
-                  ->whereColumn("{$prefix}{$pivot}.role_id", "{$prefix}{$roles}.id")
+                  ->whereColumn("{$pivot}.role_id", "{$roles}.id")
                   ->where("{$pivot}.entity_type", $model->getMorphClass())
                   ->whereIn($key, $keys);