Permalink
Browse files

Merge pull request #5995 from kennyj/fix_5847-3

Fix #5847 and #4045. Load AR::Base before loading an application model.
  • Loading branch information...
2 parents 2f0c8c5 + 627f89b commit 8cd14c0bc9f9429f03d1181912355d2f48b98157 @jonleighton jonleighton committed Apr 26, 2012
Showing with 27 additions and 0 deletions.
  1. +5 −0 activerecord/lib/active_record/railtie.rb
  2. +22 −0 railties/test/application/rake_test.rb
@@ -128,5 +128,10 @@ class Railtie < Rails::Railtie
end
end
+
+ config.after_initialize do
+ # We should load ActiveRecord::Base class before loading an application model.
+ require "active_record/base"
+ end
end
end
@@ -167,5 +167,27 @@ def test_rake_clear_schema_cache
end
assert !File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
end
+
+ def test_load_activerecord_base_when_we_use_observers
+ Dir.chdir(app_path) do
+ `bundle exec rails g model user;
+ bundle exec rake db:migrate;
+ bundle exec rails g observer user;`
+
+ add_to_config "config.active_record.observers = :user_observer"
+
+ assert_equal "0", `bundle exec rails r "puts User.count"`.strip
+
+ app_file "lib/tasks/count_user.rake", <<-RUBY
+ namespace :user do
+ task :count => :environment do
+ puts User.count
+ end
+ end
+ RUBY
+
+ assert_equal "0", `bundle exec rake user:count`.strip
+ end
+ end
end
end

0 comments on commit 8cd14c0

Please sign in to comment.