composite_primary_keys 12.0.10 → 13.0.3

data/test/test_predicates.rb

@@ -1,60 +1,60 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestPredicates < ActiveSupport::TestCase
-  fixtures :departments
-
-  include CompositePrimaryKeys::Predicates
-
-  def test_or
-    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 OR #{quoted} = 1 OR #{quoted} = 2)"
-
-    pred = cpk_or_predicate(predicates)
-    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  end
-
-  def test_or_with_many_values
-    dep = Arel::Table.new(:departments)
-
-    predicates = Array.new
-
-    number_of_predicates = 3000 # This should really be big
-    number_of_predicates.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_ungrouped = ((0...number_of_predicates).map { |i| "#{quoted} = #{i}" }).join(' OR ')
-    expected = "(#{expected_ungrouped})"
-
-    pred = cpk_or_predicate(predicates)
-    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  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
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestPredicates < ActiveSupport::TestCase
+  fixtures :departments
+
+  include CompositePrimaryKeys::Predicates
+
+  def test_or
+    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 OR #{quoted} = 1 OR #{quoted} = 2)"
+
+    pred = cpk_or_predicate(predicates)
+    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
+  end
+
+  def test_or_with_many_values
+    dep = Arel::Table.new(:departments)
+
+    predicates = Array.new
+
+    number_of_predicates = 3000 # This should really be big
+    number_of_predicates.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_ungrouped = ((0...number_of_predicates).map { |i| "#{quoted} = #{i}" }).join(' OR ')
+    expected = "(#{expected_ungrouped})"
+
+    pred = cpk_or_predicate(predicates)
+    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
+  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

data/test/test_preload.rb

@@ -1,102 +1,102 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestPreload < ActiveSupport::TestCase
-  fixtures :articles, :comments, :users, :employees, :groups, :readings
-
-  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
-    article = articles(:first)
-    user1 = users(:santiago)
-    user2 = UserForPreload.create(name: 'TestPreload')
-    Comment.create(article: article, person: user2, person_type: 'User')
-    Comment.create(article: article, 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
-
-  def test_preload_settings_inversion
-    user = User.preload(:readings).find_by!(:name => 'Santiago')
-    assert_equal(2, user.readings.count)
-    reading = user.readings.first
-    assert_equal(true, reading.association(:user).loaded?)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestPreload < ActiveSupport::TestCase
+  fixtures :articles, :comments, :users, :employees, :groups, :readings
+
+  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
+    article = articles(:first)
+    user1 = users(:santiago)
+    user2 = UserForPreload.create(name: 'TestPreload')
+    Comment.create(article: article, person: user2, person_type: 'User')
+    Comment.create(article: article, 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
+
+  def test_preload_settings_inversion
+    user = User.preload(:readings).find_by!(:name => 'Santiago')
+    assert_equal(2, user.readings.count)
+    reading = user.readings.first
+    assert_equal(true, reading.association(:user).loaded?)
+  end
+end

data/test/test_santiago.rb

@@ -1,23 +1,23 @@
-# Test cases devised by Santiago that broke the Composite Primary Keys
-# code at one point in time. But no more!!!
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestSantiago < ActiveSupport::TestCase
-  fixtures :suburbs, :streets, :users, :articles, :readings
-  
-  def test_normal_and_composite_associations
-    assert_not_nil @suburb = Suburb.find([1, 1])
-    assert_equal 1, @suburb.streets.length
-    
-    assert_not_nil @street = Street.find(1)
-    assert_not_nil @street.suburb
-  end
-  
-  def test_single_keys
-    @santiago = User.find(1)
-    assert_not_nil @santiago.articles
-    assert_equal 2, @santiago.articles.length
-    assert_not_nil @santiago.readings
-    assert_equal 2, @santiago.readings.length
-  end
-end
+# Test cases devised by Santiago that broke the Composite Primary Keys
+# code at one point in time. But no more!!!
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestSantiago < ActiveSupport::TestCase
+  fixtures :suburbs, :streets, :users, :articles, :readings
+  
+  def test_normal_and_composite_associations
+    assert_not_nil @suburb = Suburb.find([1, 1])
+    assert_equal 1, @suburb.streets.length
+    
+    assert_not_nil @street = Street.find(1)
+    assert_not_nil @street.suburb
+  end
+  
+  def test_single_keys
+    @santiago = User.find(1)
+    assert_not_nil @santiago.articles
+    assert_equal 2, @santiago.articles.length
+    assert_not_nil @santiago.readings
+    assert_equal 2, @santiago.readings.length
+  end
+end

data/test/test_touch.rb

@@ -1,23 +1,23 @@
-# Test cases devised by Santiago that broke the Composite Primary Keys
-# code at one point in time. But no more!!!
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestTouch < ActiveSupport::TestCase
-  fixtures :products, :tariffs
-
-  def test_touching_a_record_updates_its_timestamp
-    tariff                = tariffs(:flat)
-    previous_amount       = tariff.amount
-    previously_updated_at = tariff.updated_at
-
-    tariff.amount         = previous_amount + 1
-    sleep 1.0 # we need to sleep for 1 second because the times updated (on mysql, at least) are only precise to 1 second.
-    tariff.touch
-    assert_not_equal previously_updated_at, tariff.updated_at
-    assert_equal previous_amount + 1, tariff.amount
-    assert tariff.amount_changed?, 'tarif amount should have changed'
-    assert tariff.changed?, 'tarif should be marked as changed'
-    tariff.reload
-    assert_not_equal previously_updated_at, tariff.updated_at
-  end
-end
+# Test cases devised by Santiago that broke the Composite Primary Keys
+# code at one point in time. But no more!!!
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestTouch < ActiveSupport::TestCase
+  fixtures :products, :tariffs
+
+  def test_touching_a_record_updates_its_timestamp
+    tariff                = tariffs(:flat)
+    previous_amount       = tariff.amount
+    previously_updated_at = tariff.updated_at
+
+    tariff.amount         = previous_amount + 1
+    sleep 1.0 # we need to sleep for 1 second because the times updated (on mysql, at least) are only precise to 1 second.
+    tariff.touch
+    assert_not_equal previously_updated_at, tariff.updated_at
+    assert_equal previous_amount + 1, tariff.amount
+    assert tariff.amount_changed?, 'tarif amount should have changed'
+    assert tariff.changed?, 'tarif should be marked as changed'
+    tariff.reload
+    assert_not_equal previously_updated_at, tariff.updated_at
+  end
+end

data/test/test_tutorial_example.rb

@@ -1,26 +1,26 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestTutorialExample < ActiveSupport::TestCase
-  fixtures :users, :groups, :memberships, :membership_statuses
-  
-  def test_membership
-    membership = Membership.find([1, 1])
-    assert(membership, "Cannot find a membership")
-    assert(membership.user)
-    assert(membership.group)
-  end
-  
-  def test_status
-    membership = Membership.find([1, 1])
-    statuses = membership.statuses
-    assert(membership, "Cannot find a membership")
-    assert(statuses, "No has_many association to status")
-    assert_equal(membership, statuses.first.membership)
-  end
-  
-  def test_count
-    membership = Membership.find([1, 1])
-    assert(membership, "Cannot find a membership")
-    assert_equal(1, membership.statuses.count)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestTutorialExample < ActiveSupport::TestCase
+  fixtures :users, :groups, :memberships, :membership_statuses
+  
+  def test_membership
+    membership = Membership.find([1, 1])
+    assert(membership, "Cannot find a membership")
+    assert(membership.user)
+    assert(membership.group)
+  end
+  
+  def test_status
+    membership = Membership.find([1, 1])
+    statuses = membership.statuses
+    assert(membership, "Cannot find a membership")
+    assert(statuses, "No has_many association to status")
+    assert_equal(membership, statuses.first.membership)
+  end
+  
+  def test_count
+    membership = Membership.find([1, 1])
+    assert(membership, "Cannot find a membership")
+    assert_equal(1, membership.statuses.count)
+  end
 end

data/test/test_update.rb

@@ -74,6 +74,8 @@ class TestUpdate < ActiveSupport::TestCase
   end
 
   def test_update_all_join
+    tested_update_all = false
+    Arel::Table.engine = nil # should not rely on the global Arel::Table.engine
     ReferenceCode.joins(:reference_type).
                   where('reference_types.reference_type_id = ?', 2).
                   update_all(:description => 'random value')
@@ -82,6 +84,10 @@ class TestUpdate < ActiveSupport::TestCase
                           where(:description => 'random value')
 
     assert_equal(2, query.count)
+    tested_update_all = true
+  ensure
+    Arel::Table.engine = ActiveRecord::Base
+    assert tested_update_all
   end
 
   def test_update_with_uniqueness

data/test/test_validations.rb

@@ -1,13 +1,13 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestValidations < ActiveSupport::TestCase
-  fixtures :students, :dorms, :rooms, :room_assignments
-
-  def test_uniqueness_validation_persisted
-    room_assignment = RoomAssignment.find([1, 1, 1])
-    assert(room_assignment.valid?)
-
-    room_assignment = RoomAssignment.new(:student_id => 1, :dorm_id => 1, :room_id => 2)
-    assert(!room_assignment.valid?)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestValidations < ActiveSupport::TestCase
+  fixtures :students, :dorms, :rooms, :room_assignments
+
+  def test_uniqueness_validation_persisted
+    room_assignment = RoomAssignment.find([1, 1, 1])
+    assert(room_assignment.valid?)
+
+    room_assignment = RoomAssignment.new(:student_id => 1, :dorm_id => 1, :room_id => 2)
+    assert(!room_assignment.valid?)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 12.0.10
+  version: 13.0.3
 platform: ruby
 authors:
 - Charlie Savage
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2022-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Composite key support for ActiveRecord
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -57,7 +57,7 @@ files:
 - lib/composite_primary_keys/associations/foreign_association.rb
 - lib/composite_primary_keys/associations/has_many_association.rb
 - lib/composite_primary_keys/associations/has_many_through_association.rb
-- lib/composite_primary_keys/associations/join_dependency.rb
+- lib/composite_primary_keys/associations/join_association.rb
 - lib/composite_primary_keys/associations/preloader/association.rb
 - lib/composite_primary_keys/associations/through_association.rb
 - lib/composite_primary_keys/attribute_methods.rb
@@ -87,6 +87,7 @@ files:
 - lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/relation/where_clause.rb
 - lib/composite_primary_keys/sanitization.rb
+- lib/composite_primary_keys/table_metadata.rb
 - lib/composite_primary_keys/transactions.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
@@ -200,7 +201,7 @@ homepage: https://github.com/composite-primary-keys/composite_primary_keys
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,16 +216,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
-- test/abstract_unit.rb
 - test/README_tests.rdoc
+- test/abstract_unit.rb
 - test/test_associations.rb
-- test/test_attributes.rb
 - test/test_attribute_methods.rb
+- test/test_attributes.rb
 - test/test_calculations.rb
 - test/test_callbacks.rb
 - test/test_composite_arrays.rb