composite_primary_keys 12.0.0.rc2 → 12.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de0c70c7a4c4075ec01794087047e1ce9b8f3f72e6c02450519d9b240322a98
-  data.tar.gz: d87673437c48ed131cbeb39e20a477f1125ba1515dcb59de729e9c5567281e93
+  metadata.gz: f64b2e651fc3f4697d277ef8f65415cd2322b9c8e2e08a962ff5c7a7e2558bc0
+  data.tar.gz: '059a2e133e9b33caa48f8527c8504a9e79e6aedd038b4b7bbdc07a4fe07f846c'
 SHA512:
-  metadata.gz: d4b2d8dcd63be551a19ae50f6acc810506cfffd06c8e2b60e6a6d2461a671d0cab7a4226dbdb2affdb7271d9bab776379343afadc6feb6fdfac4b12949ac10b5
-  data.tar.gz: 4c0cbfde4dec1c2e7cbee6f0195da429af01917426dfd1dd9fae8eee9a94de48eca75943665e01c3ccfd21ff58ea2d811259722ca0a45e32957ce41d2f605d83
+  metadata.gz: 5f30eac243862e7c531278c969384efe3ebfecb94c79085c8deace569ba7828e08efa71b27c7c72114fa3c81bf96a869c1f1ec7865afd72cf43b78e6aef16ac2
+  data.tar.gz: ee7923da55d493bba06bbbd401ebdbb52d66d41d289f795e3b1fd1592fee4d93d17b553b3f9ff4c26f2510dd5cfd867134d5745a77bd72c24bec23f9af0cdefa

data/lib/composite_primary_keys/relation.rb

@@ -25,7 +25,7 @@ module ActiveRecord
       end
 
       stmt = Arel::UpdateManager.new
-      stmt.table(arel.join_sources.empty? ? table : arel.source)
+      # CPK
       if @klass.composite?
         stmt.table(table)
         subselect = arel.clone
@@ -60,10 +60,8 @@ module ActiveRecord
 
     def delete_all
       invalid_methods = INVALID_METHODS_FOR_DELETE_ALL.select do |method|
-        if respond_to?(:get_value)
-          value = get_value(method)
-          SINGLE_VALUE_METHODS.include?(method) ? value : value.any?
-        end
+        value = @values[method]
+        method == :distinct ? value : value&.any?
       end
       if invalid_methods.any?
         raise ActiveRecordError.new("delete_all doesn't support #{invalid_methods.join(', ')}")
@@ -75,22 +73,23 @@ module ActiveRecord
       end
 
       stmt = Arel::DeleteManager.new
+      # CPK
       if @klass.composite?
-        arel_attributes = primary_key.map do |key|
+        stmt.from(table)
+        subselect = arel.clone
+        arel_attributes = primary_keys.map do |key|
           arel_attribute(key)
         end.to_composite_keys
-        subselect = arel.clone
-        subselect.projections = [arel_attributes]
-        stmt.from(table)
-        stmt.key = arel_attributes.in(subselect)
+        subselect.projections = arel_attributes
+        stmt.wheres = [arel_attributes.in(subselect)]
       else
         stmt.from(arel.join_sources.empty? ? table : arel.source)
         stmt.key = arel_attribute(primary_key)
+        stmt.wheres = arel.constraints
       end
       stmt.take(arel.limit)
       stmt.offset(arel.offset)
       stmt.order(*arel.orders)
-      stmt.wheres = arel.constraints
 
       affected = @klass.connection.delete(stmt, "#{@klass} Destroy")
 

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 12
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'rc2'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'rc3'].join('.')
   end
 end

data/test/test_delete.rb

@@ -29,13 +29,12 @@ class TestDelete < ActiveSupport::TestCase
   end
 
   def test_delete_all_with_join
-    department = departments(:accounting)
+    employee = employees(:mindy)
 
     assert_equal(4, Department.count)
 
     Department.joins(:employees).
-               where('departments.department_id = ?', department.department_id).
-               where('departments.location_id = ?', department.location_id).
+               where('employees.name = ?', employee.name).
                delete_all
 
     assert_equal(3, Department.count)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 12.0.0.rc2
+  version: 12.0.0.rc3
 platform: ruby
 authors:
 - Charlie Savage