composite_primary_keys 12.0.0.rc1 → 12.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 540c65209855565625538300ca62ea930ad91494d7a307dbd4db0419a17e576f
-  data.tar.gz: 9bd63c5ffb21a79abb6f4159ddc0245144406e33f1969801f1d9d3176fdf1e2f
+  metadata.gz: 2de0c70c7a4c4075ec01794087047e1ce9b8f3f72e6c02450519d9b240322a98
+  data.tar.gz: d87673437c48ed131cbeb39e20a477f1125ba1515dcb59de729e9c5567281e93
 SHA512:
-  metadata.gz: 627e469ec7fe07987605b21f156dc042611af0a31282bc711b078479617c5eebeae770f27ec5de3158f686cb7dd4b175b1729dc0116f46e87894d19dc5482292
-  data.tar.gz: 5038fb2ff8282164c9daf3f5b8123d441c3ea50a126222619f12cdaed9118112a7c2f469b90ffb20b482d5e0a1467e3aabf7b5e14e39208a5972ce3b73717633
+  metadata.gz: d4b2d8dcd63be551a19ae50f6acc810506cfffd06c8e2b60e6a6d2461a671d0cab7a4226dbdb2affdb7271d9bab776379343afadc6feb6fdfac4b12949ac10b5
+  data.tar.gz: 4c0cbfde4dec1c2e7cbee6f0195da429af01917426dfd1dd9fae8eee9a94de48eca75943665e01c3ccfd21ff58ea2d811259722ca0a45e32957ce41d2f605d83

data/lib/composite_primary_keys/arel/to_sql.rb

@@ -1,20 +1,6 @@
 module Arel
   module Visitors
     class ToSql
-      # def visit_Arel_Nodes_In o, collector
-      #   if Array === o.right && o.right.empty?
-      #     collector << '1=0'
-      #   else
-      #     # CPK
-      #     collector << "("
-      #     collector = visit o.left, collector
-      #     # CPK
-      #     collector << ")"
-      #     collector << " IN ("
-      #     visit(o.right, collector) << ")"
-      #   end
-      # end
-
       def visit_CompositePrimaryKeys_CompositeKeys o, collector
         values = o.map do |key|
           case key
@@ -24,7 +10,7 @@ module Arel
               key
           end
         end
-        collector << "#{values.join(', ')}"
+        collector << "(#{values.join(', ')})"
         collector
       end
     end

data/lib/composite_primary_keys/relation.rb

@@ -25,22 +25,23 @@ module ActiveRecord
       end
 
       stmt = Arel::UpdateManager.new
+      stmt.table(arel.join_sources.empty? ? table : arel.source)
       if @klass.composite?
-        arel_attributes = primary_key.map do |key|
+        stmt.table(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.table(table)
-        stmt.key = arel_attributes.in(subselect)
+        subselect.projections = arel_attributes
+        stmt.wheres = [arel_attributes.in(subselect)]
       else
         stmt.table(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
 
       if updates.is_a?(Hash)
         if klass.locking_enabled? &&

data/lib/composite_primary_keys/version.rb

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

data/test/test_update.rb

@@ -67,10 +67,13 @@ class TestUpdate < ActiveSupport::TestCase
   end
 
   def test_update_all_join
-    ReferenceCode.joins(:reference_type).update_all(description: 'random value')
+    ReferenceCode.joins(:reference_type).
+                  where('reference_types.reference_type_id = ?', 2).
+                  update_all(:description => 'random value')
 
-    ReferenceCode.all.each do |reference_code|
-      assert_equal('random value', reference_code.description)
-    end
+    query = ReferenceCode.where('reference_type_id = ?', 2).
+                          where(:description => 'random value')
+
+    assert_equal(2, query.count)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 12.0.0.rc1
+  version: 12.0.0.rc2
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord