composite_primary_keys 9.0.4 → 9.0.5

data/test/test_create.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestCreate < ActiveSupport::TestCase
-  fixtures :students, :dorms, :rooms, :room_assignments, :reference_types, :reference_codes, :streets, :suburbs
+  fixtures :articles, :students, :dorms, :rooms, :room_assignments, :reference_types, :reference_codes, :streets, :suburbs
 
   CLASSES = {
     :single => {
@@ -153,4 +153,12 @@ class TestCreate < ActiveSupport::TestCase
     assert_equal(assignment1, room.room_assignments[0])
     assert_equal(assignment2, room.room_assignments[1])
   end
+
+  def test_create_article_invalid_id
+    error = assert_raises(ActiveRecord::RecordInvalid) do
+      article = Article.create!(:id => 1)
+    end
+
+    assert_equal('Validation failed: Id has already been taken', error.to_s)
+  end
 end

data/test/test_delete.rb

@@ -4,50 +4,28 @@ 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
+  def test_delete_one
+    assert_equal(5, ReferenceCode.count)
+    ReferenceCode.first.delete
+    assert_equal(4, ReferenceCode.count)
   end
 
-  def test_delete_one_alone
-    testing_with do
-      assert @klass.delete(@first.id)
-    end
+  def test_delete_one_with_id
+    assert_equal(5, ReferenceCode.count)
+    ReferenceCode.delete(ReferenceCode.first.id)
+    assert_equal(4, ReferenceCode.count)
   end
 
-  def test_delete_many
-    testing_with do
-      to_delete = @klass.limit(2)
-      assert_equal 2, to_delete.length
-    end
+  def test_destroy_one
+    assert_equal(5, ReferenceCode.count)
+    ReferenceCode.first.destroy
+    assert_equal(4, ReferenceCode.count)
   end
 
   def test_delete_all
-    testing_with do
-      @klass.delete_all
-    end
+    refute_empty(ReferenceCode.all)
+    ReferenceCode.delete_all
+    assert_empty(ReferenceCode.all)
   end
 
   def test_delete_all_with_join
@@ -56,8 +34,8 @@ class TestDelete < ActiveSupport::TestCase
     assert_equal(4, Department.count)
 
     Department.joins(:employees).
-               where('departments.department_id = ?',  department.department_id).
-               where('departments.location_id = ?',  department.location_id).
+               where('departments.department_id = ?', department.department_id).
+               where('departments.location_id = ?', department.location_id).
                delete_all
 
     assert_equal(3, Department.count)

data/test/test_ids.rb

@@ -1,109 +1,113 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class ChildCpkTest < ReferenceCode
-end
-
-class TestIds < 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],
-    },
-    :dual_strs   => {
-      :class => ReferenceCode,
-      :primary_keys => ['reference_type_id', 'reference_code'],
-    },
-  }
-
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  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
-
-  def test_to_param
-    testing_with do
-      assert_equal '1,1', @first.to_param if composite?
-    end
-  end
-
-  def test_ids_to_s
-    testing_with do
-      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
-      to_test = @klass.order(order)[0..1].map(&:id)
-      assert_equal '(1,1),(1,2)', @klass.ids_to_s(to_test) if @key_test == :dual
-      assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual
-    end
-  end
-
-  def test_set_ids_string
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected.to_s
-      assert_equal expected, @first.id
-    end
-  end
-
-  def test_set_ids_array
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected
-      assert_equal expected, @first.id
-    end
-  end
-
-  def test_set_ids_comp
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected
-      assert_equal expected, @first.id
-    end
-  end
-
-  def test_primary_keys
-    testing_with do
-      if composite?
-        assert_not_nil @klass.primary_keys
-        assert_equal @primary_keys.map {|key| key.to_s}, @klass.primary_keys
-        assert_equal @klass.primary_keys, @klass.primary_key
-        assert_kind_of(CompositePrimaryKeys::CompositeKeys, @klass.primary_keys)
-        assert_equal @primary_keys.map {|key| key.to_sym}.join(','), @klass.primary_key.to_s
-      else
-        assert_not_nil @klass.primary_key
-        assert_equal @primary_keys.first, @klass.primary_key.to_sym
-        assert_equal @primary_keys.first.to_s, @klass.primary_key.to_s
-      end
-    end
-  end
-
-  def test_inherited_primary_keys
-    assert_equal(["reference_type_id", "reference_code"], ChildCpkTest.primary_keys)
-  end
-
-  def test_inherited_ids
-    cpk_test = ChildCpkTest.new
-    assert_equal([nil, nil], cpk_test.id)
-  end
-
-  def test_assign_ids
-    ref_code = ReferenceCode.new
-    assert_equal([nil, nil], ref_code.id)
-
-    ref_code.id = [2,1]
-    assert_equal([2,1], ref_code.id)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class ChildCpkTest < ReferenceCode
+end
+
+class TestIds < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :pk_called_ids
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => [:reference_type_id],
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+    :dual_strs   => {
+      :class => ReferenceCode,
+      :primary_keys => ['reference_type_id', 'reference_code'],
+    },
+    :pk_called_id => {
+      :class => PkCalledId,
+      :primary_keys => ['id', 'reference_code'],
+    },
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  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
+
+  def test_to_param
+    testing_with do
+      assert_equal '1,1', @first.to_param if composite?
+    end
+  end
+
+  def test_ids_to_s
+    testing_with do
+      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
+      to_test = @klass.order(order)[0..1].map(&:id)
+      assert_equal '(1,1),(1,2)', @klass.ids_to_s(to_test) if @key_test == :dual
+      assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual
+    end
+  end
+
+  def test_set_ids_string
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected.to_s
+      assert_equal expected, @first.id
+    end
+  end
+
+  def test_set_ids_array
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+
+  def test_set_ids_comp
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+
+  def test_primary_keys
+    testing_with do
+      if composite?
+        assert_not_nil @klass.primary_keys
+        assert_equal @primary_keys.map {|key| key.to_s}, @klass.primary_keys
+        assert_equal @klass.primary_keys, @klass.primary_key
+        assert_kind_of(CompositePrimaryKeys::CompositeKeys, @klass.primary_keys)
+        assert_equal @primary_keys.map {|key| key.to_sym}.join(','), @klass.primary_key.to_s
+      else
+        assert_not_nil @klass.primary_key
+        assert_equal @primary_keys.first, @klass.primary_key.to_sym
+        assert_equal @primary_keys.first.to_s, @klass.primary_key.to_s
+      end
+    end
+  end
+
+  def test_inherited_primary_keys
+    assert_equal(["reference_type_id", "reference_code"], ChildCpkTest.primary_keys)
+  end
+
+  def test_inherited_ids
+    cpk_test = ChildCpkTest.new
+    assert_equal([nil, nil], cpk_test.id)
+  end
+
+  def test_assign_ids
+    ref_code = ReferenceCode.new
+    assert_equal([nil, nil], ref_code.id)
+
+    ref_code.id = [2,1]
+    assert_equal([2,1], ref_code.id)
+  end
+end

data/test/test_preload.rb

@@ -0,0 +1,94 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestPreload < ActiveSupport::TestCase
+  fixtures :comments, :users, :employees, :groups
+
+  class UserForPreload < User
+    has_many :comments_with_include_condition, -> { where('person_type = ?', 'User')},
+             class_name: 'Comment', foreign_key: 'person_id', as: :person
+    has_many :comments_with_exclude_condition, -> { where('person_type <> ?', 'SomeType')},
+             class_name: 'Comment', foreign_key: 'person_id', as: :person
+  end
+
+  class EmployeeForPreload < Employee
+    # this is a rather random condition, which should not interfere with the normal test queries
+    has_and_belongs_to_many :groups_2, class_name: 'Group', foreign_key: 'employee_id', join_table: 'employees_groups'
+  end
+
+  def test_preload_of_polymorphic_association
+    comment = Comment.where(id: [1, 2, 3]).all
+    persons = comment.map(&:person)
+    persons.each do |person|
+      assert_kind_of(ActiveRecord::Base, person)
+    end
+
+    comment = Comment.where(id: [1, 2, 3]).preload(:person).all
+    persons = comment.map(&:person)
+    persons.each do |person|
+      assert_kind_of(ActiveRecord::Base, person)
+    end
+  end
+
+  def test_preload_for_conditioned_has_many_association
+    # has one comment
+    user1 = users(:santiago)
+    user2 = UserForPreload.create(name: 'TestPreload')
+    Comment.create(person: user2, person_type: 'User')
+    Comment.create(person: user2, person_type: 'User')
+
+    users = UserForPreload.where(id: [user1.id, user2.id]).all
+    assert_equal(1, users.first.comments_with_include_condition.size)
+    assert_equal(2, users.second.comments_with_include_condition.size)
+
+    users = UserForPreload.where(id: [user1.id, user2.id]).preload(:comments_with_include_condition).all
+    assert_equal(1, users.first.comments_with_include_condition.size)
+    assert_equal(2, users.second.comments_with_include_condition.size)
+
+    users = UserForPreload.where(id: [user1.id, user2.id]).all
+    assert_equal(1, users.first.comments_with_exclude_condition.size)
+    assert_equal(2, users.second.comments_with_exclude_condition.size)
+
+    users = UserForPreload.where(id: [user1.id, user2.id]).preload(:comments_with_exclude_condition).all
+    assert_equal(1, users.first.comments_with_exclude_condition.size)
+    assert_equal(2, users.second.comments_with_exclude_condition.size)
+  end
+
+  def test_preload_for_unconditioned_habtm_association
+    employee1 = employees(:steve)
+    employee2 = employees(:jill)
+    employee1.groups = [groups(:cpk)]
+    employee2.groups = [groups(:cpk), groups(:group2)]
+    employee1.save!; employee2.save!
+
+    employees = Employee.where(id: [1, 2]).all
+    assert_equal(1, employees.first.groups.size)
+    assert_equal(2, employees.second.groups.size)
+
+    employees = Employee.where(id: [1, 2]).preload(:groups).all
+    assert_equal(1, employees.first.groups.size)
+    assert_equal(2, employees.second.groups.size)
+  end
+
+  def test_preload_for_conditioned_habtm_association
+    employee1 = employees(:steve)
+    employee2 = employees(:jill)
+    employee1.groups = [groups(:cpk)]
+    employee2.groups = [groups(:cpk), groups(:group2)]
+    employee1.save!; employee2.save!
+
+    employees = EmployeeForPreload.where(id: [1, 2]).all.order(:id)
+
+    # Even without preload two errors: First Employee has Group 1 loaded twice,
+    # Second Employee has only Group 2 instead of Group 1&2
+    assert_equal(1, employees.first.groups.size)
+    assert_equal(1, employees.first.groups_2.size)
+    assert_equal(2, employees.second.groups.size)
+    assert_equal(2, employees.second.groups_2.size)
+
+    employees = EmployeeForPreload.where(id: [1, 2]).preload(:groups_2).all.order(:id)
+
+    # with preloading, the first assertion is valid, but the second only gets Group 2 instead of 1&2
+    assert_equal(1, employees.first.groups_2.size)
+    assert_equal(2, employees.second.groups_2.size)
+  end
+end

data/test/test_suite.rb

@@ -8,7 +8,6 @@
   test_composite_arrays
   test_create
   test_delete
-  test_delete_all
   test_dumpable
   test_dup
   test_enum
@@ -23,6 +22,7 @@
   test_pagination
   test_polymorphic
   test_predicates
+  test_preload
   test_santiago
   test_serialize
   test_touch

data/test/test_update.rb

@@ -40,8 +40,6 @@ class TestUpdate < ActiveSupport::TestCase
     obj = ReferenceCode.find([1,1])
     obj.reference_type_id = 2
     obj.reference_code = 3
-    assert(obj.primary_key_changed?)
-    assert_equal({"reference_type_id" => 1, "reference_code" => 1}, obj.primary_key_was)
     assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
     assert(obj.save)
     assert(obj.reload)
@@ -61,11 +59,18 @@ class TestUpdate < ActiveSupport::TestCase
   end
 
   def test_update_all
-    assert_nothing_raised do
-      reference_code = ReferenceCode.create
-      primary_key = reference_code.class.primary_key
-      ReferenceCode.where(primary_key => reference_code[primary_key]).
-        update_all(description: 'random value')
+    ReferenceCode.update_all(description: 'random value')
+
+    ReferenceCode.all.each do |reference_code|
+      assert_equal('random value', reference_code.description)
+    end
+  end
+
+  def test_update_all_join
+    ReferenceCode.joins(:reference_type).update_all(description: 'random value')
+
+    ReferenceCode.all.each do |reference_code|
+      assert_equal('random value', reference_code.description)
     end
   end
 end