From 3fc98e5866b752915a9e4436ac595e474e842df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Matyas?= Date: Sat, 25 Jun 2011 19:38:17 +0200 Subject: [PATCH] modified groups to work like groups and not like location --- classes/minion/task/db/generate.php | 8 ++------ config/minion/migration.php | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/classes/minion/task/db/generate.php b/classes/minion/task/db/generate.php index 4d9b313..f61fa9a 100644 --- a/classes/minion/task/db/generate.php +++ b/classes/minion/task/db/generate.php @@ -51,7 +51,7 @@ class Minion_Task_Db_Generate extends Minion_Task 'See help for more info'.PHP_EOL; } - $group = rtrim(realpath($config['group']), '/').'/'; + $group = $config['group'].'/'; $description = $config['description']; // {year}{month}{day}{hour}{minute}{second} @@ -79,9 +79,6 @@ class Minion_Task_Db_Generate extends Minion_Task */ protected function _generate_classname($group, $time) { - // Chop up everything up until the relative path - $group = substr($group, strrpos($group, 'migrations/') + 11); - $class = ucwords(str_replace('/', ' ', $group)); // If group is empty then we want to avoid double underscore in the @@ -107,8 +104,7 @@ class Minion_Task_Db_Generate extends Minion_Task public function _generate_filename($group, $time, $description) { $description = substr(strtolower($description), 0, 100); - - return $group.$time.'_'.preg_replace('~[^a-z]+~', '-', $description).EXT; + return DOCROOT.Kohana::config('minion/migration')->default_path.$group.$time.'_'.preg_replace('~[^a-z]+~', '-', $description).EXT; } } diff --git a/config/minion/migration.php b/config/minion/migration.php index 5f16a12..471c3bc 100644 --- a/config/minion/migration.php +++ b/config/minion/migration.php @@ -6,6 +6,9 @@ return array( 'group_connection' => array( ), + + 'default_path' => 'migrations/', + /** * This specifies which migration should be the "base", in timestamp form. * This migration will not be run when --migrate-down is called