Browse Source

CS fix

tags/2.0.0-beta
Mark 11 years ago
parent
commit
2eb91acefd
  1. 12
      framework/yii/console/controllers/FixtureController.php

12
framework/yii/console/controllers/FixtureController.php

@ -141,13 +141,11 @@ class FixtureController extends Controller
$transaction = Yii::$app->db->beginTransaction(); $transaction = Yii::$app->db->beginTransaction();
try try {
{
$this->loadFixtures($foundFixtures); $this->loadFixtures($foundFixtures);
$transaction->commit(); $transaction->commit();
} catch (\Exception $e) } catch (\Exception $e) {
{
$transaction->rollback(); $transaction->rollback();
$this->stdout("Exception occured, transaction rollback. Tables will be in same state.\n", Console::BG_RED); $this->stdout("Exception occured, transaction rollback. Tables will be in same state.\n", Console::BG_RED);
throw $e; throw $e;
@ -173,8 +171,7 @@ class FixtureController extends Controller
$transaction = Yii::$app->db->beginTransaction(); $transaction = Yii::$app->db->beginTransaction();
try try {
{
$this->getDbConnection()->createCommand()->checkIntegrity(false)->execute(); $this->getDbConnection()->createCommand()->checkIntegrity(false)->execute();
foreach($tables as $table) { foreach($tables as $table) {
@ -186,8 +183,7 @@ class FixtureController extends Controller
$this->getDbConnection()->createCommand()->checkIntegrity(true)->execute(); $this->getDbConnection()->createCommand()->checkIntegrity(true)->execute();
$transaction->commit(); $transaction->commit();
} catch (\Exception $e) } catch (\Exception $e) {
{
$transaction->rollback(); $transaction->rollback();
$this->stdout("Exception occured, transaction rollback. Tables will be in same state.\n", Console::BG_RED); $this->stdout("Exception occured, transaction rollback. Tables will be in same state.\n", Console::BG_RED);
throw $e; throw $e;

Loading…
Cancel
Save