From 3814c5c3ef8a8d2684f4c30d1472af65ac09a195 Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 5 Jan 2014 23:27:39 +0400 Subject: [PATCH 1/2] improved fixture controller --- .../yii/console/controllers/FixtureController.php | 124 +++++++++++++++++++-- 1 file changed, 116 insertions(+), 8 deletions(-) diff --git a/framework/yii/console/controllers/FixtureController.php b/framework/yii/console/controllers/FixtureController.php index d5aa8e9..08f9fae 100644 --- a/framework/yii/console/controllers/FixtureController.php +++ b/framework/yii/console/controllers/FixtureController.php @@ -10,6 +10,7 @@ namespace yii\console\controllers; use Yii; use yii\console\Controller; use yii\console\Exception; +use yii\helpers\FileHelper; use yii\test\DbTestTrait; use yii\helpers\Console; @@ -53,6 +54,11 @@ use yii\helpers\Console; class FixtureController extends Controller { use DbTestTrait; + + /** + * type of fixture apply to database + */ + const APPLY_ALL = 'all'; /** * @var string controller default action ID. @@ -110,14 +116,43 @@ class FixtureController extends Controller throw new Exception('Fixture manager is not configured properly. Please refer to official documentation for this purposes.'); } - if (!$this->confirmApply($fixtures)) { + $foundFixtures = $this->findFixtures($fixtures); + + if (!$this->needToApplyAll($fixtures[0])) { + $notFoundFixtures = array_diff($fixtures, $foundFixtures); + + if ($notFoundFixtures) { + $this->notifyNotFound($notFoundFixtures); + } + } + + if (!$foundFixtures) { + throw new Exception("No files were found by name: \"" . implode(', ', $fixtures) . "\".\n" + . "Check that fixtures with these name exists, under fixtures path: \n\"" . Yii::getAlias($this->fixturePath) . "\"." + ); + } + + if (!$this->confirmApply($foundFixtures)) { return; } $this->getFixtureManager()->basePath = $this->fixturePath; $this->getFixtureManager()->db = $this->db; - $this->loadFixtures($fixtures); - $this->notifySuccess($fixtures); + + $transaction = Yii::$app->db->beginTransaction(); + + try + { + $this->loadFixtures($foundFixtures); + $transaction->commit(); + + } catch (\Exception $e) + { + $transaction->rollback(); + $this->stdout("Exception occured, transaction rollback. Tables will be in same state.\n", Console::BG_RED); + throw $e; + } + $this->notifySuccess($foundFixtures); } /** @@ -127,14 +162,35 @@ class FixtureController extends Controller * @param array|string $tables */ public function actionClear(array $tables) - { + { + if ($this->needToApplyAll($tables[0])) { + $tables = $this->getDbConnection()->schema->getTableNames(); + } + if (!$this->confirmClear($tables)) { return; } - foreach($tables as $table) { - $this->getDbConnection()->createCommand()->truncateTable($table)->execute(); - $this->stdout("Table \"{$table}\" was successfully cleared. \n", Console::FG_GREEN); + $transaction = Yii::$app->db->beginTransaction(); + + try + { + $this->getDbConnection()->createCommand()->checkIntegrity(false)->execute(); + + foreach($tables as $table) { + $this->getDbConnection()->createCommand()->truncateTable($table)->execute(); + $this->getDbConnection()->createCommand()->resetSequence($table)->execute(); + $this->stdout(" Table \"{$table}\" was successfully cleared. \n", Console::FG_GREEN); + } + + $this->getDbConnection()->createCommand()->checkIntegrity(true)->execute(); + $transaction->commit(); + + } catch (\Exception $e) + { + $transaction->rollback(); + $this->stdout("Exception occured, transaction rollback. Tables will be in same state.\n", Console::BG_RED); + throw $e; } } @@ -180,6 +236,18 @@ class FixtureController extends Controller } /** + * Notifies user that fixtures were not found under fixtures path. + * @param array $fixtures + */ + private function notifyNotFound($fixtures) + { + $this->stdout("Some fixtures were not found under path:\n", Console::BG_RED); + $this->stdout(Yii::getAlias($this->fixturePath) . "\n\n", Console::FG_GREEN); + $this->outputList($fixtures); + $this->stdout("\n"); + } + + /** * Prompts user with confirmation if fixtures should be loaded. * @param array $fixtures * @return boolean @@ -211,7 +279,47 @@ class FixtureController extends Controller private function outputList($data) { foreach($data as $index => $item) { - $this->stdout(($index + 1) . ". {$item}\n", Console::FG_GREEN); + $this->stdout(" " . ($index + 1) . ". {$item}\n", Console::FG_GREEN); } } + + /** + * Checks if needed to apply all fixtures. + * @param string $fixture + * @return bool + */ + public function needToApplyAll($fixture) + { + return $fixture == self::APPLY_ALL; + } + + /** + * Returns array of found fixtures. These may differer from input parameter as not all fixtures may exists. + * @param array $fixtures + */ + private function findFixtures(array $fixtures) + { + $fixturesPath = Yii::getAlias($this->fixturePath); + + $files = []; + + if ($this->needToApplyAll($fixtures[0])) { + $files = FileHelper::findFiles($fixturesPath, ['only' => ['.php']]); + } else { + $filesToSearch = []; + foreach ($fixtures as $fileName) { + $filesToSearch[] = $fileName . '.php'; + } + $files = FileHelper::findFiles($fixturesPath, ['only' => $filesToSearch]); + } + + $foundFixtures = []; + + foreach($files as $fixture) { + $foundFixtures[] = basename($fixture , '.php'); + } + + return $foundFixtures; + } + } From 2eb91acefdd986b2be159995a6b06fe1f4b088ad Mon Sep 17 00:00:00 2001 From: Mark Date: Sun, 5 Jan 2014 23:33:11 +0400 Subject: [PATCH 2/2] CS fix --- framework/yii/console/controllers/FixtureController.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/framework/yii/console/controllers/FixtureController.php b/framework/yii/console/controllers/FixtureController.php index 08f9fae..0b400e8 100644 --- a/framework/yii/console/controllers/FixtureController.php +++ b/framework/yii/console/controllers/FixtureController.php @@ -141,13 +141,11 @@ class FixtureController extends Controller $transaction = Yii::$app->db->beginTransaction(); - try - { + try { $this->loadFixtures($foundFixtures); $transaction->commit(); - } catch (\Exception $e) - { + } catch (\Exception $e) { $transaction->rollback(); $this->stdout("Exception occured, transaction rollback. Tables will be in same state.\n", Console::BG_RED); throw $e; @@ -173,8 +171,7 @@ class FixtureController extends Controller $transaction = Yii::$app->db->beginTransaction(); - try - { + try { $this->getDbConnection()->createCommand()->checkIntegrity(false)->execute(); foreach($tables as $table) { @@ -186,8 +183,7 @@ class FixtureController extends Controller $this->getDbConnection()->createCommand()->checkIntegrity(true)->execute(); $transaction->commit(); - } catch (\Exception $e) - { + } catch (\Exception $e) { $transaction->rollback(); $this->stdout("Exception occured, transaction rollback. Tables will be in same state.\n", Console::BG_RED); throw $e;