aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record.rb')
-rw-r--r--activerecord/lib/active_record.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index e2f2508ae8..c80bce2849 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -33,12 +33,12 @@ require 'active_support/i18n'
require 'active_model'
require 'arel'
+require 'active_record/version'
+
module ActiveRecord
extend ActiveSupport::Autoload
eager_autoload do
- autoload :VERSION
-
autoload :ActiveRecordError, 'active_record/errors'
autoload :ConnectionNotEstablished, 'active_record/errors'
@@ -118,7 +118,7 @@ module ActiveRecord
end
ActiveSupport.on_load(:active_record) do
- Arel::Table.engine = Arel::Sql::Engine.new(self)
+ Arel::Table.engine = self
end
I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'