From 60c683292c593688bb7bdaf8e9664f95f2a4d88f Mon Sep 17 00:00:00 2001
From: Dmytro Pashchenko <146029723+l1monenko@users.noreply.github.com>
Date: Sun, 12 Jul 2026 16:55:34 +0300
Subject: [PATCH 1/2] feat: add DB_SCHEMA support for PostgreSQL

---
 config/database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/database.php b/config/database.php
index 35e303a24d..30331d8f5f 100644
--- a/config/database.php
+++ b/config/database.php
@@ -101,7 +101,7 @@
             'charset' => env('DB_CHARSET', 'utf8'),
             'prefix' => '',
             'prefix_indexes' => true,
-            'search_path' => 'public',
+            'search_path' => env('DB_SCHEMA', 'public'),
             'sslmode' => 'prefer',
         ],
 

From 7bb55ce35c7a6ed40837e251ae3fcb2421d0fa7e Mon Sep 17 00:00:00 2001
From: Dmytro Pashchenko <l1moonenko@gmail.com>
Date: Sun, 12 Jul 2026 17:37:01 +0300
Subject: [PATCH 2/2] fix: propagate DB_SCHEMA to PostgreSQL setup

---
 .../Commands/Environment/DatabaseSettingsCommand.php      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/Environment/DatabaseSettingsCommand.php b/app/Console/Commands/Environment/DatabaseSettingsCommand.php
index ba4a861769..3953c5b6f4 100644
--- a/app/Console/Commands/Environment/DatabaseSettingsCommand.php
+++ b/app/Console/Commands/Environment/DatabaseSettingsCommand.php
@@ -24,6 +24,7 @@ class DatabaseSettingsCommand extends Command
     protected $signature = 'p:environment:database
                             {--driver= : The database driver backend to use.}
                             {--database= : The database to use.}
+                            {--schema= : The schema to use for the PostgreSQL database.}
                             {--host= : The connection address for the MySQL/ MariaDB/ PostgreSQL server.}
                             {--port= : The connection port for the MySQL/ MariaDB/ PostgreSQL server.}
                             {--username= : Username to use when connecting to the MySQL/ MariaDB/ PostgreSQL server.}
@@ -196,6 +197,11 @@ public function handle(): int
                 config('database.connections.pgsql.database', 'panel')
             );
 
+            $this->variables['DB_SCHEMA'] = $this->option('schema') ?? $this->ask(
+                'Database Schema',
+                config('database.connections.pgsql.search_path', 'public')
+            );
+
             $this->output->note(trans('commands.database_settings.DB_USERNAME_note'));
             $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
                 'Database Username',
@@ -224,7 +230,7 @@ public function handle(): int
                     'charset' => 'utf8',
                     'prefix' => '',
                     'prefix_indexes' => true,
-                    'search_path' => 'public',
+                    'search_path' => $this->variables['DB_SCHEMA'],
                     'sslmode' => 'prefer',
                 ]);