From d2e9d1efff110d8c92529eff65ebc217439db1e6 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 28 Aug 2024 14:08:42 +1200 Subject: [PATCH] API Update API to reflect changes to CLI interaction --- src/TestSessionEnvironment.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/TestSessionEnvironment.php b/src/TestSessionEnvironment.php index 306315d..499423b 100644 --- a/src/TestSessionEnvironment.php +++ b/src/TestSessionEnvironment.php @@ -15,9 +15,10 @@ use SilverStripe\Core\Injector\Injectable; use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\FixtureFactory; +use SilverStripe\HybridExecution\Command\DbBuild; +use SilverStripe\HybridExecution\HybridOutput; use SilverStripe\Dev\YamlFixture; use SilverStripe\ORM\Connect\TempDatabase; -use SilverStripe\ORM\DatabaseAdmin; use SilverStripe\ORM\DB; use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\Versioned\Versioned; @@ -370,9 +371,13 @@ public function importDatabase($path, $requireDefaultRecords = false) } // In case the dump involved CREATE TABLE commands, we need to ensure the schema is still up to date - $dbAdmin = new DatabaseAdmin(); + $dbBuild = new DbBuild(); Versioned::set_reading_mode(''); - $dbAdmin->doBuild(true, $requireDefaultRecords); + $output = new HybridOutput( + Director::is_cli() ? HybridOutput::FORMAT_ANSI : HybridOutput::FORMAT_HTML, + HybridOutput::VERBOSITY_QUIET + ); + $dbBuild->doBuild($output, $requireDefaultRecords); } /** @@ -380,9 +385,13 @@ public function importDatabase($path, $requireDefaultRecords = false) */ public function requireDefaultRecords() { - $dbAdmin = new DatabaseAdmin(); + $dbBuild = new DbBuild(); Versioned::set_reading_mode(''); - $dbAdmin->doBuild(true, true); + $output = new HybridOutput( + Director::is_cli() ? HybridOutput::FORMAT_ANSI : HybridOutput::FORMAT_HTML, + HybridOutput::VERBOSITY_QUIET + ); + $dbBuild->doBuild($output, true); } /**