lib/tasks/db.rake in gris-0.5.8 vs lib/tasks/db.rake in gris-0.5.9

- old
+ new

@@ -1,9 +1,19 @@ -if File.file? 'config/database.yml' - require 'active_record_migrations' +if Module.const_defined?(:ActiveRecord) && + (File.file?('config/database.yml') || ENV['DATABASE_URL']) && + File.file?('config/initializers/active_record.rb') - ActiveRecordMigrations.configure do |c| - c.yaml_config = 'config/database.yml' + require 'erb' + require './config/initializers/active_record' + include ActiveRecord::Tasks + + DatabaseTasks.env = Gris.env + DatabaseTasks.db_dir = 'db' + DatabaseTasks.migrations_paths = "#{DatabaseTasks.db_dir}/migrate" + DatabaseTasks.seed_loader = Gris::SeedLoader.new "./#{DatabaseTasks.db_dir}/seeds.rb" + DatabaseTasks.database_configuration = ActiveRecord::Base.configurations + + task :environment do end - ActiveRecordMigrations.load_tasks + load 'active_record/railties/databases.rake' end