Commit 949fe449 by Carsten Brandt

Merge pull request #3607 from Ragazzo/limit_feature_for_migrations

limit applied to migration
parents 2b5819d0 09eb9a36
...@@ -63,6 +63,7 @@ Yii Framework 2 Change Log ...@@ -63,6 +63,7 @@ Yii Framework 2 Change Log
- Enh #3562: Adding rotateByCopy to yii\log\FileTarget (pawzar) - Enh #3562: Adding rotateByCopy to yii\log\FileTarget (pawzar)
- Enh #3574: Add integrity check support for SQLite (zeeke) - Enh #3574: Add integrity check support for SQLite (zeeke)
- Enh #3597: Nested array support for HTML5 custom "data-*" attributes (armab) - Enh #3597: Nested array support for HTML5 custom "data-*" attributes (armab)
- Enh #3607: Added support for limit in migrations actions: history, new, redo (Ragazzo)
- Enh: Added support for using sub-queries when building a DB query with `IN` condition (qiangxue) - Enh: Added support for using sub-queries when building a DB query with `IN` condition (qiangxue)
- Enh: Supported adding a new response formatter without the need to reconfigure existing formatters (qiangxue) - Enh: Supported adding a new response formatter without the need to reconfigure existing formatters (qiangxue)
- Enh: Added `yii\web\UrlManager::addRules()` to simplify adding new URL rules (qiangxue) - Enh: Added `yii\web\UrlManager::addRules()` to simplify adding new URL rules (qiangxue)
......
...@@ -214,11 +214,13 @@ class MigrateController extends Controller ...@@ -214,11 +214,13 @@ class MigrateController extends Controller
} }
$migrations = $this->getMigrationHistory($limit); $migrations = $this->getMigrationHistory($limit);
if (empty($migrations)) { if (empty($migrations)) {
echo "No migration has been done before.\n"; echo "No migration has been done before.\n";
return self::EXIT_CODE_NORMAL; return self::EXIT_CODE_NORMAL;
} }
$migrations = array_keys($migrations); $migrations = array_keys($migrations);
$n = count($migrations); $n = count($migrations);
...@@ -249,6 +251,7 @@ class MigrateController extends Controller ...@@ -249,6 +251,7 @@ class MigrateController extends Controller
* ~~~ * ~~~
* yii migrate/redo # redo the last applied migration * yii migrate/redo # redo the last applied migration
* yii migrate/redo 3 # redo the last 3 applied migrations * yii migrate/redo 3 # redo the last 3 applied migrations
* yii migrate/redo all # redo all migrations
* ~~~ * ~~~
* *
* @param integer $limit the number of migrations to be redone. Defaults to 1, * @param integer $limit the number of migrations to be redone. Defaults to 1,
...@@ -259,17 +262,23 @@ class MigrateController extends Controller ...@@ -259,17 +262,23 @@ class MigrateController extends Controller
*/ */
public function actionRedo($limit = 1) public function actionRedo($limit = 1)
{ {
$limit = (int) $limit; if ($limit === 'all') {
if ($limit < 1) { $limit = null;
throw new Exception("The step argument must be greater than 0."); } else {
$limit = (int) $limit;
if ($limit < 1) {
throw new Exception("The step argument must be greater than 0.");
}
} }
$migrations = $this->getMigrationHistory($limit); $migrations = $this->getMigrationHistory($limit);
if (empty($migrations)) { if (empty($migrations)) {
echo "No migration has been done before.\n"; echo "No migration has been done before.\n";
return self::EXIT_CODE_NORMAL; return self::EXIT_CODE_NORMAL;
} }
$migrations = array_keys($migrations); $migrations = array_keys($migrations);
$n = count($migrations); $n = count($migrations);
...@@ -410,7 +419,7 @@ class MigrateController extends Controller ...@@ -410,7 +419,7 @@ class MigrateController extends Controller
* ~~~ * ~~~
* yii migrate/history # showing the last 10 migrations * yii migrate/history # showing the last 10 migrations
* yii migrate/history 5 # showing the last 5 migrations * yii migrate/history 5 # showing the last 5 migrations
* yii migrate/history 0 # showing the whole history * yii migrate/history all # showing the whole history
* ~~~ * ~~~
* *
* @param integer $limit the maximum number of migrations to be displayed. * @param integer $limit the maximum number of migrations to be displayed.
...@@ -418,8 +427,17 @@ class MigrateController extends Controller ...@@ -418,8 +427,17 @@ class MigrateController extends Controller
*/ */
public function actionHistory($limit = 10) public function actionHistory($limit = 10)
{ {
$limit = (int) $limit; if ($limit === 'all') {
$limit = null;
} else {
$limit = (int) $limit;
if ($limit < 1) {
throw new Exception("The step argument must be greater than 0.");
}
}
$migrations = $this->getMigrationHistory($limit); $migrations = $this->getMigrationHistory($limit);
if (empty($migrations)) { if (empty($migrations)) {
echo "No migration has been done before.\n"; echo "No migration has been done before.\n";
} else { } else {
...@@ -444,7 +462,7 @@ class MigrateController extends Controller ...@@ -444,7 +462,7 @@ class MigrateController extends Controller
* ~~~ * ~~~
* yii migrate/new # showing the first 10 new migrations * yii migrate/new # showing the first 10 new migrations
* yii migrate/new 5 # showing the first 5 new migrations * yii migrate/new 5 # showing the first 5 new migrations
* yii migrate/new 0 # showing all new migrations * yii migrate/new all # showing all new migrations
* ~~~ * ~~~
* *
* @param integer $limit the maximum number of new migrations to be displayed. * @param integer $limit the maximum number of new migrations to be displayed.
...@@ -452,13 +470,22 @@ class MigrateController extends Controller ...@@ -452,13 +470,22 @@ class MigrateController extends Controller
*/ */
public function actionNew($limit = 10) public function actionNew($limit = 10)
{ {
$limit = (int) $limit; if ($limit === 'all') {
$limit = null;
} else {
$limit = (int) $limit;
if ($limit < 1) {
throw new Exception("The step argument must be greater than 0.");
}
}
$migrations = $this->getNewMigrations(); $migrations = $this->getNewMigrations();
if (empty($migrations)) { if (empty($migrations)) {
echo "No new migrations found. Your system is up-to-date.\n"; echo "No new migrations found. Your system is up-to-date.\n";
} else { } else {
$n = count($migrations); $n = count($migrations);
if ($limit > 0 && $n > $limit) { if ($limit && $n > $limit) {
$migrations = array_slice($migrations, 0, $limit); $migrations = array_slice($migrations, 0, $limit);
echo "Showing $limit out of $n new " . ($n === 1 ? 'migration' : 'migrations') . ":\n"; echo "Showing $limit out of $n new " . ($n === 1 ? 'migration' : 'migrations') . ":\n";
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment