composite_primary_keys 7.0.13 → 7.0.14

data/test/test_attributes.rb

@@ -1,61 +1,61 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestAttributes < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-  
-  def test_brackets
-    testing_with do
-      @first.attributes.each_pair do |attr_name, value|
-        assert_equal value, @first[attr_name]
-      end
-    end
-  end
-
-  def test_brackets_primary_key
-    testing_with do
-      assert_equal(@first.id, @first[@primary_keys])
-      assert_equal(@first.id, @first[@first.class.primary_key])
-    end
-  end
-
-  def test_brackets_assignment
-    testing_with do
-      @first.attributes.each_pair do |attr_name, value|
-        next if attr_name == @first.class.primary_key
-        @first[attr_name]= !value.nil? ? value * 2 : '1'
-        assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
-      end
-    end
-  end
-    
-  def test_brackets_foreign_key_assignment
-    tarrif = tariffs(:flat)
-    product_tariff = product_tariffs(:first_flat)
-    compare_indexes(tarrif, tarrif.class.primary_key, product_tariff, [:tariff_id, :tariff_start_date])
-  end
-  
-  private
-
-  def compare_indexes(obj1, indexes1, obj2, indexes2)
-    indexes1.length.times do |key_index|
-      key1 = indexes1[key_index]
-      key2 = indexes2[key_index]
-      assert_equal(obj1[key1], obj2[key2])
-    end
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestAttributes < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+  
+  def test_brackets
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        assert_equal value, @first[attr_name]
+      end
+    end
+  end
+
+  def test_brackets_primary_key
+    testing_with do
+      assert_equal(@first.id, @first[@primary_keys])
+      assert_equal(@first.id, @first[@first.class.primary_key])
+    end
+  end
+
+  def test_brackets_assignment
+    testing_with do
+      @first.attributes.each_pair do |attr_name, value|
+        next if attr_name == @first.class.primary_key
+        @first[attr_name]= !value.nil? ? value * 2 : '1'
+        assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
+      end
+    end
+  end
+    
+  def test_brackets_foreign_key_assignment
+    tarrif = tariffs(:flat)
+    product_tariff = product_tariffs(:first_flat)
+    compare_indexes(tarrif, tarrif.class.primary_key, product_tariff, [:tariff_id, :tariff_start_date])
+  end
+  
+  private
+
+  def compare_indexes(obj1, indexes1, obj2, indexes2)
+    indexes1.length.times do |key_index|
+      key1 = indexes1[key_index]
+      key2 = indexes2[key_index]
+      assert_equal(obj1[key1], obj2[key2])
+    end
+  end
 end

data/test/test_create.rb

@@ -1,112 +1,112 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCreate < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :streets, :suburbs
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-      :create => {:reference_type_id => 10, :type_label => 'NEW_TYPE', :abbreviation => 'New Type'}
-    },
-    :dual   => {
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-      :create => {:reference_type_id => 1, :reference_code => 20, :code_label => 'NEW_CODE', :abbreviation => 'New Code'}
-    }
-  }
-
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_setup
-    testing_with do
-      assert_not_nil @klass_info[:create]
-    end
-  end
-
-  def test_create
-    testing_with do
-      assert new_obj = @klass.create(@klass_info[:create])
-      assert !new_obj.new_record?
-      assert new_obj.id
-    end
-  end
-
-  def test_create_no_id
-    testing_with do
-      begin
-        @obj = @klass.create(@klass_info[:create].except(@klass.primary_key))
-        @successful = !composite?
-      rescue ActiveRecord::CompositeKeyError
-        @successful = false
-      rescue
-        flunk "Incorrect exception raised: #{$!}, #{$!.class}"
-      end
-      assert_equal composite?, !@successful, "Create should have failed for composites; #{@obj.inspect}"
-    end
-  end
-
-  def test_create_on_association
-    suburb = Suburb.first
-    suburb.streets.create(:name => "my street")
-    street = Street.find_by_name('my street')
-    assert_equal(suburb.city_id, street.city_id)
-    assert_equal(suburb.suburb_id, street.suburb_id)
-  end
-
-  def test_create_on_association_when_belongs_to_is_single_key
-    rt = ReferenceType.first
-    rt.reference_codes.create(:reference_code => 4321, :code_label => 'foo', :abbreviation => 'bar')
-    rc = ReferenceCode.find_by_reference_code(4321)
-    assert_equal(rc.reference_type_id, rt.reference_type_id)
-  end
-
-  def test_new_habtm
-    restaurant = Restaurant.new(:franchise_id => 101,
-                                :store_id => 201,
-                                :name => "My Store")
-
-    restaurant.suburbs << Suburb.new(:city_id => 24,
-                                     :suburb_id => 25,
-                                     :name => "My Suburb")
-
-    restaurant.save!
-
-    # Test restaurant
-    assert_equal(101, restaurant.franchise_id)
-    assert_equal(201, restaurant.store_id)
-    assert_equal("My Store", restaurant.name)
-    assert_equal(1, restaurant.suburbs.length)
-
-    # Test suburbs
-    suburb = restaurant.suburbs[0]
-    assert_equal(24, suburb.city_id)
-    assert_equal(25, suburb.suburb_id)
-    assert_equal("My Suburb", suburb.name)
-  end
-
-  def test_create_habtm
-    restaurant = Restaurant.create(:franchise_id => 100,
-                                   :store_id => 200,
-                                   :name => "My Store")
-
-    restaurant.suburbs.create(:city_id => 24,
-                              :suburb_id => 25,
-                              :name => "My Suburb")
-
-    # Test restaurant
-    assert_equal(100, restaurant.franchise_id)
-    assert_equal(200, restaurant.store_id)
-    assert_equal("My Store", restaurant.name)
-
-    assert_equal(1, restaurant.suburbs(true).length)
-
-    # Test suburbs
-    suburb = restaurant.suburbs[0]
-    assert_equal(24, suburb.city_id)
-    assert_equal(25, suburb.suburb_id)
-    assert_equal("My Suburb", suburb.name)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCreate < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :streets, :suburbs
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+      :create => {:reference_type_id => 10, :type_label => 'NEW_TYPE', :abbreviation => 'New Type'}
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+      :create => {:reference_type_id => 1, :reference_code => 20, :code_label => 'NEW_CODE', :abbreviation => 'New Code'}
+    }
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_setup
+    testing_with do
+      assert_not_nil @klass_info[:create]
+    end
+  end
+
+  def test_create
+    testing_with do
+      assert new_obj = @klass.create(@klass_info[:create])
+      assert !new_obj.new_record?
+      assert new_obj.id
+    end
+  end
+
+  def test_create_no_id
+    testing_with do
+      begin
+        @obj = @klass.create(@klass_info[:create].except(@klass.primary_key))
+        @successful = !composite?
+      rescue ActiveRecord::CompositeKeyError
+        @successful = false
+      rescue
+        flunk "Incorrect exception raised: #{$!}, #{$!.class}"
+      end
+      assert_equal composite?, !@successful, "Create should have failed for composites; #{@obj.inspect}"
+    end
+  end
+
+  def test_create_on_association
+    suburb = Suburb.first
+    suburb.streets.create(:name => "my street")
+    street = Street.find_by_name('my street')
+    assert_equal(suburb.city_id, street.city_id)
+    assert_equal(suburb.suburb_id, street.suburb_id)
+  end
+
+  def test_create_on_association_when_belongs_to_is_single_key
+    rt = ReferenceType.first
+    rt.reference_codes.create(:reference_code => 4321, :code_label => 'foo', :abbreviation => 'bar')
+    rc = ReferenceCode.find_by_reference_code(4321)
+    assert_equal(rc.reference_type_id, rt.reference_type_id)
+  end
+
+  def test_new_habtm
+    restaurant = Restaurant.new(:franchise_id => 101,
+                                :store_id => 201,
+                                :name => "My Store")
+
+    restaurant.suburbs << Suburb.new(:city_id => 24,
+                                     :suburb_id => 25,
+                                     :name => "My Suburb")
+
+    restaurant.save!
+
+    # Test restaurant
+    assert_equal(101, restaurant.franchise_id)
+    assert_equal(201, restaurant.store_id)
+    assert_equal("My Store", restaurant.name)
+    assert_equal(1, restaurant.suburbs.length)
+
+    # Test suburbs
+    suburb = restaurant.suburbs[0]
+    assert_equal(24, suburb.city_id)
+    assert_equal(25, suburb.suburb_id)
+    assert_equal("My Suburb", suburb.name)
+  end
+
+  def test_create_habtm
+    restaurant = Restaurant.create(:franchise_id => 100,
+                                   :store_id => 200,
+                                   :name => "My Store")
+
+    restaurant.suburbs.create(:city_id => 24,
+                              :suburb_id => 25,
+                              :name => "My Suburb")
+
+    # Test restaurant
+    assert_equal(100, restaurant.franchise_id)
+    assert_equal(200, restaurant.store_id)
+    assert_equal("My Store", restaurant.name)
+
+    assert_equal(1, restaurant.suburbs(true).length)
+
+    # Test suburbs
+    suburb = restaurant.suburbs[0]
+    assert_equal(24, suburb.city_id)
+    assert_equal(25, suburb.suburb_id)
+    assert_equal("My Suburb", suburb.name)
+  end
+end

data/test/test_delete.rb

@@ -1,148 +1,152 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestDelete < ActiveSupport::TestCase
-  fixtures :articles, :departments, :employees, :products, :tariffs, :product_tariffs,
-           :reference_types, :reference_codes
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-  
-  def test_destroy_one
-    testing_with do
-     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.limit(2)
-      assert_equal 2, to_delete.length
-    end
-  end
-
-  def test_delete_all
-    testing_with do
-      @klass.delete_all
-    end
-  end
-
-  def test_clear_association
-    department = Department.find([1,1])
-    assert_equal(2, department.employees.size, "Before clear employee count should be 2.")
-
-    department.employees.clear
-    assert_equal(0, department.employees.size, "After clear employee count should be 0.")
-
-    department.reload
-    assert_equal(0, department.employees.size, "After clear and a reload from DB employee count should be 0.")
-  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."
-  end
-
-  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_and_belongs_to_many_on_non_cpk
-    steve = employees(:steve)
-    records_before = ActiveRecord::Base.connection.execute("select * from employees_groups").count
-    steve.destroy
-    records_after = ActiveRecord::Base.connection.execute("select * from employees_groups").count
-    assert_equal records_after, records_before - steve.groups.count
-  end
-
-  def test_delete_not_destroy_on_cpk
-    tariff = Tariff.where(tariff_id: 2).first
-    tariff.delete
-    assert !tariff.persisted?
-  end
-
-  def test_delete_not_destroy_on_non_cpk
-    article = Article.first
-    article.delete
-    assert !article.persisted?
-  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)
-
-    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(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
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestDelete < ActiveSupport::TestCase
+  fixtures :articles, :departments, :employees, :products, :tariffs, :product_tariffs,
+           :reference_types, :reference_codes
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+  
+  def test_destroy_one
+    testing_with do
+     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.limit(2)
+      assert_equal 2, to_delete.length
+    end
+  end
+
+  def test_delete_all
+    testing_with do
+      @klass.delete_all
+    end
+  end
+
+  def test_delete_all_with_joins
+    ReferenceCode.joins(:reference_type).where(:reference_type_id => 1).delete_all
+  end
+
+  def test_clear_association
+    department = Department.find([1,1])
+    assert_equal(2, department.employees.size, "Before clear employee count should be 2.")
+
+    department.employees.clear
+    assert_equal(0, department.employees.size, "After clear employee count should be 0.")
+
+    department.reload
+    assert_equal(0, department.employees.size, "After clear and a reload from DB employee count should be 0.")
+  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."
+  end
+
+  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_and_belongs_to_many_on_non_cpk
+    steve = employees(:steve)
+    records_before = ActiveRecord::Base.connection.execute("select * from employees_groups").count
+    steve.destroy
+    records_after = ActiveRecord::Base.connection.execute("select * from employees_groups").count
+    assert_equal records_after, records_before - steve.groups.count
+  end
+
+  def test_delete_not_destroy_on_cpk
+    tariff = Tariff.where(tariff_id: 2).first
+    tariff.delete
+    assert !tariff.persisted?
+  end
+
+  def test_delete_not_destroy_on_non_cpk
+    article = Article.first
+    article.delete
+    assert !article.persisted?
+  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)
+
+    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(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