composite_primary_keys 9.0.8 → 9.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0bb2d4ed4f66fb5eeaa389046650e232aa16e43c
-  data.tar.gz: 796485685e062bd5eb966c9c58385c9d4d9e261b
+SHA256:
+  metadata.gz: 2ff862b93eb239969238798e2bc089b2312861d32a269d3c2cabc8a0873efb9d
+  data.tar.gz: 6778a792c0849abc74826beb68c61b296199630974c24f855df1434a7c7b4aca
 SHA512:
-  metadata.gz: e0ae9ddde5c369743572ae0cc03abc78ba22d9ff1411dbf37e3dc6dc23cc72515502a2958c403c467df1f62c8aaed554269fab712eb30421519e77be58f8c017
-  data.tar.gz: fe38741609f9795b001924e889bc24229f654b90615683e2556a97dd7ec3dfdcd3f3cb3f50321a391e70509247a52f158899556fdbc78ee7bc7848e26688bb1a
+  metadata.gz: 7402eb2befdbaaf5a57b95d84921ca56049d0606fcb058b2ad65332b6523bdc8decf8ee92e0a474f718f6664f49758ce97798456c15f216c5c7b9bccf081647c
+  data.tar.gz: 36796097d0f1b1104561605179cecf0c8476ec2e4f69be288d04cb6b474804de0c9c1f79f85b72dd43d2fc40b6f9a13ef4823ce0b3256aa32f52504db2d37a48

data/History.rdoc

@@ -1,3 +1,7 @@
+== 9.0.9 (2018-03-06)
+
+* Fix update statements that incorrectly pass NULL values for the primary key components (Sean Linsley)
+
 == 9.0.8 (2017-10-11)
 
 * Fix Paper Trail compatibility (Sean Linsley)

data/lib/composite_primary_keys/attribute_methods/primary_key.rb

@@ -9,7 +9,7 @@ module ActiveRecord
           # attribute_was(self.class.primary_key)
           if self.composite?
             self.class.primary_keys.map do |key_attr|
-              attribute_changed?(key_attr) ? changed_attributes[key_attr] : self.ids_hash[key_attr]
+              attribute_was(key_attr)
             end
           else
             attribute_was(self.class.primary_key)

data/lib/composite_primary_keys/relation.rb

@@ -28,7 +28,12 @@ module ActiveRecord
 
         # CPK
         if self.composite?
-          relation = @klass.unscoped.where(cpk_id_predicate(@klass.arel_table, @klass.primary_key, id_was || id))
+          # Not sure if this is a good idea, but replace nil id_was with the new id
+          id_update = id_was.each_with_index.map do |value, i|
+            value || id[i]
+          end
+
+          relation = @klass.unscoped.where(cpk_id_predicate(@klass.arel_table, @klass.primary_key, id_update))
         else
           relation = scope.where(@klass.primary_key => (id_was || id))
         end

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/tariffs.yml

@@ -1,15 +1,15 @@
-flat:
-  tariff_id: 1
-  start_date: <%= Date.today.to_s(:db) %>
-  amount: 50
-
-free:
-  tariff_id: 2
-  start_date: <%= Date.today.to_s(:db) %>
-  amount: 0
-  
-flat_future:
-  tariff_id: 1
-  start_date: <%= Date.today.next.to_s(:db) %>
-  amount: 100
+flat:
+  tariff_id: 1
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 50
+
+free:
+  tariff_id: 2
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 0
+  
+flat_future:
+  tariff_id: 1
+  start_date: <%= Date.today.next.to_s(:db) %>
+  amount: 100
   

data/test/test_counter_cache.rb

@@ -1,31 +1,31 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCalculations < ActiveSupport::TestCase
-  fixtures :tariffs
-
-  def test_update_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.update_counters(tariff.id, :amount => 1)
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_increment_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.increment_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_decrement_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.decrement_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(49, tariff.amount)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCalculations < ActiveSupport::TestCase
+  fixtures :tariffs
+
+  def test_update_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.update_counters(tariff.id, :amount => 1)
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_increment_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.increment_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_decrement_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.decrement_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(49, tariff.amount)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 9.0.8
+  version: 9.0.9
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord