From 5ee9a60899b0cc1b558e671f8e89e00b02469ba7 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 22 Oct 2021 06:57:07 +1100 Subject: [PATCH] Prevent docker installations from reaching some test data creation console commands --- app/Console/Commands/CreateSingleAccount.php | 4 +++ app/Console/Commands/CreateTestData.php | 3 ++ app/Console/Commands/DemoMode.php | 3 ++ app/Console/Commands/SubdomainFill.php | 31 -------------------- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php index 92d1bacf3662..fe5c16f34891 100644 --- a/app/Console/Commands/CreateSingleAccount.php +++ b/app/Console/Commands/CreateSingleAccount.php @@ -90,6 +90,10 @@ class CreateSingleAccount extends Command */ public function handle() { + + if(config('ninja.is_docker')) + return; + MultiDB::setDb($this->option('database')); $this->info(date('r').' Create Single Sample Account...'); diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php index b98205e70c2c..6d1426c5ed7b 100644 --- a/app/Console/Commands/CreateTestData.php +++ b/app/Console/Commands/CreateTestData.php @@ -78,6 +78,9 @@ class CreateTestData extends Command */ public function handle() { + if(config('ninja.is_docker')) + return; + $this->info(date('r').' Running CreateTestData...'); $this->count = $this->argument('count'); diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php index c57d084b696b..3119ac21b63e 100644 --- a/app/Console/Commands/DemoMode.php +++ b/app/Console/Commands/DemoMode.php @@ -86,6 +86,9 @@ class DemoMode extends Command { set_time_limit(0); + if(config('ninja.is_docker')) + return; + $cached_tables = config('ninja.cached_tables'); foreach ($cached_tables as $name => $class) { diff --git a/app/Console/Commands/SubdomainFill.php b/app/Console/Commands/SubdomainFill.php index afa2624ae0e3..ad5471d7866c 100644 --- a/app/Console/Commands/SubdomainFill.php +++ b/app/Console/Commands/SubdomainFill.php @@ -59,37 +59,6 @@ class SubdomainFill extends Command }); - - // $db1 = Company::on('db-ninja-01')->get(); - - // $db1->each(function ($company){ - - // $db2 = Company::on('db-ninja-02a')->find($company->id); - - // if($db2) - // { - // $db2->subdomain = $company->subdomain; - // $db2->save(); - // } - - // }); - - - // $db1 = null; - // $db2 = null; - - // $db2 = Company::on('db-ninja-02')->get(); - - // $db2->each(function ($company){ - - // $db1 = Company::on('db-ninja-01a')->find($company->id); - - // if($db1) - // { - // $db1->subdomain = $company->subdomain; - // $db1->save(); - // } - // }); } }