composite_primary_keys 12.0.0.rc4 → 12.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec4037eff014f3dc3de08ec0fecbe5d26e3555fc6dd68a250f717b1b0301c9e5
-  data.tar.gz: 57a521ac08b5d76a3e7781d3f644cfb574fb48ed32dc611034dfd413fd0375fe
+  metadata.gz: 84b35b0db707c4adb268b87125ac3d603817b1b939c482f160084be30858330e
+  data.tar.gz: 7a4290f9af7091c393c5abf91f726e5663971663ace04c528925eab61826e78b
 SHA512:
-  metadata.gz: d6880df1467fa15dba63e20264a69149d212cfb7c0be4068e6817ad485856894df879b01d76b6f44ba0cb1919986890186d793c638a69396de9434873659f775
-  data.tar.gz: f63e9d569bbaf62d178979115f61a6eafdb3ad5537e30cb05b6bc791ad3106a99664935a95c6009e88df9d3aeb859d677cda0d9b787b3e06702706f0e3cc2153
+  metadata.gz: d201d2088ca900e7bb5497d640fa34a6ae12d175e55dfeb62080973cfdfe5f573fc5081c6ddc3a704c08050e24ab3c4d731592b662479eafab88add96e4280ba
+  data.tar.gz: 44534a47aeea1d6586818ef55cb0bd697221680e8b20ad82ed36d55b6f81a2ab6e54863064f8da811c095cf5526f65b03cfb52041f41b70eb2dafced7628d82d

data/lib/composite_primary_keys/core.rb

@@ -1,16 +1,16 @@
 module ActiveRecord
   module Core
     def initialize_dup(other) # :nodoc:
-      @attributes = @attributes.dup
+      @attributes = @attributes.deep_dup
       # CPK
-      # @attributes.reset(self.class.primary_key)
+      #@attributes.reset(@primary_key)
       Array(self.class.primary_key).each {|key| @attributes.reset(key)}
 
       _run_initialize_callbacks
 
       @new_record               = true
       @destroyed                = false
-      @_start_transaction_state = {}
+      @_start_transaction_state = nil
       @transaction_state        = nil
 
       super
@@ -21,9 +21,9 @@ module ActiveRecord
         # We don't have cache keys for this stuff yet
         return super unless ids.length == 1
         return super if block_given? ||
-                        primary_key.nil? ||
-                        scope_attributes? ||
-                        columns_hash.include?(inheritance_column)
+            primary_key.nil? ||
+            scope_attributes? ||
+            columns_hash.key?(inheritance_column) && !base_class?
 
         # CPK
         return super if self.composite?
@@ -40,8 +40,7 @@ module ActiveRecord
 
         record = statement.execute([id], connection)&.first
         unless record
-          raise RecordNotFound.new("Couldn't find #{name} with '#{primary_key}'=#{id}",
-                                   name, primary_key, id)
+          raise RecordNotFound.new("Couldn't find #{name} with '#{key}'=#{id}", name, key, id)
         end
         record
       end

data/lib/composite_primary_keys/version.rb

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

metadata

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