composite_primary_keys 3.1.8 → 3.1.9

data/test/test_attribute_methods.rb

@@ -1,7 +1,7 @@
 require 'abstract_unit'
 
 class TestAttributeMethods < ActiveSupport::TestCase
-  fixtures :kitchen_sinks, :reference_types
+  fixtures :reference_types
   
   def test_read_attribute_with_single_key
     rt = ReferenceType.find(1)
@@ -11,10 +11,9 @@ class TestAttributeMethods < ActiveSupport::TestCase
   end
 
   def test_read_attribute_with_composite_keys
-    sink = KitchenSink.find(1,2)
-    assert_equal(1, sink.id_1)
-    assert_equal(2, sink.id_2)
-    assert_equal(Date.today, sink.a_date.to_date)
-    assert_equal('string', sink.a_string)
+    ref_code = ReferenceCode.find(1,1)
+    assert_equal(1, ref_code.id.first)
+    assert_equal(1, ref_code.id.last)
+    assert_equal('Mr', ref_code.abbreviation)
   end
 end

data/test/test_delete.rb

@@ -1,7 +1,8 @@
 require 'abstract_unit'
 
 class TestDelete < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :departments, :employees
+  fixtures :departments, :employees, :products, :product_tariffs,
+           :reference_types, :reference_codes
   
   CLASSES = {
     :single => {
@@ -68,12 +69,44 @@ class TestDelete < ActiveSupport::TestCase
     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
+  def test_destroy_has_one
+    # In this case the association is a has_one with
+    # dependent set to :destroy
+    department = departments(:engineering)
+    assert_not_nil(department.head)
+
+    # Get head employee id
+    head_id = department.head.id
+
+    # Delete department - should delete the head
+    department.destroy
+
+    # Verify the head is also
+    assert_raise(ActiveRecord::RecordNotFound) do
+      Employee.find(head_id)
+    end
+  end
+
+  def test_destroy_has_many_delete_all
     # 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)
 
+    # Get product_tariff length
+    product_tariff_size = ProductTariff.count
+
+    # Delete product - should delete 2 product tariffs
+    product.destroy
+
+    # Verify product_tariff are deleted
+    assert_equal(product_tariff_size - 2, ProductTariff.count)
+  end
+
+  def test_delete_cpk_association
+    product = Product.find(1)
+    assert_equal(2, product.product_tariffs.length)
+
     product_tariff = product.product_tariffs.first
     product.product_tariffs.delete(product_tariff)
 

data/test/test_habtm.rb

@@ -0,0 +1,42 @@
+require 'abstract_unit'
+
+class TestHabtm < ActiveSupport::TestCase
+
+  fixtures :suburbs, :restaurants, :restaurants_suburbs, :products
+
+  def test_has_and_belongs_to_many
+    @restaurant = Restaurant.find([1,1])
+    assert_equal 2, @restaurant.suburbs.size
+
+    @restaurant = Restaurant.find([1,1], :include => :suburbs)
+    assert_equal 2, @restaurant.suburbs.size
+  end
+
+  def test_habtm_clear_cpk_both_sides
+    @restaurant = restaurants(:mcdonalds)
+    assert_equal 2, @restaurant.suburbs.size
+    @restaurant.suburbs.clear
+    assert_equal 0, @restaurant.suburbs.size
+  end
+
+  def test_habtm_clear_cpk_owner_side_only
+    subway = restaurants(:subway_one)
+    first_product = products(:first_product)
+    second_product = products(:second_product)
+    subway.products << first_product << second_product
+    assert_equal 2, subway.products.size
+    subway.products.clear
+    assert_equal 0, subway.products.size
+  end
+
+  def test_habtm_clear_cpk_association_side_only
+    product = products(:first_product)
+    subway_one = restaurants(:subway_one)
+    subway_two = restaurants(:subway_two)
+    product.restaurants << subway_one << subway_two
+    assert_equal 2, product.restaurants.size
+    product.restaurants.clear
+    assert_equal 0, product.restaurants.size
+  end
+
+end

data/test/test_ids.rb

@@ -87,12 +87,4 @@ class TestIds < ActiveSupport::TestCase
     ref_code.id = [2,1]
     assert_equal([2,1], ref_code.id)
   end
-
-  def test_id_as_component
-    way_node = WayNode.new
-    assert_equal([nil, nil], way_node.id)
-
-    way_node.id = [2,1]
-    assert_equal([2,1], way_node.id)
-  end
 end

data/test/test_suite.rb

@@ -10,6 +10,7 @@ require 'test_delete'
 require 'test_equal'
 require 'test_exists'
 require 'test_find'
+require 'test_habtm'
 require 'test_ids'
 require 'test_miscellaneous'
 require 'test_pagination'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 3
   - 1
-  - 8
-  version: 3.1.8
+  - 9
+  version: 3.1.9
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 Z
+date: 2011-06-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -73,28 +73,17 @@ files:
 - init.rb
 - install.rb
 - loader.rb
-- lib/composite_primary_keys/associations/association.rb
 - lib/composite_primary_keys/associations/association_proxy.rb
-- lib/composite_primary_keys/associations/association_scope.rb
 - lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb
 - lib/composite_primary_keys/associations/has_many_association.rb
 - lib/composite_primary_keys/associations/has_one_association.rb
-- lib/composite_primary_keys/associations/join_dependency/join_association.rb
-- lib/composite_primary_keys/associations/join_dependency/join_part.rb
-- lib/composite_primary_keys/associations/preloader/association.rb
-- lib/composite_primary_keys/associations/preloader/belongs_to.rb
-- lib/composite_primary_keys/associations/preloader/has_and_belongs_to_many.rb
 - lib/composite_primary_keys/associations/through_association_scope.rb
 - lib/composite_primary_keys/associations.rb
 - lib/composite_primary_keys/association_preload.rb
-- lib/composite_primary_keys/attribute_methods/primary_key.rb
-- lib/composite_primary_keys/attribute_methods/read.rb
-- lib/composite_primary_keys/attribute_methods/write.rb
 - lib/composite_primary_keys/attribute_methods.rb
 - lib/composite_primary_keys/base.rb
 - lib/composite_primary_keys/calculations.rb
 - lib/composite_primary_keys/composite_arrays.rb
-- lib/composite_primary_keys/composite_predicates.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
 - lib/composite_primary_keys/connection_adapters/ibm_db_adapter.rb
 - lib/composite_primary_keys/connection_adapters/oracle_adapter.rb
@@ -103,14 +92,11 @@ files:
 - lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
 - lib/composite_primary_keys/finder_methods.rb
 - lib/composite_primary_keys/fixtures.rb
-- lib/composite_primary_keys/named_scope.rb
 - lib/composite_primary_keys/persistence.rb
 - lib/composite_primary_keys/primary_key.rb
 - lib/composite_primary_keys/query_methods.rb
 - lib/composite_primary_keys/read.rb
 - lib/composite_primary_keys/reflection.rb
-- lib/composite_primary_keys/relation/finder_methods.rb
-- lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/relation.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
@@ -138,8 +124,6 @@ files:
 - test/debug.log
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
-- test/fixtures/article_group.rb
-- test/fixtures/article_groups.yml
 - test/fixtures/capitol.rb
 - test/fixtures/capitols.yml
 - test/fixtures/comment.rb
@@ -161,8 +145,6 @@ files:
 - test/fixtures/groups.yml
 - test/fixtures/hack.rb
 - test/fixtures/hacks.yml
-- test/fixtures/kitchen_sink.rb
-- test/fixtures/kitchen_sinks.yml
 - test/fixtures/membership.rb
 - test/fixtures/memberships.yml
 - test/fixtures/membership_status.rb
@@ -200,7 +182,6 @@ files:
 - test/fixtures/tariffs.yml
 - test/fixtures/user.rb
 - test/fixtures/users.yml
-- test/fixtures/way_node.rb
 - test/hash_tricks.rb
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
@@ -216,6 +197,7 @@ files:
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
+- test/test_habtm.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_pagination.rb
@@ -277,6 +259,7 @@ test_files:
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
+- test/test_habtm.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_pagination.rb

data/lib/composite_primary_keys/associations/association.rb

@@ -1,23 +0,0 @@
-module ActiveRecord
-  module Associations
-    class Association
-      def creation_attributes
-        attributes = {}
-
-        if reflection.macro.in?([:has_one, :has_many]) && !options[:through]
-          # CPK
-          # attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
-          Array(reflection.foreign_key).zip(Array(reflection.active_record_primary_key)).each do |key1, key2|
-            attributes[key1] = owner[key2]
-          end
-
-          if reflection.options[:as]
-            attributes[reflection.type] = owner.class.base_class.name
-          end
-        end
-
-        attributes
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -1,67 +0,0 @@
-module ActiveRecord
-  module Associations
-    class AssociationScope
-      def add_constraints(scope)
-        tables = construct_tables
-
-        chain.each_with_index do |reflection, i|
-          table, foreign_table = tables.shift, tables.first
-
-          if reflection.source_macro == :has_and_belongs_to_many
-            join_table = tables.shift
-
-            # CPK
-            # scope = scope.joins(join(
-            #  join_table,
-            #  table[reflection.active_record_primary_key].
-            #    eq(join_table[reflection.association_foreign_key])
-            #))
-            predicate = cpk_join_predicate(table, reflection.association_primary_key,
-                                           join_table, reflection.association_foreign_key)
-            scope = scope.joins(join(join_table, predicate))
-
-            table, foreign_table = join_table, tables.first
-          end
-
-          if reflection.source_macro == :belongs_to
-            key         = reflection.association_primary_key
-            foreign_key = reflection.foreign_key
-          else
-            key         = reflection.foreign_key
-            foreign_key = reflection.active_record_primary_key
-          end
-
-          if reflection == chain.last
-            # CPK
-            # scope = scope.where(table[key].eq(owner[foreign_key]))
-            predicate = cpk_join_predicate(table, key, owner, foreign_key)
-            scope = scope.where(predicate)
-
-            conditions[i].each do |condition|
-              if options[:through] && condition.is_a?(Hash)
-                condition = { table.name => condition }
-              end
-
-              scope = scope.where(interpolate(condition))
-            end
-          else
-            # CPK
-            # constraint = table[key].eq(foreign_table[foreign_key])
-            constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
-            scope = scope.where(predicate)
-
-            join       = join(foreign_table, constraint)
-
-            scope = scope.joins(join)
-
-            unless conditions[i].empty?
-              scope = scope.where(sanitize(conditions[i], table))
-            end
-          end
-        end
-
-        scope
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/associations/join_dependency/join_association.rb

@@ -1,22 +0,0 @@
-module ActiveRecord
-  module Associations
-    class JoinDependency
-      class JoinAssociation
-        def build_constraint(reflection, table, key, foreign_table, foreign_key)
-          # CPK
-          # constraint = table[key].eq(foreign_table[foreign_key])
-          constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
-
-          if reflection.klass.finder_needs_type_condition?
-            constraint = table.create_and([
-              constraint,
-              reflection.klass.send(:type_condition, table)
-            ])
-          end
-
-          constraint
-        end
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/associations/join_dependency/join_part.rb

@@ -1,39 +0,0 @@
-module ActiveRecord
-  module Associations
-    class JoinDependency
-      class JoinPart
-        def aliased_primary_key
-          # CPK
-          # "#{aliased_prefix}_r0"
-
-          active_record.composite? ?
-            primary_key.inject([]) {|aliased_keys, key| aliased_keys << "#{ aliased_prefix }_r#{aliased_keys.length}"} :
-            "#{ aliased_prefix }_r0"
-        end
-
-        def record_id(row)
-          # CPK
-          # row[aliased_primary_key]
-          active_record.composite? ?
-            aliased_primary_key.map {|key| row[key]}.to_composite_keys :
-            row[aliased_primary_key]
-        end
-
-        def column_names_with_alias
-          unless @column_names_with_alias
-            @column_names_with_alias = []
-
-            # CPK
-            #([primary_key] + (column_names - [primary_key])).each_with_index do |column_name, i|
-            keys = active_record.composite? ? primary_key.map(&:to_s) : [primary_key]
-
-            (keys + (column_names - keys)).each_with_index do |column_name, i|
-              @column_names_with_alias << [column_name, "#{aliased_prefix}_r#{i}"]
-            end
-          end
-          @column_names_with_alias
-        end
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/associations/preloader/association.rb

@@ -1,61 +0,0 @@
-module ActiveRecord
-  module Associations
-    class Preloader
-      class Association
-        def records_for(ids)
-          # CPK
-          # scoped.where(association_key.in(ids))
-          predicate = cpk_in_predicate(table, reflection.foreign_key, ids)
-          scoped.where(predicate)
-        end
-        
-        def associated_records_by_owner
-          # CPK
-          # owner_keys = owners.map { |owner| owner[owner_key_name] }.compact.uniq
-          owner_keys = owners.map do |owner|
-            Array(owner_key_name).map do |owner_key|
-              owner[owner_key]
-            end
-          end.compact.uniq
-
-          if klass.nil? || owner_keys.empty?
-            records = []
-          else
-            # Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
-            # Make several smaller queries if necessary or make one query if the adapter supports it
-            sliced  = owner_keys.each_slice(model.connection.in_clause_length || owner_keys.size)
-            records = sliced.map { |slice| records_for(slice) }.flatten
-          end
-
-          # Each record may have multiple owners, and vice-versa
-          records_by_owner = Hash[owners.map { |owner| [owner, []] }]
-          records.each do |record|
-            # CPK
-            # owner_key = record[association_key_name].to_s
-            owner_key = Array(association_key_name).map do |key_name|
-              record[key_name]
-            end.join(CompositePrimaryKeys::ID_SEP)
-
-            owners_by_key[owner_key].each do |owner|
-              records_by_owner[owner] << record
-            end
-          end
-          records_by_owner
-        end
-
-        def owners_by_key
-          @owners_by_key ||= owners.group_by do |owner|
-            # CPK
-            # key = owner[owner_key_name]
-            key = Array(owner_key_name).map do |key_name|
-              owner[key_name]
-            end
-            # CPK
-            # key && key.to_s
-            key && key.join(CompositePrimaryKeys::ID_SEP)
-          end
-        end
-      end
-    end
-  end
-end