Merge pull request #5000 from flavorpill/master-with-multidb-association-fix

Fix associations with per-class/multiple database connections

1 files changed, 12 insertions, 0 deletions

diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb
index e704322b5d..a802cfbf31 100644
--- a/activerecord/test/cases/multiple_db_test.rb
+++ b/activerecord/test/cases/multiple_db_test.rb
@@ -10,6 +10,7 @@ class MultipleDbTest < ActiveRecord::TestCase
 
   def setup
     @courses  = create_fixtures("courses") { Course.retrieve_connection }
+    @colleges = create_fixtures("colleges") { College.retrieve_connection }
     @entrants = create_fixtures("entrants")
   end
 
@@ -87,4 +88,15 @@ class MultipleDbTest < ActiveRecord::TestCase
   def test_arel_table_engines
     assert_equal Entrant.arel_engine, Bird.arel_engine
   end
+
+  def test_associations_should_work_when_model_has_no_connection
+    begin
+      ActiveRecord::Model.remove_connection
+      assert_nothing_raised ActiveRecord::ConnectionNotEstablished do
+        College.first.courses.first
+      end
+    ensure
+      ActiveRecord::Model.establish_connection 'arunit'
+    end
+  end
 end