methodmissing-mysqlplus_adapter 1.0.1 → 1.0.2

data/README.textile

@@ -82,7 +82,7 @@ Since ActiveRecord 2.1 preloading favors multiple efficient queries to cumbersom
 
 h2. Garbage Collection
 
-There's some experimental GC patches "available":http://github.com/oldmoe/mysqlplus/tree/with_async_validation - the mysql ruby gem forces GC every 20 queries, that's a guaranteed GC cycle every 5th request for a request with a 4 query overhead.
+There's some experimental GC patches "available":http://github.com/oldmoe/mysqlplus/tree/with_async_validation - the mysql ruby gem forces GC every 20 queries, that's a guaranteed GC cycle every 5th request for a request with a 4 query overhead.This adapter will automatically detect the presence of those patches and disable the forced GC runs.
 
 h2. Stability
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 1
 :minor: 0

data/lib/active_record/connection_adapters/mysqlplus_adapter.rb

@@ -11,7 +11,7 @@ end
 
 begin 
   require_library_or_gem('fastthread')
-rescue => LoadError
+rescue LoadError
   $stderr.puts "'gem install fastthread' for better performance"
 end  
 
@@ -36,7 +36,7 @@ module ActiveRecord
         if skip_logging
           @connection.c_async_query( sql )
         else  
-          log("(Socket #{socket.to_s}) #{sql}",name) do 
+          log("(Socket #{socket.to_s}, Thread #{Thread.current.object_id.to_s}) #{sql}",name) do 
             @connection.c_async_query( sql )
           end
         end  

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

@@ -7,7 +7,7 @@ module ActiveRecord
         def install!
           ActiveRecord::Base.send :extend, SingletonMethods      
           ar_eigenclass::VALID_FIND_OPTIONS << :defer
-          alias_deferred :find, :find_by_sql, :preload_associations
+          alias_deferred :find, :find_by_sql, :preload_associations, :find_every
         end
 
         private
@@ -35,13 +35,27 @@ module ActiveRecord
       # connection.
       # 
       # ....
-      # Record.find(:first, :include => [:other. :another], :defer => true)
+      # Record.find(:first, :include => [:other, :another], :defer => true)
       # .... 
       #
       def preload_associations_with_defer(records, associations, preload_options={})
-        if preload_options.key?(:defer)
-          ActiveRecord::Deferrable::Result.new do
-            preload_associations_without_defer(records, associations, preload_options)
+        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_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|
+              raise "parent must be an association name" unless parent.is_a?(String) || parent.is_a?(Symbol)
+              preload_associations(records, parent, preload_options)
+              reflection = reflections[parent]
+              parents = records.map {|record| record.send(reflection.name)}.flatten.compact
+              unless parents.empty?
+                parents.first.class.preload_associations(parents, child)
+              end
+            end
           end
         else
           preload_associations_without_defer(records, associations, preload_options)
@@ -91,6 +105,37 @@ module ActiveRecord
           with_scope( { :find => { :defer => true } }, :merge, &block )
         end
 
+        def find_every_with_defer(options) #:nodoc:
+          include_associations = merge_includes(scope(:find, :include), options[:include])
+          if include_associations.any? && references_eager_loaded_tables?(options)
+            records = find_with_associations(options)
+          else
+            records = find_by_sql(construct_finder_sql(options))
+            if include_associations.any?
+              preload_associations(records, preload_deferred_includes( include_associations, options ))
+            end
+          end
+
+          records.each { |record| record.readonly! } if options[:readonly]
+
+          records
+        end
+
+        def preload_deferred_includes( include_associations, options ) #:nodoc:
+          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

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

@@ -15,7 +15,7 @@ module ActiveRecord
       # back in on completion.
       #
       def defer!( deferrable )
-        @result = Thread.new( deferrable ) do |deferrable|
+        @result = ::Thread.new( deferrable ) do |deferrable|
           begin
             deferrable.call 
           rescue => exception
@@ -38,7 +38,7 @@ module ActiveRecord
       # Re-raise any Exceptions from the background Thread.
       #
       def validate!
-        raise @_result if @_result.is_a?( Exception )
+        raise @_result if @_result.is_a?( ::Exception )
       end
 
     end    

data/test/deferrable/macro_test.rb

@@ -0,0 +1,32 @@
+require "#{File.dirname(__FILE__)}/../helper"
+
+Mysqlplus::Test.prepare!
+
+class MacroTest < ActiveSupport::TestCase
+
+  def teardown
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection( Mysqlplus::Test::CONNECTION_SPEC )
+    super
+  end
+
+  def test_should_be_able_to_find_records_in_a_background_thread
+    ActiveRecord::Base.connection_pool.expects(:release_connection).twice 
+    assert_equal MysqlUser.find(:first, :defer => true), MysqlUser.find(:first) 
+    assert_instance_of MysqlUser, MysqlUser.find(:first, :defer => true)
+  end
+
+  def test_should_be_able_to_find_records_by_sql_background_thread
+    ActiveRecord::Base.connection_pool.expects(:release_connection).once    
+    assert_equal MysqlUser.find_by_sql("SELECT * FROM mysql.user WHERE User = 'root'", true), MysqlUser.find(:all, :conditions => ['user.User = ?', 'root'])
+  end
+
+  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)
+    sleep(0.5)
+  end
+    
+end
+
+Thread.list.each{|t| t.join unless t == Thread.main }

data/test/helper.rb

@@ -1,11 +1,20 @@
 require 'rubygems'
+require 'mocha'
 require 'active_support'
+require 'active_support/test_case'
 require 'activerecord'
+
 ActiveRecord.load_all!
 
 module Mysqlplus
   class Test
     
+    CONNECTION_SPEC = { :adapter  => 'mysqlplus',
+                        :username => 'root',
+                        :database => 'mysql',
+                        :pool => 5,
+                        :warmup => true }
+    
     MODELS_DIR = "#{File.dirname(__FILE__)}/models".freeze
     
     class << self
@@ -32,17 +41,13 @@ module Mysqlplus
       end
 
       def test_files
-        glob( "#{File.dirname(__FILE__)}/*_test.rb" )
+        glob( "#{File.dirname(__FILE__)}/**/*_test.rb" )
       end
 
       private
 
       def connect!
-        ::ActiveRecord::Base.establish_connection( :adapter  => 'mysqlplus',
-                                                   :username => 'root',
-                                                   :database => 'mysql',
-                                                   :pool => 5,
-                                                   :warmup => true )
+        ::ActiveRecord::Base.establish_connection( CONNECTION_SPEC )
       end
 
       def require_models

data/test/models/mysql_user.rb

@@ -1,3 +1,6 @@
 class MysqlUser < ActiveRecord::Base  
   set_table_name 'user'
+  set_primary_key :User
+  
+  has_one :mysql_user_info, :class_name => 'MysqlUserInfo', :foreign_key => :User
 end

data/test/models/mysql_user_info.rb

@@ -0,0 +1,6 @@
+class MysqlUserInfo < ActiveRecord::Base  
+  set_table_name 'user_info'
+  set_primary_key :User
+  
+  belongs_to :mysql_user, :class_name => 'MysqlUser', :foreign_key => :User
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: methodmissing-mysqlplus_adapter
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-07 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -35,10 +35,12 @@ files:
 - test/connections
 - test/connections/mysqlplus
 - test/connections/mysqlplus/connection.rb
-- test/deferrable_test.rb
+- test/deferrable
+- test/deferrable/macro_test.rb
 - test/helper.rb
 - test/models
 - test/models/mysql_user.rb
+- test/models/mysql_user_info.rb
 has_rdoc: true
 homepage: http://github.com/methodmissing/mysqplus_adapter
 post_install_message: 

data/test/deferrable_test.rb

@@ -1,15 +0,0 @@
-require "#{File.dirname(__FILE__)}/helper"
-Mysqlplus::Test.prepare!
-
-class DeferrableTest < Test::Unit::TestCase
-  
-  def test_should_be_able_to_find_records_in_a_background_thread
-    assert_equal MysqlUser.find(:first, :defer => true), MysqlUser.find(:first) 
-    assert_instance_of MysqlUser, MysqlUser.find(:first, :defer => true)
-  end
-
-  def test_should_be_able_to_find_records_by_sql_background_thread
-    assert_equal MysqlUser.find_by_sql("SELECT * FROM mysql.user WHERE User = 'root'", true), MysqlUser.find(:all, :conditions => ['user.User = ?', 'root']) 
-  end
-    
-end