1
0
Fork 0
mirror of https://github.com/Oreolek/kohana-migrations.git synced 2024-06-16 23:11:06 +03:00

Merge branch 'develop' of git://github.com/BRMatt/kohana-minion into develop

This commit is contained in:
Matt Button 2011-01-07 15:02:43 +00:00
commit 363576919d
5 changed files with 11 additions and 9 deletions

View file

@ -2,7 +2,7 @@
*NOTE: Minion is currently in a beta state, please report any issues in the issue tracker* *NOTE: Minion is currently in a beta state, please report any issues in the issue tracker*
Minion is a module for running database migrations located in the kohana cascading filesystem, but it also provides a useful framework for creating cli based tasks. Minion is a module for running database migrations located in the Kohana cascading filesystem, but it also provides a useful framework for creating cli based tasks.
The original "need" behind Minion was the lack of a good db migrations system, capable of selecting migrations The original "need" behind Minion was the lack of a good db migrations system, capable of selecting migrations
from multiple locations (i.e. different modules). from multiple locations (i.e. different modules).
@ -13,7 +13,7 @@ The system is inspired by ruckusing, which had a nice system for defining tasks
* [kohana-database](https://github.com/kohana/database) * [kohana-database](https://github.com/kohana/database)
## Compatability ## Compatibility
Minion should be compatible with both Kohana 3.0.x and 3.1.x Minion should be compatible with both Kohana 3.0.x and 3.1.x
@ -63,7 +63,7 @@ Feel free to contribute tests(!), they can be found in the `tests/minion` direct
## License ## License
This is licensed under the [same license as kohana](http://kohanaframework.org/license). This is licensed under the [same license as Kohana](http://kohanaframework.org/license).
This project is not endorsed by the Kohana Framework project. This project is not endorsed by the Kohana Framework project.

View file

@ -88,7 +88,9 @@ class Controller_Minion extends Controller
$options = $task->get_config_options(); $options = $task->get_config_options();
$config = call_user_func_array(array('CLI', 'options'), $options); $config = count($options)
? call_user_func_array(array('CLI', 'options'), $options)
: array();
echo $task->execute($config); echo $task->execute($config);
} }

View file

@ -42,7 +42,7 @@
* *
* --quiet * --quiet
* *
* Suppress all unnessacery output. If --dry-run is enabled then only dry run * Suppress all unnecessary output. If --dry-run is enabled then only dry run
* SQL will be output * SQL will be output
* *
* @author Matt Button <matthew@sigswitch.com> * @author Matt Button <matthew@sigswitch.com>
@ -51,7 +51,7 @@ class Minion_Task_Db_Migrate extends Minion_Task
{ {
/* /*
* Th' default direction for migrations, TRUE = up, FALSE = down * The default direction for migrations, TRUE = up, FALSE = down
* @var boolean * @var boolean
*/ */
protected $_default_direction = TRUE; protected $_default_direction = TRUE;
@ -113,7 +113,7 @@ class Minion_Task_Db_Migrate extends Minion_Task
} }
/** /**
* Parses a comma delimted set of locations and returns an array of them * Parses a comma delimited set of locations and returns an array of them
* *
* @param string Comma delimited string of locations * @param string Comma delimited string of locations
* @return array Locations * @return array Locations

View file

@ -16,7 +16,7 @@ class <?php echo $class; ?> extends Minion_Migration_Base {
} }
/** /**
* Run queries need to remove this migration * Run queries needed to remove this migration
* *
* @param Kohana_Database Database connection * @param Kohana_Database Database connection
*/ */

View file

@ -1,4 +1,4 @@
<? if( ! $quiet): ?> <?php if( ! $quiet): ?>
Executed <?php echo count($executed_migrations); ?> migrations Executed <?php echo count($executed_migrations); ?> migrations
Current versions of locations: Current versions of locations: