[rails_datamapper] Apply patch from Kristian Meier <m.kristian@web.de>

Signed-off-by: Dan Kubb <dan.kubb@autopilotmarketing.com>

rails_datamapper/datamapper.rake

@@ -0,0 +1,36 @@
+namespace :db do
+
+  desc "Perform automigration"
+  task :automigrate => :environment do
+    ::DataMapper.auto_migrate!
+  end
+
+  desc "Perform non destructive automigration"
+  task :autoupgrade => :environment do
+    ::DataMapper.auto_upgrade!
+  end
+
+  namespace :migrate do
+    task :load => :environment do
+      gem 'dm-migrations'
+      FileList["db/migrations/*.rb"].each do |migration|
+        load migration
+      end
+    end
+
+    desc "Migrate up using migrations"
+    task :up, :version, :needs => :load do |t, args|
+      version = args[:version]
+      migrate_up!(version)
+    end
+
+    desc "Migrate down using migrations"
+    task :down, :version, :needs => :load do |t, args|
+      version = args[:version]
+      migrate_down!(version)
+    end
+  end
+
+  desc "Migrate the database to the latest version"
+  task :migrate => 'db:migrate:up'
+end

rails_datamapper/generators/dm_install/templates/datamapper.rake

@@ -2,11 +2,17 @@ namespace :db do
 
   desc "Perform automigration"
   task :automigrate => :environment do
+    FileList["app/models/**/*.rb"].each do |model|
+      load model
+    end
     ::DataMapper.auto_migrate!
   end
 
   desc "Perform non destructive automigration"
   task :autoupgrade => :environment do
+    FileList["app/models/**/*.rb"].each do |model|
+      load model
+    end
     ::DataMapper.auto_upgrade!
   end
 

rails_datamapper/generators/dm_model/dm_model_generator.rb

@@ -1,4 +1,5 @@
 require 'rails_generator/generators/components/model/model_generator'
+require 'active_record'
 
 class DmModelGenerator <ModelGenerator
 

rails_datamapper/generators/dm_model/templates/model.rb

@@ -1,4 +1,14 @@
 class <%= class_name %>
   include DataMapper::Resource
-  property :id, Integer, :serial => true
+  property :id, Serial
+
+<% for attribute in attributes -%>
+  property :<%= attribute.name %>, <%= attribute.type.to_s.capitalize %>, :nullable => false
+
+<% end -%>
+<% unless options[:skip_timestamps] %>
+  property :created_at, DateTime, :nullable => false
+  property :updated_at, DateTime, :nullable => false
+
+<% end -%>
 end

rails_datamapper/generators/rspec_dm_model/rspec_dm_model_generator.rb

@@ -1,4 +1,5 @@
 require 'rails_generator/generators/components/model/model_generator'
+require 'active_record'
 
 class RspecDmModelGenerator <ModelGenerator
 

rails_datamapper/generators/rspec_dm_model/templates/model.rb

@@ -1,4 +1,14 @@
 class <%= class_name %>
   include DataMapper::Resource
-  property :id, Integer, :serial => true
+  property :id, Serial
+
+<% for attribute in attributes -%>
+  property :<%= attribute.name %>, <%= attribute.type.to_s.capitalize %>, :nullable => false
+
+<% end -%>
+<% unless options[:skip_timestamps] %>
+  property :created_at, DateTime, :nullable => false
+  property :updated_at, DateTime, :nullable => false
+
+<% end -%>
 end

rails_datamapper/lib/rails_datamapper/rails_datamapper.rb

@@ -1,5 +1,5 @@
 def config_file()
-  Rails.root + "/config/database.yml"
+  RAILS_ROOT + "/config/database.yml"
 end
 
 def create_connection()