Merge branch '3.x' of github.com:stancl/tenancy into 3.x

archtechx · Aug 1, 2020 · a002f59 · a002f59
2 parents d20056b + 520fa96
commit a002f59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Database/Models/Tenant.php b/src/Database/Models/Tenant.php
@@ -17,7 +17,7 @@
  * @property Carbon $updated_at
  * @property array $data
  *
- * @method TenantCollection all()
+ * @method static TenantCollection all()
  */
 class Tenant extends Model implements Contracts\Tenant
 {

diff --git a/src/Database/TenantScope.php b/src/Database/TenantScope.php
@@ -17,7 +17,7 @@ public function apply(Builder $builder, Model $model)
             return;
         }
 
-        $builder->where(BelongsToTenant::$tenantIdColumn, tenant()->getTenantKey());
+        $builder->where($model->qualifyColumn(BelongsToTenant::$tenantIdColumn), tenant()->getTenantKey());
     }
 
     public function extend(Builder $builder)
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ public function apply(Builder $builder, Model $model) @@
                 return;
             }
-            $builder->where(BelongsToTenant::$tenantIdColumn, tenant()->getTenantKey());
+            $builder->where($model->qualifyColumn(BelongsToTenant::$tenantIdColumn), tenant()->getTenantKey());
         }
         public function extend(Builder $builder)
@@ Expand Down @@