diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
| commit | 824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8 (patch) | |
| tree | 1967c2a945d6e131d467fb4f0178a0f60e01ae8a /activerecord/lib/active_record.rb | |
| parent | 1ed1652bef981d9402797b6cb9f0920a40eea21a (diff) | |
| parent | db28d407f76a790a31e27bf51560e23425dd6944 (diff) | |
| download | rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.gz rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.bz2 rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rw-r--r-- | activerecord/lib/active_record.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 5942640c85..8a1aa50e24 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -111,10 +111,10 @@ module ActiveRecord autoload :TestCase autoload :TestFixtures, 'active_record/fixtures' +end - base_hook do - Arel::Table.engine = Arel::Sql::Engine.new(self) - end +ActiveSupport.on_load(:active_record) do + Arel::Table.engine = Arel::Sql::Engine.new(self) end I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
\ No newline at end of file |