composite_primary_keys 3.0.3 → 3.0.4

data/History.txt

@@ -1,4 +1,10 @@
-== 3.0.1 2010-11-19
+== 3.0.4 2010-11-21
+* Support deleting records when dependent is set to :delete_all
+* Switch the method #id to return a CompositeKeys instance (thus going back to how
+  this was done in previous CPK versions)
+
+
+== 3.0.3 2010-11-19
 * Support ActiveRecord 3.0.3 and Arel 2+
 * Require ActiveRecord 3.0.3 as minimum dependency
 * Fix double quoting issue with table names - thanks to Kevin Motschiedler for a patch.

data/lib/composite_primary_keys/base.rb

@@ -96,7 +96,7 @@ module ActiveRecord
       # whether you name it the default 'id' or set it to something else.
       def id
         attr_names = self.class.primary_keys
-        Array.new(attr_names.map { |attr_name| read_attribute(attr_name) })
+        ::CompositePrimaryKeys::CompositeKeys.new(attr_names.map { |attr_name| read_attribute(attr_name) })
       end
       alias_method :ids, :id
 

data/lib/composite_primary_keys/finder_methods.rb

@@ -40,23 +40,35 @@ module CompositePrimaryKeys
         end
         
         def exists?(id = nil)
+          # ID can be:
+          #   Array - ['department_id = ? and location_id = ?', 1, 1]
+          #   Array -> [1,2]
+          #   CompositeKeys -> [1,2]
+
+          id = id.id if ::ActiveRecord::Base === id
+
           case id
+          # CPK
+          when CompositePrimaryKeys::CompositeKeys
+            relation = select(primary_keys).limit(1)
+            relation = relation.where(ids_predicate(id)) if id
+            relation.first ? true : false
           when Array
             # CPK
             if id.first.is_a?(String) and id.first.match(/\?/)
               where(id).exists?
             else
-              where(ids_predicate(id)).exists?
+              exists?(id.to_composite_keys)
             end
           when Hash
             where(id).exists?
           else
-            # CPK
-            #relation = select(primary_key).limit(1)
-            #relation = relation.where(primary_key.eq(id)) if id
+             # CPK
+             #relation = select(primary_key).limit(1)
+             #relation = relation.where(primary_key.eq(id)) if id
+             relation = select(primary_keys).limit(1)
+             relation = relation.where(ids_predicate(id)) if id
 
-            relation = select(primary_keys).limit(1)
-            relation = relation.where(ids_predicate(id)) if id
             relation.first ? true : false
           end
         end

data/lib/composite_primary_keys/relation.rb

@@ -4,9 +4,16 @@ module CompositePrimaryKeys
       module InstanceMethods
         def ids_predicate(id)
           predicate = nil
-          self.primary_keys.zip(id).each do |key, value|
-            eq = table[key].eq(value)
-            predicate = predicate ? predicate.and(eq) : eq
+
+          if id.kind_of?(CompositePrimaryKeys::CompositeKeys)
+            id = [id]
+          end
+
+          id.each do |composite_id|
+            self.primary_keys.zip(composite_id).each do |key, value|
+              eq = table[key].eq(value)
+              predicate = predicate ? predicate.and(eq) : eq
+            end
           end
           predicate
         end

data/lib/composite_primary_keys/version.rb

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

data/test/debug.log

@@ -285,3 +285,168 @@ HINT:  No operator matches the given name and argument type(s). You might need t
   SQL (0.0ms)  SET standard_conforming_strings = on
   SQL (0.0ms)  SET client_min_messages TO 'notice'
   SQL (0.0ms)  SHOW TIME ZONE
+  SQL (29.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  null value in column "product_id" violates not-null constraint
+: UPDATE "product_tariffs" SET "product_id" = NULL WHERE "product_tariffs"."product_id" = 1 AND "product_tariffs"."product_id" = 1 AND "product_tariffs"."tariff_id" = 2 AND "product_tariffs"."tariff_start_date" = '2010-11-20'
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (1.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (15.6ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (15.6ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column "tariff_idstart_date" does not exist
+LINE 1: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LE...
+                              ^
+: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LEFT OUTER JOIN "product_tariffs" ON "product_tariffs"."tariff_id" = "tariffs"."tariff_id" AND "product_tariffs"."tariff_start_date" = "tariffs"."start_date"
+PGError: ERROR:  operator does not exist: character varying = integer
+LINE 1: ...ments".person_type = 'User') AND ("comments".person_id = 1))
+                                                                  ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+: SELECT "hacks".* FROM "hacks" INNER JOIN "comments" ON ("hacks"."name" = "comments"."hack_id") WHERE (("comments".person_type = 'User') AND ("comments".person_id = 1))
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (15.6ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column "tariff_idstart_date" does not exist
+LINE 1: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LE...
+                              ^
+: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LEFT OUTER JOIN "product_tariffs" ON "product_tariffs"."tariff_id" = "tariffs"."tariff_id" AND "product_tariffs"."tariff_start_date" = "tariffs"."start_date"
+PGError: ERROR:  operator does not exist: character varying = integer
+LINE 1: ...ments".person_type = 'User') AND ("comments".person_id = 1))
+                                                                  ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+: SELECT "hacks".* FROM "hacks" INNER JOIN "comments" ON ("hacks"."name" = "comments"."hack_id") WHERE (("comments".person_type = 'User') AND ("comments".person_id = 1))
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE

data/test/fixtures/product.rb

@@ -1,6 +1,6 @@
 class Product < ActiveRecord::Base
 	set_primary_keys :id  # redundant
-	has_many :product_tariffs, :foreign_key => :product_id
+	has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
 	has_one :product_tariff, :foreign_key => :product_id
 
 	has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]

data/test/test_delete.rb

@@ -27,26 +27,26 @@ class TestDelete < ActiveSupport::TestCase
       assert @first.destroy
     end
   end
-  
+
   def test_destroy_one_alone_via_class
     testing_with do
       assert @klass.destroy(@first.id)
     end
   end
-  
+
   def test_delete_one_alone
     testing_with do
       assert @klass.delete(@first.id)
     end
   end
-  
+
   def test_delete_many
     testing_with do
       to_delete = @klass.find(:all)[0..1]
       assert_equal 2, to_delete.length
     end
   end
-  
+
   def test_delete_all
     testing_with do
       @klass.delete_all
@@ -63,21 +63,34 @@ class TestDelete < ActiveSupport::TestCase
   end
 
   def test_delete_association
-      department = Department.find(1,1)
-      assert_equal 2, department.employees.size , "Before delete employee count should be 2."
-      first_employee = department.employees[0]
-      department.employees.delete(first_employee)
-      assert_equal 1, department.employees.size, "After delete employee count should be 1."
-      department.reload
-      assert_equal 1, department.employees.size, "After delete and a reload from DB employee count should be 1."
+    department = Department.find(1,1)
+    assert_equal 2, department.employees.size , "Before delete employee count should be 2."
+    first_employee = department.employees[0]
+    department.employees.delete(first_employee)
+    assert_equal 1, department.employees.size, "After delete employee count should be 1."
+    department.reload
+    assert_equal 1, department.employees.size, "After delete and a reload from DB employee count should be 1."
+  end
+
+  def test_delete_cpk_all_association
+    # In this case the association is a has_many composite key with
+    # dependent set to :delete_all
+    product = Product.find(1)
+    assert_equal(2, product.product_tariffs.length)
+
+    product_tariff = product.product_tariffs.first
+    product.product_tariffs.delete(product_tariff)
+
+    product.reload
+    assert_equal(1, product.product_tariffs.length)
   end
 
   def test_delete_records_for_has_many_association_with_composite_primary_key
-      reference_type  = ReferenceType.find(1)
-      codes_to_delete = reference_type.reference_codes[0..1]
-      assert_equal 3, reference_type.reference_codes.size, "Before deleting records reference_code count should be 3."
-      reference_type.reference_codes.delete_records(codes_to_delete)
-      reference_type.reload
-      assert_equal 1, reference_type.reference_codes.size, "After deleting 2 records and a reload from DB reference_code count should be 1."
+    reference_type  = ReferenceType.find(1)
+    codes_to_delete = reference_type.reference_codes[0..1]
+    assert_equal 3, reference_type.reference_codes.size, "Before deleting records reference_code count should be 3."
+    reference_type.reference_codes.delete_records(codes_to_delete)
+    reference_type.reload
+    assert_equal 1, reference_type.reference_codes.size, "After deleting 2 records and a reload from DB reference_code count should be 1."
   end
 end

data/test/test_ids.rb

@@ -27,6 +27,7 @@ class TestIds < ActiveSupport::TestCase
   def test_id
     testing_with do
       assert_equal @first.id, @first.ids if composite?
+      assert_kind_of(CompositePrimaryKeys::CompositeKeys, @first.id) if composite?
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 4
+  version: 3.0.4
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 -07:00
+date: 2010-11-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency