composite_primary_keys 8.1.6 → 9.0.10

data/test/test_delete.rb

@@ -4,50 +4,41 @@ 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 test_delete_one
+    assert_equal(5, ReferenceCode.count)
+    ReferenceCode.first.delete
+    assert_equal(4, ReferenceCode.count)
+  end
 
-  def setup
-    self.class.classes = CLASSES
+  def test_delete_one_with_id
+    assert_equal(5, ReferenceCode.count)
+    ReferenceCode.delete(ReferenceCode.first.id)
+    assert_equal(4, ReferenceCode.count)
   end
 
   def test_destroy_one
-    testing_with do
-      assert @first.destroy
-    end
+    assert_equal(5, ReferenceCode.count)
+    ReferenceCode.first.destroy
+    assert_equal(4, ReferenceCode.count)
   end
 
-  def test_destroy_one_alone_via_class
-    testing_with do
-      assert @klass.destroy(@first.id)
-    end
+  def test_delete_all
+    refute_empty(ReferenceCode.all)
+    ReferenceCode.delete_all
+    assert_empty(ReferenceCode.all)
   end
 
-  def test_delete_one_alone
-    testing_with do
-      assert @klass.delete(@first.id)
-    end
-  end
+  def test_delete_all_with_join
+    department = departments(:accounting)
 
-  def test_delete_many
-    testing_with do
-      to_delete = @klass.limit(2)
-      assert_equal 2, to_delete.length
-    end
-  end
+    assert_equal(4, Department.count)
 
-  def test_delete_all
-    testing_with do
-      @klass.delete_all
-    end
+    Department.joins(:employees).
+               where('departments.department_id = ?', department.department_id).
+               where('departments.location_id = ?', department.location_id).
+               delete_all
+
+    assert_equal(3, Department.count)
   end
 
   def test_clear_association
@@ -71,6 +62,17 @@ 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_has_many_replace
+    tariff = tariffs(:flat)
+    assert_equal(1, tariff.product_tariffs.length)
+
+    tariff.product_tariffs = [product_tariffs(:first_free), product_tariffs(:second_free)]
+    tariff.reload
+
+    assert_equal(2, tariff.product_tariffs.length)
+    refute(tariff.product_tariffs.include?(tariff))
+  end
+
   def test_destroy_has_one
     # In this case the association is a has_one with
     # dependent set to :destroy

data/test/test_dup.rb

@@ -1,38 +1,38 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestClone < ActiveSupport::TestCase
-  fixtures :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_dup
-    testing_with do
-      clone = @first.dup
-      
-      remove_keys = Array(@klass.primary_key).map(&:to_s)
-      remove_keys << Array(@klass.primary_key) # Rails 4 adds the PK to the attributes, so we want to remove it as well
-      assert_equal(@first.attributes.except(*remove_keys), clone.attributes.except(*remove_keys))
-
-      if composite?
-        @klass.primary_key.each do |key|
-          assert_nil(clone[key], "Primary key '#{key}' should be nil")
-        end
-      else
-        assert_nil(clone[@klass.primary_key], "Sole primary key should be nil")
-      end
-    end
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestClone < ActiveSupport::TestCase
+  fixtures :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_dup
+    testing_with do
+      clone = @first.dup
+      
+      remove_keys = Array(@klass.primary_key).map(&:to_s)
+      remove_keys << Array(@klass.primary_key) # Rails 4 adds the PK to the attributes, so we want to remove it as well
+      assert_equal(@first.attributes.except(*remove_keys), clone.attributes.except(*remove_keys))
+
+      if composite?
+        @klass.primary_key.each do |key|
+          assert_nil(clone[key], "Primary key '#{key}' should be nil")
+        end
+      else
+        assert_nil(clone[@klass.primary_key], "Sole primary key should be nil")
+      end
+    end
+  end
 end

data/test/test_exists.rb

@@ -1,40 +1,40 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestExists < ActiveSupport::TestCase
-  fixtures :articles, :departments, :capitols
-  
-  def test_id
-    assert(Article.exists?(1))
-    assert(!Article.exists?(-1))
-  end
-
-  def test_array
-    assert(Article.exists?(['name = ?', 'Article One']))
-    assert(!Article.exists?(['name = ?', 'Article -1']))
-  end
-
-  def test_hash
-    assert(Article.exists?('name' => 'Article One'))
-    assert(!Article.exists?('name' => 'Article -1'))
-  end
-
-  def test_cpk_id
-    assert(Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,1])))
-    assert(!Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,-1])))
-  end
-
-  def test_cpk_array_id
-    assert(Department.exists?([1,1]))
-    assert(!Department.exists?([1,-1]))
-  end
-
-  def test_cpk_array_condition
-    assert(Department.exists?(['department_id = ? and location_id = ?', 1, 1]))
-    assert(!Department.exists?(['department_id = ? and location_id = ?', 1, -1]))
-  end
-
-  def test_cpk_array_string_id
-    assert(Capitol.exists?(['The Netherlands', 'Amsterdam']))
-    assert(!Capitol.exists?(['The Netherlands', 'Paris']))
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestExists < ActiveSupport::TestCase
+  fixtures :articles, :departments, :capitols
+  
+  def test_id
+    assert(Article.exists?(1))
+    assert(!Article.exists?(-1))
+  end
+
+  def test_array
+    assert(Article.exists?(['name = ?', 'Article One']))
+    assert(!Article.exists?(['name = ?', 'Article -1']))
+  end
+
+  def test_hash
+    assert(Article.exists?('name' => 'Article One'))
+    assert(!Article.exists?('name' => 'Article -1'))
+  end
+
+  def test_cpk_id
+    assert(Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,1])))
+    assert(!Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,-1])))
+  end
+
+  def test_cpk_array_id
+    assert(Department.exists?([1,1]))
+    assert(!Department.exists?([1,-1]))
+  end
+
+  def test_cpk_array_condition
+    assert(Department.exists?(['department_id = ? and location_id = ?', 1, 1]))
+    assert(!Department.exists?(['department_id = ? and location_id = ?', 1, -1]))
+  end
+
+  def test_cpk_array_string_id
+    assert(Capitol.exists?(['The Netherlands', 'Amsterdam']))
+    assert(!Capitol.exists?(['The Netherlands', 'Paris']))
+  end
 end

data/test/test_find.rb

@@ -62,10 +62,6 @@ class TestFind < ActiveSupport::TestCase
       ReferenceCode.find(['999', '999'])
     end
 
-    connection = ActiveRecord::Base.connection
-    ref_type_quoted = "#{connection.quote_table_name('reference_codes')}.#{connection.quote_column_name('reference_type_id')}"
-    ref_code_quoted = "#{connection.quote_table_name('reference_codes')}.#{connection.quote_column_name('reference_code')}"
-
     expected = "Couldn't find all ReferenceCodes with 'reference_type_id,reference_code': (999, 999) (found 0 results, but was looking for 1)"
     assert_equal(with_quoted_identifiers(expected), error.message)
   end
@@ -87,12 +83,28 @@ class TestFind < ActiveSupport::TestCase
     end
   end
 
+  def test_in_batches_of_1
+    num_found = 0
+    Department.in_batches(of: 1) do |batch|
+      batch.each do |dept|
+        num_found += 1
+      end
+    end
+    assert_equal(Department.count, num_found)
+  end
+
   def test_expand
     department = departments(:engineering)
     employees = Employee.where(:department => department)
     assert_equal(2, employees.count)
   end
 
+  def test_expand_with_multiple
+    departments = Department.all
+    employees = Employee.where(:department => departments)
+    assert_equal(4, employees.count)
+  end
+
   def test_find_one_with_params_id
     params_id = ReferenceCode.find([1,3]).to_param
     assert_equal params_id, "1,3"

data/test/test_habtm.rb

@@ -1,7 +1,31 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestHabtm < ActiveSupport::TestCase
-  fixtures :suburbs, :restaurants, :restaurants_suburbs, :products
+  fixtures :suburbs, :restaurants, :restaurants_suburbs, :products, :groups, :employees
+
+  def test_no_cpk
+    # This test makes sure we don't break anything in standard rails by using CPK
+    groups = Group.all
+
+    # First test records
+    employee = Employee.first
+    assert_equal(0, employee.groups.length)
+    employee.groups = groups
+    employee.reload
+    assert_equal(groups, employee.groups)
+  end
+
+  def test_no_cpk_ids
+    # This test makes sure we don't break anything in standard rails by using CPK
+    groups = Group.all
+
+    employee = Employee.last
+    assert_equal(0, employee.groups.length)
+    employee.group_ids = groups.map {|group| group.id}
+    employee.group_ids = [groups.first.id]
+    employee.reload
+    assert_equal([groups.first], employee.groups)
+  end
 
   def test_has_and_belongs_to_many
     @restaurant = Restaurant.find([1,1])
@@ -42,7 +66,7 @@ class TestHabtm < ActiveSupport::TestCase
     product = products(:first_product)
     subway = restaurants(:subway_one)
     product.restaurants << subway
-    
+
     # reload
     # test positive
     product = products(:first_product)
@@ -106,7 +130,7 @@ class TestHabtm < ActiveSupport::TestCase
     # 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)
     assert_equal 2, product_one.restaurants.size

data/test/test_miscellaneous.rb

@@ -1,32 +1,32 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestMiscellaneous < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :products
-  
-  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_composite_class
-    testing_with do
-      assert_equal composite?, @klass.composite?
-    end
-  end
-
-  def test_composite_instance
-    testing_with do
-      assert_equal composite?, @first.composite?
-    end
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestMiscellaneous < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :products
+  
+  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_composite_class
+    testing_with do
+      assert_equal composite?, @klass.composite?
+    end
+  end
+
+  def test_composite_instance
+    testing_with do
+      assert_equal composite?, @first.composite?
+    end
+  end
+end

data/test/test_nested_attributes.rb

@@ -8,7 +8,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     code_id = 1001
 
     reference_type = reference_types(:name_prefix)
-    reference_type.update_attribute :reference_codes_attributes, [{
+    reference_type.update_attributes :reference_codes_attributes => [{
       :reference_code => code_id,
       :code_label => 'XX',
       :abbreviation => 'Xx'
@@ -20,7 +20,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     code_id = 1002
 
     reference_type = reference_types(:name_prefix)
-    reference_type.update_attribute :reference_codes_attributes, [{
+    reference_type.update_attributes :reference_codes_attributes => [{
       :reference_code => code_id,
       :code_label => 'XX',
       :abbreviation => 'Xx'
@@ -28,7 +28,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
 
     reference_code = ReferenceCode.find_by_reference_code(code_id)
     cpk = CompositePrimaryKeys::CompositeKeys[reference_type.reference_type_id, code_id]
-    reference_type.update_attribute :reference_codes_attributes, [{
+    reference_type.update_attributes :reference_codes_attributes => [{
       :id => cpk,
       :code_label => 'AAA',
       :abbreviation => 'Aaa'
@@ -71,7 +71,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     platform = 'instagram'
 
     topic = topics(:music)
-    topic.update_attribute :topic_sources_attributes, [{
+    topic.update_attributes :topic_sources_attributes => [{
       :platform => platform,
       :keywords => 'funk'
     }]
@@ -82,7 +82,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
     platform = 'instagram'
 
     topic = topics(:music)
-    topic.update_attribute :topic_sources_attributes, [{
+    topic.update_attributes :topic_sources_attributes => [{
       :platform => platform,
       :keywords => 'funk'
     }]
@@ -90,7 +90,7 @@ class TestNestedAttributes < ActiveSupport::TestCase
 
     topic_source = TopicSource.find_by_platform(platform)
     cpk = CompositePrimaryKeys::CompositeKeys[topic.id, platform]
-    topic.update_attribute :topic_sources_attributes, [{
+    topic.update_attributes :topic_sources_attributes => [{
       :id => cpk,
       :keywords => 'jazz'
     }]

data/test/test_pagination.rb

@@ -1,36 +1,36 @@
-#require File.expand_path('../abstract_unit', __FILE__)
-#require 'plugins/pagination'
-#
-#class TestPagination < ActiveSupport::TestCase
-#  fixtures :reference_types, :reference_codes
-#
-#  include ActionController::Pagination
-#  DEFAULT_PAGE_SIZE = 2
-#
-#  attr_accessor :params
-#
-#  CLASSES = {
-#    :single => {
-#      :class => ReferenceType,
-#      :primary_keys => :reference_type_id,
-#      :table => :reference_types,
-#    },
-#    :dual   => {
-#      :class => ReferenceCode,
-#      :primary_keys => [:reference_type_id, :reference_code],
-#      :table => :reference_codes,
-#    },
-#  }
-#
-#  def setup
-#    self.class.classes = CLASSES
-#    @params = {}
-#  end
-#
-#  def test_paginate_all
-#    testing_with do
-#      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
-#      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
-#    end
-#  end
+#require File.expand_path('../abstract_unit', __FILE__)
+#require 'plugins/pagination'
+#
+#class TestPagination < ActiveSupport::TestCase
+#  fixtures :reference_types, :reference_codes
+#
+#  include ActionController::Pagination
+#  DEFAULT_PAGE_SIZE = 2
+#
+#  attr_accessor :params
+#
+#  CLASSES = {
+#    :single => {
+#      :class => ReferenceType,
+#      :primary_keys => :reference_type_id,
+#      :table => :reference_types,
+#    },
+#    :dual   => {
+#      :class => ReferenceCode,
+#      :primary_keys => [:reference_type_id, :reference_code],
+#      :table => :reference_codes,
+#    },
+#  }
+#
+#  def setup
+#    self.class.classes = CLASSES
+#    @params = {}
+#  end
+#
+#  def test_paginate_all
+#    testing_with do
+#      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
+#      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
+#    end
+#  end
 #end

data/test/test_polymorphic.rb

@@ -24,11 +24,4 @@ class TestPolymorphic < ActiveSupport::TestCase
     user = users(:santiago)
     assert_equal(['andrew'], user.hacks.collect { |a| a.name }.sort)
   end
-  
-  def test_has_many_through_with_polymorphic_source
-    user = users(:santiago)
-    user_to_associate = users(:drnic)
-    user.update_attributes :persons => [user_to_associate]
-    assert_equal user.persons, [user_to_associate]
-  end
 end

data/test/test_predicates.rb

@@ -1,12 +1,12 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
-class TestEqual < ActiveSupport::TestCase
+class TestPredicates < ActiveSupport::TestCase
   fixtures :departments
 
   include CompositePrimaryKeys::Predicates
 
   def test_or
-    dep = Arel::Table.new(:departments)
+    dep = Department.arel_table
 
     predicates = Array.new
 
@@ -27,7 +27,7 @@ class TestEqual < ActiveSupport::TestCase
 
     predicates = Array.new
 
-    number_of_predicates = 30000 # This should really be big
+    number_of_predicates = 3000 # This should really be big
     number_of_predicates.times do |i|
       predicates << dep[:id].eq(i)
     end
@@ -41,20 +41,20 @@ class TestEqual < ActiveSupport::TestCase
     assert_equal(with_quoted_identifiers(expected), pred.to_sql)
   end
 
-  # def test_and
-  #   dep = Arel::Table.new(:departments)
-  #
-  #   predicates = Array.new
-  #
-  #   3.times do |i|
-  #     predicates << dep[:id].eq(i)
-  #   end
-  #
-  #   connection = ActiveRecord::Base.connection
-  #   quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-  #   expected = "#{quoted} = 0 AND #{quoted} = 1 AND #{quoted} = 2"
-  #
-  #   pred = cpk_and_predicate(predicates)
-  #   assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  # end
-end
+  def test_and
+    dep = Department.arel_table
+
+    predicates = Array.new
+
+    3.times do |i|
+      predicates << dep[:id].eq(i)
+    end
+
+    connection = ActiveRecord::Base.connection
+    quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
+    expected = "#{quoted} = 0 AND #{quoted} = 1 AND #{quoted} = 2"
+
+    pred = cpk_and_predicate(predicates)
+    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
+  end
+end