composite_primary_keys 3.1.9 → 3.1.10

data/History.txt

@@ -1,3 +1,9 @@
+== 3.1.10 2011-07-08
+* Bugfix for belongs_to with includes (John Ash)
+* Improved tests for calling clear on a habtm association, which involved (David Rueck)
+* Fixed bug that resulted in unrelated records being deleted when calling (David Rueck)
+* Output deprecation warnings about extra columns in join table CPK-aware (David Rueck)
+
 == 3.1.9 2011-06-04
 * Improve HABTM association tests (David Rueck)
 * Remove deprecated Rake tasks (Charlie Savage)

data/lib/composite_primary_keys/associations.rb

@@ -128,7 +128,8 @@ module ActiveRecord
                                           parent_table, reflection.options[:primary_key] || parent.primary_key)
               end
             when :belongs_to
-              [aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(parent_table[options[:foreign_key] || reflection.primary_key_name])]
+              #[aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(parent_table[options[:foreign_key] || reflection.primary_key_name])]
+              composite_join_predicates(aliased_table, options[:primary_key] || reflection.klass.primary_key, parent_table, options[:foreign_key] || reflection.primary_key_name)
             end
 
             unless klass.descends_from_active_record?

data/lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb

@@ -108,7 +108,7 @@ module ActiveRecord
         else
           relation = Arel::Table.new(@reflection.options[:join_table])
 
-          if @reflection.cpk_primary_key 
+          if @reflection.cpk_primary_key.size > 1 
             owner_conditions = []
             @reflection.cpk_primary_key.each_with_index do |column,i|
               owner_conditions << relation[column.to_sym].eq(@owner.id[i])

data/lib/composite_primary_keys/finder_methods.rb

@@ -50,7 +50,7 @@ module CompositePrimaryKeys
           case id
           # CPK
           when CompositePrimaryKeys::CompositeKeys
-            relation = select(primary_keys).limit(1)
+            relation = select("1").limit(1)
             relation = relation.where_cpk_id(id) if id
             relation.first ? true : false
           when Array
@@ -66,7 +66,7 @@ module CompositePrimaryKeys
             # CPK
             #relation = select(primary_key).limit(1)
             #relation = relation.where(primary_key.eq(id)) if id
-            relation = select(primary_keys).limit(1)
+            relation = select("1").limit(1)
             relation = relation.where_cpk_id(id) if id
             relation.first ? true : false
           end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 9
+    TINY  = 10
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/fixtures/products.yml

@@ -1,7 +1,9 @@
 first_product:
   id: 1
   name: Product One
-  
 second_product:
   id: 2
-  name: Product Two
+  name: Product Two
+third_product:
+  id: 3
+  name: Product Three

data/test/fixtures/suburbs.yml

@@ -6,4 +6,7 @@ second:
   city_id: 2
   suburb_id: 1
   name: Second Suburb
-  
+no_mcdonalds:
+  city_id: 1
+  suburb_id: 2
+  name: Third Suburb  

data/test/test_associations.rb

@@ -6,7 +6,7 @@ class TestAssociations < ActiveSupport::TestCase
            :departments, :memberships
   
   def test_count
-    assert_equal(2, Product.count(:include => :product_tariffs))
+    assert_equal(3, Product.count(:include => :product_tariffs))
     assert_equal(3, Tariff.count(:include => :product_tariffs))
 
     expected = {Date.today => 2,
@@ -40,14 +40,14 @@ class TestAssociations < ActiveSupport::TestCase
   def test_find_includes_products
     # Old style
     assert @products = Product.find(:all, :include => :product_tariffs)
-    assert_equal 2, @products.length
+    assert_equal 3, @products.length
     assert_not_nil @products.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'
     assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length},
       "Incorrect number of product_tariffs returned"
 
     # New style
     assert @products = Product.includes(:product_tariffs)
-    assert_equal 2, @products.length
+    assert_equal 3, @products.length
     assert_not_nil @products.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'
     assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length},
       "Incorrect number of product_tariffs returned"
@@ -93,6 +93,11 @@ class TestAssociations < ActiveSupport::TestCase
     assert_not_nil @product_tariffs.first.instance_variable_get('@tariff'), '@tariff not set'
   end
 
+  def test_new_style_includes_with_conditions
+    product_tariff = ProductTariff.includes(:tariff).where('tariffs.amount < 5').first
+    assert_equal(0, product_tariff.tariff.amount)
+  end
+
   def test_find_includes_extended
     assert @products = Product.find(:all, :include => {:product_tariffs => :tariff})
     assert_equal 3, @products.inject(0) {|sum, product| sum + product.instance_variable_get('@product_tariffs').length},

data/test/test_habtm.rb

@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'ruby-debug'
 
 class TestHabtm < ActiveSupport::TestCase
 
@@ -12,6 +13,48 @@ class TestHabtm < ActiveSupport::TestCase
     assert_equal 2, @restaurant.suburbs.size
   end
 
+  def test_include_cpk_both_sides
+    # assuming the association was set up in the fixtures
+    # file restaurants_suburbs.yml
+    mcdonalds = restaurants(:mcdonalds)
+    # check positive
+    suburb = mcdonalds.suburbs[0]
+    assert mcdonalds.suburbs.include?(suburb)
+    # check negative
+    suburb_with_no_mcdonalds = suburbs(:no_mcdonalds)
+    assert !mcdonalds.suburbs.include?(suburb_with_no_mcdonalds)
+  end
+
+  def test_include_cpk_owner_side_only
+    subway = restaurants(:subway_one)
+    product = products(:first_product)
+    subway.products << product
+
+    # reload
+    # test positive
+    subway = restaurants(:subway_one)
+    assert subway.products.include?(product)
+
+    # test negative
+    product_two = products(:second_product)
+    assert !subway.products.include?(product_two)
+  end
+
+  def test_include_cpk_association_side_only
+    product = products(:first_product)
+    subway = restaurants(:subway_one)
+    product.restaurants << subway
+    
+    # reload
+    # test positive
+    product = products(:first_product)
+    assert product.restaurants.include?(subway)
+
+    # test negative
+    mcdonalds = restaurants(:mcdonalds)
+    assert !product.restaurants.include?(mcdonalds)
+  end
+
   def test_habtm_clear_cpk_both_sides
     @restaurant = restaurants(:mcdonalds)
     assert_equal 2, @restaurant.suburbs.size
@@ -26,6 +69,8 @@ class TestHabtm < ActiveSupport::TestCase
     subway.products << first_product << second_product
     assert_equal 2, subway.products.size
     subway.products.clear
+    # reload to force reload of associations
+    subway = restaurants(:subway_one)
     assert_equal 0, subway.products.size
   end
 
@@ -36,7 +81,36 @@ class TestHabtm < ActiveSupport::TestCase
     product.restaurants << subway_one << subway_two
     assert_equal 2, product.restaurants.size
     product.restaurants.clear
+    # reload to force reload of associations
+    product = products(:first_product)
     assert_equal 0, product.restaurants.size
   end
 
+  # tests case reported in issue #39 where a bug resulted in
+  # deletion of incorrect join table records because the owner's id
+  # was assumed to be an array and is not in this case
+  # and evaluates to a useable but incorrect value
+  def test_habtm_clear_cpk_association_side_only_deletes_only_correct_records
+    product_one = Product.find(1)
+    product_three = Product.find(3)
+    subway_one = restaurants(:subway_one)
+    subway_two = restaurants(:subway_two)
+    product_one.restaurants << subway_one << subway_two
+    product_three.restaurants << subway_one << subway_two
+    assert_equal 2, product_one.restaurants.size
+    assert_equal 2, product_three.restaurants.size
+
+    # if product_three's id is incorrectly assumed to be
+    # an array it will be evaluated as 3[0], which is 1, which would
+    # delete product_one's associations rather than product_three's
+    product_three.restaurants.clear
+    
+    # reload to force reload of associations
+    product_one = Product.find(1)
+    product_three = Product.find(3)
+    
+    assert_equal 0, product_three.restaurants.size
+    assert_equal 2, product_one.restaurants.size
+  end
+
 end

data/test/test_miscellaneous.rb

@@ -31,7 +31,7 @@ class TestMiscellaneous < ActiveSupport::TestCase
   end
   
   def test_count
-    assert_equal 2, Product.count
+    assert_equal 3, Product.count
   end
   
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 3
   - 1
-  - 9
-  version: 3.1.9
+  - 10
+  version: 3.1.10
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 Z
+date: 2011-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord