adds missing requires for arel and i18n, prevents Arel constant from being autoloaded (which was still seen), though it probably hides an issue related to dependencies

This commit is contained in:
Xavier Noria 2010-04-14 02:01:55 -07:00
parent 9a4fdff0af
commit dd635ec701
1 changed files with 3 additions and 1 deletions

View File

@ -30,6 +30,8 @@ $:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include
require 'active_support'
require 'active_model'
require 'arel'
require 'i18n'
module ActiveRecord
extend ActiveSupport::Autoload
@ -117,4 +119,4 @@ 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'
I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'