aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/core.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
-rw-r--r--activerecord/lib/active_record/core.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 84ac6dd93d..0df62b7c62 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -116,13 +116,7 @@ module ActiveRecord
if self == ActiveRecord::Base
ActiveRecord::Base
else
- if connection_handler.connection_pools[name]
- self
- elsif superclass < ActiveRecord::Model
- superclass.arel_engine
- else
- ActiveRecord::Base
- end
+ connection_handler.connection_pools[name] ? self : active_record_super.arel_engine
end
end
end