composite_primary_keys 12.0.0.rc3 → 12.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64b2e651fc3f4697d277ef8f65415cd2322b9c8e2e08a962ff5c7a7e2558bc0
-  data.tar.gz: '059a2e133e9b33caa48f8527c8504a9e79e6aedd038b4b7bbdc07a4fe07f846c'
+  metadata.gz: ec4037eff014f3dc3de08ec0fecbe5d26e3555fc6dd68a250f717b1b0301c9e5
+  data.tar.gz: 57a521ac08b5d76a3e7781d3f644cfb574fb48ed32dc611034dfd413fd0375fe
 SHA512:
-  metadata.gz: 5f30eac243862e7c531278c969384efe3ebfecb94c79085c8deace569ba7828e08efa71b27c7c72114fa3c81bf96a869c1f1ec7865afd72cf43b78e6aef16ac2
-  data.tar.gz: ee7923da55d493bba06bbbd401ebdbb52d66d41d289f795e3b1fd1592fee4d93d17b553b3f9ff4c26f2510dd5cfd867134d5745a77bd72c24bec23f9af0cdefa
+  metadata.gz: d6880df1467fa15dba63e20264a69149d212cfb7c0be4068e6817ad485856894df879b01d76b6f44ba0cb1919986890186d793c638a69396de9434873659f775
+  data.tar.gz: f63e9d569bbaf62d178979115f61a6eafdb3ad5537e30cb05b6bc791ad3106a99664935a95c6009e88df9d3aeb859d677cda0d9b787b3e06702706f0e3cc2153

data/lib/composite_primary_keys.rb

@@ -31,6 +31,8 @@ unless defined?(ActiveRecord)
 end
 
 # AR files we override
+require 'active_record/attribute_methods'
+require 'active_record/autosave_association'
 require 'active_record/counter_cache'
 require 'active_record/fixtures'
 require 'active_record/model_schema'
@@ -38,8 +40,7 @@ require 'active_record/persistence'
 require 'active_record/reflection'
 require 'active_record/relation'
 require 'active_record/sanitization'
-require 'active_record/attribute_methods'
-require 'active_record/autosave_association'
+require 'active_record/transactions'
 
 require 'active_record/associations/association'
 require 'active_record/associations/association_scope'
@@ -64,6 +65,8 @@ require 'active_record/connection_adapters/postgresql/database_statements'
 require 'active_record/relation/where_clause'
 
 # CPK files
+require 'composite_primary_keys/attribute_methods'
+require 'composite_primary_keys/autosave_association'
 require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/core'
@@ -74,8 +77,7 @@ require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/reflection'
 require 'composite_primary_keys/relation'
 require 'composite_primary_keys/sanitization'
-require 'composite_primary_keys/attribute_methods'
-require 'composite_primary_keys/autosave_association'
+require 'composite_primary_keys/transactions'
 require 'composite_primary_keys/version'
 
 require 'composite_primary_keys/associations/association'

data/lib/composite_primary_keys/transactions.rb

@@ -0,0 +1,34 @@
+module ActiveRecord
+  module Transactions
+    # Restore the new record state and id of a record that was previously saved by a call to save_record_state.
+    def restore_transaction_record_state(force_restore_state = false)
+      if restore_state = @_start_transaction_state
+        if force_restore_state || restore_state[:level] <= 1
+          @new_record = restore_state[:new_record]
+          @destroyed  = restore_state[:destroyed]
+          @attributes = restore_state[:attributes].map do |attr|
+            value = @attributes.fetch_value(attr.name)
+            attr = attr.with_value_from_user(value) if attr.value != value
+            attr
+          end
+          @mutations_from_database = nil
+          @mutations_before_last_save = nil
+
+          # CPK
+          if self.composite?
+            values = @primary_key.map {|attribute| @attributes.fetch_value(attribute)}
+            restore_id = restore_state[:id]
+            if values != restore_id
+              @primary_key.each_with_index do |attribute, i|
+                @attributes.write_from_user(attribute, restore_id[i])
+              end
+            end
+          elsif @attributes.fetch_value(@primary_key) != restore_state[:id]
+            @attributes.write_from_user(@primary_key, restore_state[:id])
+          end
+          freeze if restore_state[:frozen?]
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 12.0.0.rc3
+  version: 12.0.0.rc4
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -128,6 +128,7 @@ files:
 - lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/relation/where_clause.rb
 - lib/composite_primary_keys/sanitization.rb
+- lib/composite_primary_keys/transactions.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
 - scripts/console.rb