Merge pull request #57 from Kryptonit3/patch-1

Add prefix support

src/Bican/Roles/Traits/HasRoleAndPermission.php

@@ -147,10 +147,10 @@ public function rolePermissions()
     {
         if (!$roles = $this->getRoles()->lists('id')->toArray()) { $roles = []; }
 
-        return Permission::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
-                ->join('permission_role', 'permission_role.permission_id', '=', 'permissions.id')->join('roles', 'roles.id', '=', 'permission_role.role_id')
-                ->whereIn('roles.id', $roles) ->orWhere('roles.level', '<', $this->level())
-                ->groupBy('permissions.id');
+        return Permission::select([config('roles.prefix') . 'permissions.*', config('roles.prefix') . 'permission_role.created_at as pivot_created_at', config('roles.prefix') . 'permission_role.updated_at as pivot_updated_at'])
+                ->join(config('roles.prefix') . 'permission_role', config('roles.prefix') . 'permission_role.permission_id', '=', config('roles.prefix') . 'permissions.id')->join(config('roles.prefix') . 'roles', config('roles.prefix') . 'roles.id', '=', config('roles.prefix') . 'permission_role.role_id')
+                ->whereIn(config('roles.prefix') . 'roles.id', $roles) ->orWhere(config('roles.prefix') . 'roles.level', '<', $this->level())
+                ->groupBy(config('roles.prefix') . 'permissions.id');
     }
 
     /**

src/config/roles.php

@@ -1,6 +1,17 @@
 <?php
 
 return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Database Table Prefix
+    |--------------------------------------------------------------------------
+    |
+    | If your tables have a prefix you may specify that here.
+    |
+    */
+
+    'prefix' => '',
 
     /*
     |--------------------------------------------------------------------------