Merge pull request #1070 from postmodern/database_tasks

Database tasks
padrino · Feb 22, 2013 · f4a6aea · f4a6aea
2 parents 46e4174 + a48549b
commit f4a6aea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...gen/lib/padrino-gen/padrino-tasks/seed.rb → ...lib/padrino-gen/padrino-tasks/database.rb b/...gen/lib/padrino-gen/padrino-tasks/seed.rb → ...lib/padrino-gen/padrino-tasks/database.rb
@@ -1,4 +1,4 @@
-if PadrinoTasks.load?(:seed, true)
+if PadrinoTasks.load?(:database, true)
   namespace :db do
     desc 'Load the seed data from db/seeds.rb'
     task :seed => :environment do
@@ -8,4 +8,4 @@
   end
 
   task :seed => 'db:seed'
-end
+end
diff --git a/padrino-gen/lib/padrino-gen/padrino-tasks/datamapper.rb b/padrino-gen/lib/padrino-gen/padrino-tasks/datamapper.rb
@@ -38,7 +38,15 @@
     end
 
     desc "Migrate the database to the latest version"
-    task :migrate => 'dm:migrate:up'
+    task :migrate do
+      migrate_task = if Dir['db/migrate/*.rb'].empty?
+                       'dm:auto:upgrade'
+                     else
+                       'dm:migrate:up'
+                     end
+
+      Rake::Task[migrate_task].invoke
+    end
 
     desc "Create the database"
     task :create => :environment do