composite_primary_keys 4.0.0.beta8 → 4.0.0.beta9

data/History.txt

@@ -1,3 +1,7 @@
+== 4.0.0.beta9 2011-082-22
+* Fix eager-loading in AR 3.1.rc6.
+
+
 == 4.0.0.beta8 2011-082-22
 * Sqlite 3 fixes (Jan Vlnas)
 * Fixes for to_key method (Jan Vlnas)

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~> 3.1.0.rc5'
+  gem 'activerecord', '~> 3.1.0.rc6'
   require 'active_record'
 end
 

data/lib/composite_primary_keys/associations/join_dependency.rb

@@ -21,6 +21,51 @@ module ActiveRecord
         remove_duplicate_results!(active_record, records, @associations)
         records
       end
+
+      protected
+
+      def construct_association(record, join_part, row)
+        return if record.id.to_s != join_part.parent.record_id(row).to_s
+
+        macro = join_part.reflection.macro
+        if macro == :has_one
+          return if record.association_cache.key?(join_part.reflection.name)
+          # CPK
+          # association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
+          association = association_for_primary_key_from_row(join_part, row)
+
+          set_target_and_inverse(join_part, association, record)
+        else
+          # CPK
+          # association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
+          association = association_for_primary_key_from_row(join_part, row)
+
+          case macro
+          when :has_many, :has_and_belongs_to_many
+            other = record.association(join_part.reflection.name)
+            other.loaded!
+            other.target.push(association) if association
+            other.set_inverse_instance(association)
+          when :belongs_to
+            set_target_and_inverse(join_part, association, record)
+          else
+            raise ConfigurationError, "unknown macro: #{join_part.reflection.macro}"
+          end
+        end
+        association
+      end
+
+      private
+
+      def association_for_primary_key_from_row(join_part, row)
+        result = nil
+        if (cpk = join_part.aliased_primary_key).is_a?(Array)
+          result = join_part.instantiate(row) if cpk.detect {|pk| row[pk].nil? }.nil?
+        else
+          result = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
+        end
+        result
+      end
     end
   end
 end

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta8'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta9'].join('.')
   end
 end

data/test/test_associations.rb

@@ -42,7 +42,7 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   # Its not generating the instances of associated classes from the rows
-  def test_find_includes_products
+  def test_find_includes
     # Old style
     products = Product.find(:all, :include => :product_tariffs)
     assert_equal(3, products.length)
@@ -54,6 +54,25 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(3, products.inject(0) {|sum, product| sum + product.product_tariffs.length})
   end
 
+  def test_find_includes_eager_loading
+    product = products(:second_product)
+    product_tarrif = product_tariffs(:second_free)
+
+    # Old style, include a where clause to force eager loading
+    products = Product.find(:all, :include => :product_tariffs,
+                                  :conditions => ["product_tariffs.product_id = ?", product.id])
+
+    assert_equal(1, products.length)
+    assert_equal(product, products.first)
+    assert_equal([product_tarrif], product.product_tariffs)
+
+    # New style
+    products = Product.includes(:product_tariffs).where('product_tariffs.product_id' => product.id)
+    assert_equal(1, products.length)
+    assert_equal(product, products.first)
+    assert_equal([product_tarrif], product.product_tariffs)
+  end
+
   def test_find_includes_tariffs
     # Old style
     tariffs = Tariff.find(:all, :include => :product_tariffs)
@@ -234,4 +253,4 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(1, memberships.length)
     assert_equal([1,1], memberships[0].id)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta8
+  version: 4.0.0.beta9
   prerelease: 6
 platform: ruby
 authors:
@@ -14,15 +14,15 @@ date: 2011-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &21190524 !ruby/object:Gem::Requirement
+  requirement: &4158840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc5
+        version: 3.1.0.rc6
   type: :runtime
   prerelease: false
-  version_requirements: *21190524
+  version_requirements: *4158840
 description: Composite key support for ActiveRecord 3
 email:
 - drnicwilliams@gmail.com