From b4244be6589b035b314f8ac8be1d5cfcb9c3e5ad Mon Sep 17 00:00:00 2001
From: lukinovec <lukinovec@gmail.com>
Date: Mon, 8 Jun 2026 10:02:49 +0200
Subject: [PATCH] Determine data column and internal prefix dynamically instead
 of hardcoding in harden()

---
 src/Bootstrappers/DatabaseTenancyBootstrapper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bootstrappers/DatabaseTenancyBootstrapper.php b/src/Bootstrappers/DatabaseTenancyBootstrapper.php
index 6ff3576e..f27937d4 100644
--- a/src/Bootstrappers/DatabaseTenancyBootstrapper.php
+++ b/src/Bootstrappers/DatabaseTenancyBootstrapper.php
@@ -71,11 +71,12 @@ class DatabaseTenancyBootstrapper implements TenancyBootstrapper
 
     protected function harden(Tenant $tenant): void
     {
+        /** @var \Stancl\Tenancy\Database\Models\Tenant $tenant */
         $dbName = DB::getDatabaseName();
 
         // Check if any other tenant uses this tenant's database
         if ($tenant::where($tenant->getTenantKeyName(), '!=', $tenant->getTenantKey())
-            ->where('data->tenancy_db_name', $dbName)
+            ->where($tenant::getDataColumn() . '->' . $tenant->internalPrefix() . 'db_name', $dbName)
             ->exists()) {
             throw new RuntimeException('Tenant cannot use a database of another tenant.');
         }