composite_primary_keys 7.0.8 → 7.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc0ec64847be066d4ea0a2e1cc8bbef8d938df03
-  data.tar.gz: 27a854255a8c832b24ada64d40d056611d147b35
+  metadata.gz: 4b5c17b61f779d1923c042647a3a0dea63142517
+  data.tar.gz: 3861e029662b85465c42b792fa44ffdfc6671c1e
 SHA512:
-  metadata.gz: 83dfb994708e614f2379506ae3282fcc3bd104ee29f37aadfb98bab8bfac019a9c9c8dd9376dd774c61e24da632296f1d7af8b8b5ada38bbbbe53f35870ed2fc
-  data.tar.gz: 688a266a56600582a2853dd913684266953e17bd591a89594f903c12cfeaa181fe0832717fa33f961f47e74d96cd512d982700e27ecd9184d7eb314c999647db
+  metadata.gz: 97c81fea4acb2ba76454d845f3d7bd009739f1d254a920a9f2332d9976e8f15113fa5e4ef8e3f7805b61e3adfcee39ce7c3866c3948251a6955af8727ddef025
+  data.tar.gz: 9e92b5600385939973741abc0bb8b27b580cd0ad5931ef1015d8de7fa2cfa5aae38df75a20b68a798a856064bccb214a5a70b3025c7369ffc0ea376f2ec2e044

data/History.rdoc

@@ -1,3 +1,8 @@
+== 7.0.9 (2014-08-03)
+
+* Second attemp at fixing instantiation of has_many records via :includes that use composite keys - this
+  time take into account no target records (Charlie Savage)
+
 == 7.0.8 (2014-08-03)
 
 * Fix instantiation of has_many records via :includes that use composite keys (Charlie Savage)

data/lib/composite_primary_keys/associations/join_dependency.rb

@@ -64,9 +64,10 @@ module ActiveRecord
           # CPK
           if key.is_a?(Array)
             id = Array(key).map do |column_alias|
-              row[column_alias]
+              value = row[column_alias]
             end
-            next if id.empty?
+            # At least the first value in the key has to be set.  Should we require all values to be set?
+            next if id.first.nil?
           else
             id = row[key]
             next if id.nil?

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 8
+    TINY  = 9
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/test_associations.rb

@@ -43,20 +43,20 @@ class TestAssociations < ActiveSupport::TestCase
     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])
-    products = Product.includes(:product_tariffs).where("product_tariffs.product_id = ?", product.id).references(:product_tariffs)
-
+    # First get a legitimate product tarrif
+    products = Product.includes(:product_tariffs).where('product_tariffs.product_id = ?', product.id).references(:product_tariffs)
     assert_equal(1, products.length)
     assert_equal(product, products.first)
-    assert_equal([product_tarrif], product.product_tariffs)
+    assert_equal([product_tarrif], products.first.product_tariffs)
+  end
 
-    # New style
-    products = Product.includes(:product_tariffs).where('product_tariffs.product_id' => product.id)
+  def test_find_eager_loading_none
+    product = products(:third_product)
+
+    products = Product.includes(:product_tariffs).where(:id => product.id).references(:product_tariffs)
     assert_equal(1, products.length)
     assert_equal(product, products.first)
-    assert_equal([product_tarrif], product.product_tariffs)
+    assert_empty(products.first.product_tariffs)
   end
 
   def test_find_includes_tariffs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.8
+  version: 7.0.9
 platform: ruby
 authors:
 - Charlie Savage