From 6af7192af59602e1cbb341b8bf3452afb344eff2 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 18 Dec 2011 23:35:25 +0000
Subject: I herd you like modules.

---
 activerecord/lib/active_record/core.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/core.rb')

diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index dfd239a998..84ac6dd93d 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -65,6 +65,11 @@ module ActiveRecord
       # Specify whether or not to use timestamps for migration versions
       cattr_accessor :timestamped_migrations , :instance_writer => false
       self.timestamped_migrations = true
+
+      ##
+      # :singleton-method:
+      # The connection handler
+      class_attribute :connection_handler, :instance_writer => false
     end
 
     module ClassMethods
@@ -111,7 +116,13 @@ module ActiveRecord
           if self == ActiveRecord::Base
             ActiveRecord::Base
           else
-            connection_handler.connection_pools[name] ? self : superclass.arel_engine
+            if connection_handler.connection_pools[name]
+              self
+            elsif superclass < ActiveRecord::Model
+              superclass.arel_engine
+            else
+              ActiveRecord::Base
+            end
           end
         end
       end
-- 
cgit v1.2.3