Ensure a clean connection pool state for the deferred test cases

Author: methodmissing

lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/macro.rb

@@ -39,11 +39,12 @@ module SingletonMethods
       # .... 
       #
       def preload_associations_with_defer(records, associations, preload_options={})
-        if preload_options.key?(:defer)
+        if preload_deferred?( associations )        
+          associations.delete(:defer)
           records = [records].flatten.compact.uniq
           return if records.empty?
           case associations
-          when Array then associations.each {|association| ActiveRecord::Deferrable::Result.new{ preload_associations(records, association, preload_options) } }
+          when Array then associations.each {|association| ActiveRecord::Deferrable::Result.new{ preload_associations_without_defer(records, association, preload_options) } }
           when Symbol, String then ActiveRecord::Deferrable::Result.new{ preload_one_association(records, associations.to_sym, preload_options) }
           when Hash then
             associations.each do |parent, child|
@@ -111,7 +112,7 @@ def find_every_with_defer(options) #:nodoc:
           else
             records = find_by_sql(construct_finder_sql(options))
             if include_associations.any?
-              preload_associations(records, include_associations, options)
+              preload_associations(records, preload_deferred_includes( include_associations, options ))
             end
           end
 
@@ -120,6 +121,21 @@ def find_every_with_defer(options) #:nodoc:
           records
         end
 
+        def preload_deferred_includes( include_associations, options )
+          options[:defer] ? (Array(include_associations) << :defer) : include_associations
+        end
+
+        def preload_deferred?( associations ) #:nodoc:
+          begin
+            associations.respond_to?(:include?) && associations.include?(:defer)
+          rescue TypeError
+            #failing test cases :
+            # * test_eager_with_valid_association_as_string_not_symbol(EagerAssociationTest) && 
+            # * test_eager_with_invalid_association_reference(EagerAssociationTest)            
+            false
+          end
+        end
+
     end
 
   end

lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/result.rb

@@ -16,7 +16,6 @@ def initialize( &deferrable )
       #
       def defer!( deferrable )
         @result = Thread.new( deferrable ) do |deferrable|
-          puts '*'
           begin
             deferrable.call 
           rescue => exception

test/deferrable/macro_test.rb

@@ -1,7 +1,13 @@
 require "#{File.dirname(__FILE__)}/../helper"
 Mysqlplus::Test.prepare!
 
-class MacroTest < ActiveSupport::TestCase
+class MacroTest < ActiveRecord::TestCase
+
+  def teardown
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(Mysqlplus::Test::CONNECTION)
+    super
+  end
 
   def test_should_be_able_to_find_records_in_a_background_thread
     ActiveRecord::Base.connection_pool.expects(:release_connection).twice 
@@ -16,7 +22,8 @@ def test_should_be_able_to_find_records_by_sql_background_thread
 
   def test_should_be_able_to_preload_related_records_on_multiple_connections
     ActiveRecord::Base.connection_pool.expects(:release_connection).twice
-    assert_instance_of MysqlUser, MysqlUser.find( :first, :defer => true, :include => [:mysql_user_info])
+    assert_instance_of MysqlUser, MysqlUser.find( :first, :defer => true, :include => :mysql_user_info)
+    sleep(0.5)
   end
 
 end

test/helper.rb

@@ -8,6 +8,12 @@
 module Mysqlplus
   class Test
 
+    CONNECTION = { :adapter  => 'mysqlplus',
+                   :username => 'root',
+                   :database => 'mysql',
+                   :pool => 5,
+                   :warmup => true }
+    
     MODELS_DIR = "#{File.dirname(__FILE__)}/models".freeze
 
     class << self
@@ -40,11 +46,7 @@ def test_files
       private
 
       def connect!
-        ::ActiveRecord::Base.establish_connection( :adapter  => 'mysqlplus',
-                                                   :username => 'root',
-                                                   :database => 'mysql',
-                                                   :pool => 5,
-                                                   :warmup => true )
+        ::ActiveRecord::Base.establish_connection( CONNECTION )
       end
 
       def require_models