diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-30 16:28:12 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-30 16:28:12 -0700 |
| commit | 45edeed1ee5148e837ea9680fa0c40e4b151d6d7 (patch) | |
| tree | fb22f857ed5509d538d900f11aa311c15dd25ddc | |
| parent | 0238228e5d3ce1747a6f1d618693ffd44f947561 (diff) | |
| download | rails-45edeed1ee5148e837ea9680fa0c40e4b151d6d7.tar.gz rails-45edeed1ee5148e837ea9680fa0c40e4b151d6d7.tar.bz2 rails-45edeed1ee5148e837ea9680fa0c40e4b151d6d7.zip | |
Arel::Sql::Engine.new does not do anything anymore
| -rw-r--r-- | activerecord/lib/active_record.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index e2f2508ae8..f692e5ac89 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -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' diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 9204295d8c..80ddd5e7ab 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -834,7 +834,7 @@ module ActiveRecord #:nodoc: if self == ActiveRecord::Base Arel::Table.engine else - connection_handler.connection_pools[name] ? Arel::Sql::Engine.new(self) : superclass.arel_engine + connection_handler.connection_pools[name] ? self : superclass.arel_engine end end end |