r3313@asus: jeremy | 2005-11-23 23:03:36 -0800

 Apply [3182] to stable.  Reloading a model doesn't lose track of its connection.  Closes #2996.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3183 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activerecord/CHANGELOG

@@ -2,6 +2,8 @@
 
 * Introducing the Firebird adapter.  Quote columns and use attribute_condition more consistently.  Setup guide: http://wiki.rubyonrails.com/rails/pages/Firebird+Adapter  #1874 [Ken Kunz <kennethkunz@gmail.com>]
 
+* Reloading a model doesn't lose track of its connection.  #2996 [junk@miriamtech.com, Jeremy Kemper]
+
 * Fixed bug where using update_attribute after pushing a record to a habtm association of the object caused duplicate rows in the join table. #2888 [colman@rominato.com, Florian Weber]
 
 * Add tasks to create, drop and rebuild the MySQL and PostgreSQL test  databases. [Marcel Molina Jr.]

activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb

@@ -44,7 +44,7 @@ def self.establish_connection(spec = nil)
           raise AdapterNotSpecified unless defined? RAILS_ENV
           establish_connection(RAILS_ENV)
         when ConnectionSpecification
-          @@defined_connections[self] = spec
+          @@defined_connections[name] = spec
         when Symbol, String
           if configuration = configurations[spec.to_s]
             establish_connection(configuration)
@@ -77,9 +77,9 @@ def self.retrieve_connection #:nodoc:
       klass = self
       ar_super = ActiveRecord::Base.superclass
       until klass == ar_super
-        if conn = active_connections[klass]
+        if conn = active_connections[klass.name]
           return conn
-        elsif conn = @@defined_connections[klass]
+        elsif conn = @@defined_connections[klass.name]
           klass.connection = conn
           return self.connection
         end
@@ -92,7 +92,7 @@ def self.retrieve_connection #:nodoc:
     def self.connected?
       klass = self
       until klass == ActiveRecord::Base.superclass
-        if active_connections[klass]
+        if active_connections[klass.name]
           return true
         else
           klass = klass.superclass
@@ -106,17 +106,17 @@ def self.connected?
     # can be used as argument for establish_connection, for easy
     # re-establishing of the connection.
     def self.remove_connection(klass=self)
-      conn = @@defined_connections[klass]
-      @@defined_connections.delete(klass)
-      active_connections[klass] = nil
+      conn = @@defined_connections[klass.name]
+      @@defined_connections.delete(klass.name)
+      active_connections[klass.name] = nil
       @connection = nil
       conn.config if conn
     end
 
     # Set the connection for the class.
     def self.connection=(spec)
       if spec.kind_of?(ActiveRecord::ConnectionAdapters::AbstractAdapter)
-        active_connections[self] = spec
+        active_connections[name] = spec
       elsif spec.kind_of?(ConnectionSpecification)
         self.connection = self.send(spec.adapter_method, spec.config)
       elsif spec.nil?

activerecord/test/connections/native_db2/connection.rb

@@ -1,5 +1,5 @@
 print "Using native DB2\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

activerecord/test/connections/native_firebird/connection.rb

@@ -1,5 +1,5 @@
 print "Using native Firebird\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

activerecord/test/connections/native_mysql/connection.rb

@@ -1,5 +1,5 @@
 print "Using native MySQL\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

activerecord/test/connections/native_oci/connection.rb

@@ -1,5 +1,5 @@
 print "Using OCI Oracle\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new STDOUT

activerecord/test/connections/native_postgresql/connection.rb

@@ -1,5 +1,5 @@
 print "Using native PostgreSQL\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

activerecord/test/connections/native_sqlite/connection.rb

@@ -1,5 +1,5 @@
 print "Using native SQlite\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
 

activerecord/test/connections/native_sqlite3/connection.rb

@@ -1,5 +1,5 @@
 print "Using native SQLite3\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
 

activerecord/test/connections/native_sqlite3/in_memory_connection.rb

@@ -1,5 +1,5 @@
 print "Using native SQLite3\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
 

activerecord/test/connections/native_sqlserver/connection.rb

@@ -1,5 +1,5 @@
 print "Using native SQLServer\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

activerecord/test/connections/native_sqlserver_odbc/connection.rb

@@ -1,5 +1,5 @@
 print "Using native SQLServer via ODBC\n"
-require 'fixtures/course'
+require_dependency 'fixtures/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

activerecord/test/multiple_db_test.rb

@@ -1,7 +1,9 @@
 require 'abstract_unit'
-require 'fixtures/course'
 require 'fixtures/entrant'
 
+# So we can test whether Course.connection survives a reload.
+require_dependency 'fixtures/course'
+
 class MultipleDbTest < Test::Unit::TestCase
   self.use_transactional_fixtures = false
 
@@ -45,4 +47,14 @@ def test_associations
     e3 = Entrant.find(3)
     assert_equal e3.course.id, c2.id
   end
+
+  def test_course_connection_should_survive_dependency_reload
+    assert Course.connection
+
+    Dependencies.clear
+    Object.send(:remove_const, :Course)
+    require_dependency 'fixtures/course'
+
+    assert Course.connection
+  end
 end