composite_primary_keys 13.0.9 → 14.0.1

data/test/test_predicates.rb

@@ -1,130 +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
-
-  def test_in
-    dep = Department.arel_table
-
-    primary_keys = [[1, 1], [1, 2]]
-
-    connection = ActiveRecord::Base.connection
-    quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
-    expected = "#{quoted_id_column} = 1 AND #{quoted_location_id_column} IN (1, 2)"
-
-    pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
-    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  end
-
-  def test_in_with_low_cardinality_second_key_part
-    dep = Department.arel_table
-
-    primary_keys = [[1, 1], [2, 1]]
-
-    connection = ActiveRecord::Base.connection
-    quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
-    expected = "#{quoted_location_id_column} = 1 AND #{quoted_id_column} IN (1, 2)"
-
-    pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
-    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  end
-
-  def test_in_with_nil_primary_key_part
-    dep = Department.arel_table
-
-    primary_keys = [[nil, 1], [nil, 2]]
-
-    connection = ActiveRecord::Base.connection
-    quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
-    expected = "#{quoted_id_column} IS NULL AND #{quoted_location_id_column} IN (1, 2)"
-
-    pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
-    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  end
-
-  def test_in_with_nil_secondary_key_part
-    dep = Department.arel_table
-
-    primary_keys = [[1, 1], [1, nil]]
-
-    connection = ActiveRecord::Base.connection
-    quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
-    expected = "#{quoted_id_column} = 1 AND (#{quoted_location_id_column} IN (1) OR #{quoted_location_id_column} IS NULL)"
-
-    pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
-    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  end
-
-  def test_in_with_multiple_primary_key_parts
-    dep = Department.arel_table
-
-    primary_keys = [[1, 1], [1, 2], [2, 3], [2, 4]]
-
-    connection = ActiveRecord::Base.connection
-    quoted_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    quoted_location_id_column = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('location_id')}"
-    expected = "(#{quoted_id_column} = 1 AND #{quoted_location_id_column} IN (1, 2) OR #{quoted_id_column} = 2 AND #{quoted_location_id_column} IN (3, 4))"
-
-    pred = cpk_in_predicate(dep, [:id, :location_id], primary_keys)
-    assert_equal(with_quoted_identifiers(expected), pred.to_sql)
-  end
-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

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 13.0.9
+  version: 14.0.1
 platform: ruby
 authors:
 - Charlie Savage
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-19 00:00:00.000000000 Z
+date: 2022-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -15,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Composite key support for ActiveRecord
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -55,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_association.rb
+- lib/composite_primary_keys/associations/join_dependency.rb
 - lib/composite_primary_keys/associations/preloader/association.rb
 - lib/composite_primary_keys/associations/through_association.rb
 - lib/composite_primary_keys/attribute_methods.rb
@@ -163,7 +165,6 @@ files:
 - test/fixtures/topic_sources.yml
 - test/fixtures/topics.yml
 - test/fixtures/user.rb
-- test/fixtures/user_with_polymorphic_name.rb
 - test/fixtures/users.yml
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
@@ -182,7 +183,6 @@ files:
 - test/test_exists.rb
 - test/test_find.rb
 - test/test_habtm.rb
-- test/test_hash.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
@@ -191,7 +191,6 @@ files:
 - test/test_polymorphic.rb
 - test/test_predicates.rb
 - test/test_preload.rb
-- test/test_relation.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
 - test/test_touch.rb
@@ -202,6 +201,7 @@ homepage: https://github.com/composite-primary-keys/composite_primary_keys
 licenses:
 - MIT
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,14 +209,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.1
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
@@ -237,7 +238,6 @@ test_files:
 - test/test_exists.rb
 - test/test_find.rb
 - test/test_habtm.rb
-- test/test_hash.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
@@ -246,7 +246,6 @@ test_files:
 - test/test_polymorphic.rb
 - test/test_predicates.rb
 - test/test_preload.rb
-- test/test_relation.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
 - test/test_touch.rb

data/test/fixtures/user_with_polymorphic_name.rb

@@ -1,9 +0,0 @@
-class UserWithPolymorphicName < ActiveRecord::Base
-  self.table_name = "users"
-
-  has_many :comments, :as => :person
-
-  def self.polymorphic_name
-    "User1"
-  end
-end

data/test/test_hash.rb

@@ -1,73 +0,0 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestHash < ActiveSupport::TestCase
-  fixtures :restaurants, :products
-
-  ############################################################
-  ### Tests for Product model with single primary key (id) ###
-  ############################################################
-
-  def test_single_same_object_has_the_same_hash
-    first = Product.find(1)
-    second = Product.find(1)
-    assert_equal(first.hash, second.hash)
-  end
-
-  def test_single_different_objects_have_different_hashes
-    first = Product.find(1)
-    second = Product.find(2)
-    assert_not_equal(first.hash, second.hash)
-  end
-
-  def test_single_persisted_object_hash_is_based_on_primary_key
-    first = Product.find(1)
-    second = Product.find(1)
-
-    assert_equal(first.hash, second.hash)
-    first.name = 'new name'
-    assert_equal(first.hash, second.hash)
-  end
-
-  def test_single_two_new_objects_have_different_hashes
-    assert_not_equal(Product.new.hash, Product.new.hash)
-  end
-
-  def test_single_same_new_object_has_the_same_hash
-    it = Product.new
-    assert_equal(it.hash, it.hash)
-  end
-
-  #####################################################################################
-  ### Tests for Restaurant model with composite primary key (franchise_id, store_id) ##
-  #####################################################################################
-
-  def test_composite_same_object_has_the_same_hash
-    first = Restaurant.find([1, 1])
-    second = Restaurant.find([1, 1])
-    assert_equal(first.hash, second.hash)
-  end
-
-  def test_composite_different_objects_have_different_hashes
-    first = Restaurant.find([1, 1])
-    second = Restaurant.find([2, 2])
-    assert_not_equal(first.hash, second.hash)
-  end
-
-  def test_composite_persisted_object_hash_is_based_on_primary_key
-    first = Restaurant.find([1, 1])
-    second = Restaurant.find([1, 1])
-
-    assert_equal(first.hash, second.hash)
-    first.name = 'new name'
-    assert_equal(first.hash, second.hash)
-  end
-
-  def test_composite_two_new_objects_have_different_hashes
-    assert_not_equal(Restaurant.new.hash, Restaurant.new.hash)
-  end
-
-  def test_composite_same_new_object_has_the_same_hash
-    it = Restaurant.new
-    assert_equal(it.hash, it.hash)
-  end
-end

data/test/test_relation.rb

@@ -1,27 +0,0 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestRelation < ActiveSupport::TestCase
-  fixtures :users, :readings
-  
-  def test_update_all_updates_db_records
-    user = User.find(1)
-    assert_equal [4, 5], user.readings.map(&:rating)
-
-    user.readings.update_all(rating: 3)
-
-    # Reload to check that the records were updated in the DB
-    user.readings.reload
-    assert_equal [3, 3], user.readings.map(&:rating)
-  end
-
-  def test_update_all_updates_loaded_association
-    user = User.find(1)
-    assert_equal [4, 5], user.readings.map(&:rating)
-
-    user.readings.update_all(rating: 3)
-
-    # No reload to check that not only the records were updated in the DB
-    # but also in the loaded association
-    assert_equal [3, 3], user.readings.map(&:rating)
-  end
-end