composite_primary_keys 13.0.8 → 13.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8604d48445aede0e7f6d39ad32090ea2ed0f8d7cd58ab633a3d0c013ee1ab3b8
-  data.tar.gz: a71f857e9125065b7c635170c341ce4a9285f6942c8989dac9cfa201f428a062
+  metadata.gz: 7a669eb0a0494f42052831fcbe76de73b149c431ab64e8544e4e16770629379f
+  data.tar.gz: 022bd9e17155073ee11a6f2a4fd082771a9bd58d3a58e53e73283b5b7d3c76f1
 SHA512:
-  metadata.gz: fb13f66165419e9ca60e9b1b3283ff174947d3d2d07d1b7e29a62cb0feae97bbe5abc3179d41f330f76d2837d27c837875a01039f1c9e2969769293c4617b7d2
-  data.tar.gz: 14790bef238c5f4e6360a5613db1bd22e3333bc06a062bc6047212b077d02828bb6d1acdda436f8a4106bc1e82dc6fe4ef96d2e05f5f3dd72beb86bf0c4ae0a1
+  metadata.gz: b437679d051728600686978837e23b0835031c3ad9702506d172636d3a47d06d2653d68e5c8fcb3934e50b87cb61b8df852be8039ce1a0dcd8aef1dee6cfae0b
+  data.tar.gz: 8ac2b3d595ee688434c9d0e38b262292f0fd6fa15854c6538e97d834bab0ae81e7edb1e3bfcaa12d1a63ae0dcc8d4d29bab6382fa762397522e4685f8a0ea194

data/History.rdoc

@@ -1,3 +1,7 @@
+== 13.0.8 (2024-12-19)
+* Fix `update_all` to update loaded associations (Piotr Kowalski)
+* Fix object comparison for models with composite keys (Piotr Kowalski)
+
 == 13.0.8 (2023-11-24)
 Fix `polymorphic_name` support (Vladimir Kochnev)
 

data/lib/composite_primary_keys/core.rb

@@ -16,6 +16,29 @@ module ActiveRecord
       super
     end
 
+    def primary_key_values_present?
+      if self.composite?
+        id.all? {|key| !key.nil?}
+      else
+        !id.nil?
+      end
+    end
+
+    def ==(comparison_object)
+      super ||
+        comparison_object.instance_of?(self.class) &&
+        primary_key_values_present? &&
+        comparison_object.id == id
+    end
+
+    def hash
+      if primary_key_values_present?
+        self.class.hash ^ id.hash
+      else
+        super
+      end
+    end
+
     module ClassMethods
       def find(*ids) # :nodoc:
         # We don't have cache keys for this stuff yet

data/lib/composite_primary_keys/relation.rb

@@ -19,23 +19,22 @@ module ActiveRecord
     def update_all(updates)
       raise ArgumentError, "Empty list of attributes to change" if updates.blank?
 
-      if eager_loading?
-        relation = apply_join_dependency
-        return relation.update_all(updates)
-      end
+      arel = eager_loading? ? apply_join_dependency.arel : build_arel
+      arel.source.left = table
 
       stmt = Arel::UpdateManager.new
-      stmt.table(arel.join_sources.empty? ? table : arel.source)
+      stmt.table(arel.source)
       stmt.key = table[primary_key]
 
       # CPK
-      if @klass.composite?
+      if klass.composite?
         stmt = Arel::UpdateManager.new
         stmt.table(arel_table)
         cpk_subquery(stmt)
       else
         stmt.wheres = arel.constraints
       end
+
       stmt.take(arel.limit)
       stmt.offset(arel.offset)
       stmt.order(*arel.orders)
@@ -52,7 +51,7 @@ module ActiveRecord
         stmt.set Arel.sql(klass.sanitize_sql_for_assignment(updates, table.name))
       end
 
-      @klass.connection.update stmt, "#{@klass} Update All"
+      klass.connection.update(stmt, "#{klass} Update All").tap { reset }
     end
 
     def delete_all
@@ -64,17 +63,15 @@ module ActiveRecord
         raise ActiveRecordError.new("delete_all doesn't support #{invalid_methods.join(', ')}")
       end
 
-      if eager_loading?
-        relation = apply_join_dependency
-        return relation.delete_all
-      end
+      arel = eager_loading? ? apply_join_dependency.arel : build_arel
+      arel.source.left = table
 
       stmt = Arel::DeleteManager.new
-      stmt.from(arel.join_sources.empty? ? table : arel.source)
+      stmt.from(arel.source)
       stmt.key = table[primary_key]
 
       # CPK
-      if @klass.composite?
+      if klass.composite?
         stmt = Arel::DeleteManager.new
         stmt.from(arel_table)
         cpk_subquery(stmt)
@@ -86,7 +83,7 @@ module ActiveRecord
       stmt.offset(arel.offset)
       stmt.order(*arel.orders)
 
-      affected = @klass.connection.delete(stmt, "#{@klass} Destroy")
+      affected = klass.connection.delete(stmt, "#{klass} Destroy")
 
       reset
       affected

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 13
     MINOR = 0
-    TINY  = 8
+    TINY  = 9
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/test_equal.rb

@@ -1,26 +1,55 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestEqual < ActiveSupport::TestCase
-  fixtures :capitols
+  fixtures :restaurants, :products
 
-  def test_new
-    assert_equal(Capitol.new, Capitol.new)
+  ############################################################
+  ### Tests for Product model with single primary key (id) ###
+  ############################################################
+
+  def test_single_same
+    first = Product.find(1)
+    second = Product.find(1)
+    assert_equal(first, second)
+  end
+
+  def test_different
+    first = Product.find(1)
+    second = Product.find(2)
+    assert_not_equal(first, second)
+  end
+
+  def test_two_new_objects_are_not_equal
+    assert_not_equal(Product.new, Product.new)
   end
 
-  def test_same_new
-    it = Capitol.new
+  def test_same_new_object_is_equal_to_itself
+    it = Product.new
     assert_equal(it, it)
   end
 
-  def test_same
-    first = Capitol.find(['Canada', 'Ottawa'])
-    second = Capitol.find(['Canada', 'Ottawa'])
+  #####################################################################################
+  ### Tests for Restaurant model with composite primary key (franchise_id, store_id) ##
+  #####################################################################################
+
+  def test_composite_same
+    first = Restaurant.find([1, 1])
+    second = Restaurant.find([1, 1])
     assert_equal(first, second)
   end
 
-  def test_different
-    first = Capitol.find(['Mexico', 'Mexico City'])
-    second = Capitol.find(['Canada', 'Ottawa'])
+  def test_composite_different
+    first = Restaurant.find([1, 1])
+    second = Restaurant.find([2, 2])
     assert_not_equal(first, second)
   end
+
+  def test_composite_two_new_objects_are_not_equal
+    assert_not_equal(Restaurant.new, Restaurant.new)
+  end
+
+  def test_composite_same_new_object_is_equal_to_itself
+    it = Restaurant.new
+    assert_equal(it, it)
+  end
 end

data/test/test_hash.rb

@@ -0,0 +1,73 @@
+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

@@ -0,0 +1,27 @@
+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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 13.0.8
+  version: 13.0.9
 platform: ruby
 authors:
 - Charlie Savage
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +38,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Composite key support for ActiveRecord
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -184,6 +182,7 @@ 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
@@ -192,6 +191,7 @@ 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,7 +202,6 @@ homepage: https://github.com/composite-primary-keys/composite_primary_keys
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,8 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
-signing_key:
+rubygems_version: 3.6.1
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
@@ -239,6 +237,7 @@ 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
@@ -247,6 +246,7 @@ 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