Skip to content

Commit 095ecf9

Browse files
committed
Fix migration if cache not present
1 parent 44f28f2 commit 095ecf9

5 files changed

+29
-10
lines changed

migrations/m140808_073114_create_auth_item_group_table.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ public function safeUp()
3131
$this->addForeignKey('fk_auth_item_group_code', Yii::$app->getModule('user-management')->auth_item_table, 'group_code', Yii::$app->getModule('user-management')->auth_item_group_table, 'code', 'SET NULL', 'CASCADE');
3232
}
3333

34-
Yii::$app->cache->flush();
35-
34+
if (Yii::$app->cache) {
35+
Yii::$app->cache->flush();
36+
}
3637
}
3738

3839
public function safeDown()
@@ -42,6 +43,8 @@ public function safeDown()
4243

4344
$this->dropTable(Yii::$app->getModule('user-management')->auth_item_group_table);
4445

45-
Yii::$app->cache->flush();
46+
if (Yii::$app->cache) {
47+
Yii::$app->cache->flush();
48+
}
4649
}
4750
}

migrations/m141116_115804_add_bind_to_ip_and_registration_ip_to_user.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,19 @@ public function safeUp()
88
{
99
$this->addColumn(Yii::$app->getModule('user-management')->user_table, 'registration_ip', 'varchar(15)');
1010
$this->addColumn(Yii::$app->getModule('user-management')->user_table, 'bind_to_ip', 'string');
11-
Yii::$app->cache->flush();
1211

12+
if (Yii::$app->cache) {
13+
Yii::$app->cache->flush();
14+
}
1315
}
1416

1517
public function safeDown()
1618
{
1719
$this->dropColumn(Yii::$app->getModule('user-management')->user_table, 'bind_to_ip');
1820
$this->dropColumn(Yii::$app->getModule('user-management')->user_table, 'registration_ip');
19-
Yii::$app->cache->flush();
21+
22+
if (Yii::$app->cache) {
23+
Yii::$app->cache->flush();
24+
}
2025
}
2126
}

migrations/m141121_194858_split_browser_and_os_column.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ public function safeUp()
99
$this->addColumn(Yii::$app->getModule('user-management')->user_visit_log_table, 'browser', 'varchar(30)');
1010
$this->addColumn(Yii::$app->getModule('user-management')->user_visit_log_table, 'os', 'varchar(20)');
1111
$this->renameColumn(Yii::$app->getModule('user-management')->user_visit_log_table, 'browser_and_os', 'user_agent');
12-
Yii::$app->cache->flush();
1312

13+
if (Yii::$app->cache) {
14+
Yii::$app->cache->flush();
15+
}
1416
}
1517

1618
public function safeDown()
@@ -19,6 +21,8 @@ public function safeDown()
1921
$this->dropColumn(Yii::$app->getModule('user-management')->user_visit_log_table, 'browser');
2022
$this->renameColumn(Yii::$app->getModule('user-management')->user_visit_log_table, 'user_agent', 'browser_and_os');
2123

22-
Yii::$app->cache->flush();
24+
if (Yii::$app->cache) {
25+
Yii::$app->cache->flush();
26+
}
2327
}
2428
}

migrations/m141201_220516_add_email_and_email_confirmed_to_user.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,19 @@ public function safeUp()
88
{
99
$this->addColumn(Yii::$app->getModule('user-management')->user_table, 'email', 'varchar(128)');
1010
$this->addColumn(Yii::$app->getModule('user-management')->user_table, 'email_confirmed', 'smallint(1) not null default 0');
11-
Yii::$app->cache->flush();
1211

12+
if (Yii::$app->cache) {
13+
Yii::$app->cache->flush();
14+
}
1315
}
1416

1517
public function safeDown()
1618
{
1719
$this->dropColumn(Yii::$app->getModule('user-management')->user_table, 'email');
1820
$this->dropColumn(Yii::$app->getModule('user-management')->user_table, 'email_confirmed');
19-
Yii::$app->cache->flush();
21+
22+
if (Yii::$app->cache) {
23+
Yii::$app->cache->flush();
24+
}
2025
}
2126
}

models/rbacDB/Route.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ public static function refreshRoutes($deleteUnusedRoutes = true)
142142

143143
if ( $toAdd || $toRemove )
144144
{
145-
Yii::$app->cache->delete('__commonRoutes');
145+
if (Yii::$app->cache) {
146+
Yii::$app->cache->delete('__commonRoutes');
147+
}
146148
}
147149
}
148150

0 commit comments

Comments
 (0)