diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-26 18:47:55 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-26 18:47:55 +0100 |
| commit | 395d6648ce7549f71dd0a76dc061e87f608aaaab (patch) | |
| tree | 4dbb6eb54ff784143bf6e2f671057f0b8162dba5 /activerecord/lib/active_record | |
| parent | fc266d7ec2cf1d3f9daf585ea6b79b61467a175f (diff) | |
| download | rails-395d6648ce7549f71dd0a76dc061e87f608aaaab.tar.gz rails-395d6648ce7549f71dd0a76dc061e87f608aaaab.tar.bz2 rails-395d6648ce7549f71dd0a76dc061e87f608aaaab.zip | |
Move application configuration to the application configuration object, remove railtie_name and engine_name and allow to set the configuration object.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 60addd46c6..de47461c73 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -10,7 +10,7 @@ require "action_controller/railtie" module ActiveRecord class Railtie < Rails::Railtie - railtie_name :active_record + config.active_record = ActiveSupport::OrderedOptions.new config.generators.orm :active_record, :migration => true, :timestamps => true @@ -19,9 +19,8 @@ module ActiveRecord load "active_record/railties/databases.rake" end - # TODO If we require the wrong file, the error never comes up. require "active_record/railties/log_subscriber" - log_subscriber ActiveRecord::Railties::LogSubscriber.new + log_subscriber :active_record, ActiveRecord::Railties::LogSubscriber.new initializer "active_record.initialize_timezone" do ActiveRecord.base_hook do |