php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-06 14:19:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect order of migrations history in case yii\console\controllers\MigrateController::$migrationNamespaces is in use

Browse Source
This commit is contained in:
Klimov Paul
2016-11-14 14:24:53 +02:00
parent bfabb1e2b2
commit 1157657cab
3 changed files with 89 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
framework/console/controllers/MigrateController.php
View File

@ -199,27 +199,48 @@ class MigrateController extends BaseMigrateController
if ($this->db->schema->getTableSchema($this->migrationTable, true) === null) {
$this->createMigrationHistoryTable();
}
$query = new Query;
$rows = $query->select(['version', 'apply_time'])
$query = (new Query())
->select(['version', 'apply_time'])
->from($this->migrationTable)
->orderBy('apply_time DESC, version DESC')
->limit($limit)
->createCommand($this->db)
->queryAll();
->orderBy(['apply_time' => SORT_DESC, 'version' => SORT_DESC]);
if (empty($this->migrationNamespaces)) {
$query->limit($limit);
$rows = $query->all($this->db);
$history = ArrayHelper::map($rows, 'version', 'apply_time');
unset($history[self::BASE_MIGRATION]);
return $history;
}
$rows = $query->all($this->db);
$history = [];
foreach ($rows as $row) {
foreach ($rows as $key => $row) {
if ($row['version'] === self::BASE_MIGRATION) {
continue;
}
if (preg_match('/m?(\d{6}_?\d{6})(\D.*)?$/is', $row['version'], $matches)) {
$time = str_replace('_', '', $matches[1]);
$history['m' . $time . $matches[2]] = $row;
$row['canonicalVersion'] = $time;
} else {
$row['canonicalVersion'] = $row['version'];
}
$row['apply_time'] = (int)$row['apply_time'];
$history[] = $row;
}
// sort history in desc order
uksort($history, function ($a, $b) {
return strcasecmp($b, $a);
usort($history, function ($a, $b) {
if ($a['apply_time'] === $b['apply_time']) {
if (($compareResult = strcasecmp($b['canonicalVersion'], $a['canonicalVersion'])) !== 0) {
return $compareResult;
}
return strcasecmp($b['version'], $a['version']);
}
return ($a['apply_time'] > $b['apply_time']) ? -1 : +1;
});
$history = array_slice($history, 0, $limit);
$history = ArrayHelper::map($history, 'version', 'apply_time');
return $history;