From f2a3cf028ce68e2d55c26751af0bd5a447269894 Mon Sep 17 00:00:00 2001
From: MinaseTaki <minase_taki@yahoo.com>
Date: Tue, 21 Jul 2020 14:04:22 +0300
Subject: [PATCH 1/2] Update Tenant.php (#463)

---
 src/Database/Models/Tenant.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Database/Models/Tenant.php b/src/Database/Models/Tenant.php
index 66123dda..e29a54ec 100644
--- a/src/Database/Models/Tenant.php
+++ b/src/Database/Models/Tenant.php
@@ -17,7 +17,7 @@ use Stancl\Tenancy\Events;
  * @property Carbon $updated_at
  * @property array $data
  *
- * @method TenantCollection all()
+ * @method static TenantCollection all()
  */
 class Tenant extends Model implements Contracts\Tenant
 {

From 520fa96d8fff4c33b55d47c8fc0e202b07150168 Mon Sep 17 00:00:00 2001
From: Lupacescu Eduard <lupacescueduard@gmail.com>
Date: Mon, 27 Jul 2020 16:02:12 +0300
Subject: [PATCH 2/2] Qualify where column (#467)

---
 src/Database/TenantScope.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Database/TenantScope.php b/src/Database/TenantScope.php
index fff16996..8592f16c 100644
--- a/src/Database/TenantScope.php
+++ b/src/Database/TenantScope.php
@@ -17,7 +17,7 @@ class TenantScope implements Scope
             return;
         }
 
-        $builder->where(BelongsToTenant::$tenantIdColumn, tenant()->getTenantKey());
+        $builder->where($model->qualifyColumn(BelongsToTenant::$tenantIdColumn), tenant()->getTenantKey());
     }
 
     public function extend(Builder $builder)