composite_primary_keys 12.0.9 → 14.0.1

data/lib/composite_primary_keys/associations/preloader/association.rb

@@ -1,53 +1,68 @@
-module ActiveRecord
-  module Associations
-    class Preloader
-      class Association
-        def records_for(ids)
-          records = if association_key_name.is_a?(Array)
-                      predicate = cpk_in_predicate(klass.arel_table, association_key_name, ids)
-                      scope.where(predicate)
-                    else
-                      scope.where(association_key_name => ids)
-                    end
-          records.load do |record|
-            # Processing only the first owner
-            # because the record is modified but not an owner
-            owner = owners_by_key[convert_key(record[association_key_name])].first
-            association = owner.association(reflection.name)
-            association.set_inverse_instance(record)
-          end
-        end
-
-        def owners_by_key
-          @owners_by_key ||= owners.each_with_object({}) do |owner, result|
-            # CPK
-            # key = convert_key(owner[owner_key_name])
-            key = if owner_key_name.is_a?(Array)
-                    Array(owner_key_name).map do |key_name|
-                      convert_key(owner[key_name])
-                    end
-                  else
-                    convert_key(owner[owner_key_name])
-                  end
-            (result[key] ||= []) << owner if key
-          end
-        end
-
-        def records_by_owner
-          @records_by_owner ||= preloaded_records.each_with_object({}) do |record, result|
-            key = if association_key_name.is_a?(Array)
-                    Array(record[association_key_name]).map do |key|
-                      convert_key(key)
-                    end
-                  else
-                    convert_key(record[association_key_name])
-                  end
-            owners_by_key[key].each do |owner|
-              (result[owner] ||= []) << record
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Associations
+    class Preloader
+      class Association
+
+        class LoaderQuery
+          def load_records_for_keys(keys, &block)
+            # CPK
+            if association_key_name.is_a?(Array)
+              predicate = cpk_in_predicate(scope.klass.arel_table, association_key_name, keys)
+              scope.where(predicate).load(&block)
+            else
+              scope.where(association_key_name => keys).load(&block)
+            end
+          end
+        end
+
+        # TODO: is records_for needed anymore? Rails' implementation has changed significantly
+        def records_for(ids)
+          records = if association_key_name.is_a?(Array)
+                      predicate = cpk_in_predicate(klass.arel_table, association_key_name, ids)
+                      scope.where(predicate)
+                    else
+                      scope.where(association_key_name => ids)
+                    end
+          records.load do |record|
+            # Processing only the first owner
+            # because the record is modified but not an owner
+            owner = owners_by_key[convert_key(record[association_key_name])].first
+            association = owner.association(reflection.name)
+            association.set_inverse_instance(record)
+          end
+        end
+
+        def owners_by_key
+          @owners_by_key ||= owners.each_with_object({}) do |owner, result|
+            # CPK
+            # key = convert_key(owner[owner_key_name])
+            key = if owner_key_name.is_a?(Array)
+                    Array(owner_key_name).map do |key_name|
+                      convert_key(owner[key_name])
+                    end
+                  else
+                    convert_key(owner[owner_key_name])
+                  end
+            (result[key] ||= []) << owner if key
+          end
+        end
+
+        # TODO: is records_by_owner needed anymore? Rails' implementation has changed significantly
+        def records_by_owner
+          @records_by_owner ||= preloaded_records.each_with_object({}) do |record, result|
+            key = if association_key_name.is_a?(Array)
+                    Array(record[association_key_name]).map do |key|
+                      convert_key(key)
+                    end
+                  else
+                    convert_key(record[association_key_name])
+                  end
+            owners_by_key[key].each do |owner|
+              (result[owner] ||= []) << record
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/associations/through_association.rb

@@ -1,25 +1,25 @@
-module ActiveRecord
-  module Associations
-    module ThroughAssociation
-      alias :original_construct_join_attributes :construct_join_attributes
-
-      def construct_join_attributes(*records)
-        # CPK
-        is_composite = self.source_reflection.polymorphic? ? source_reflection.active_record.composite? : source_reflection.klass.composite?
-        if is_composite
-          ensure_mutable
-
-          ids = records.map do |record|
-            source_reflection.association_primary_key(reflection.klass).map do |key|
-              record.send(key)
-            end
-          end
-
-          cpk_in_predicate(through_association.scope.klass.arel_table, source_reflection.foreign_key, ids)
-        else
-          original_construct_join_attributes(*records)
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Associations
+    module ThroughAssociation
+      alias :original_construct_join_attributes :construct_join_attributes
+
+      def construct_join_attributes(*records)
+        # CPK
+        is_composite = self.source_reflection.polymorphic? ? source_reflection.active_record.composite? : source_reflection.klass.composite?
+        if is_composite
+          ensure_mutable
+
+          ids = records.map do |record|
+            source_reflection.association_primary_key(reflection.klass).map do |key|
+              record.send(key)
+            end
+          end
+
+          cpk_in_predicate(through_association.scope.klass.arel_table, source_reflection.foreign_key, ids)
+        else
+          original_construct_join_attributes(*records)
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/attribute_methods/primary_key.rb

@@ -16,7 +16,6 @@ module ActiveRecord
 
       # Returns the primary key previous value.
       def id_was
-        sync_with_transaction_state
         # CPK
         # attribute_was(self.class.primary_key)
         if self.composite?
@@ -29,7 +28,6 @@ module ActiveRecord
       end
 
       def id_in_database
-        sync_with_transaction_state
         # CPK
         # attribute_in_database(self.class.primary_key)
         if self.composite?

data/lib/composite_primary_keys/attribute_methods/read.rb

@@ -1,30 +1,30 @@
-module ActiveRecord
-  module AttributeMethods
-    module Read
-      def read_attribute(attr_name, &block)
-        # CPK
-        # name = attr_name.to_s
-        name = attr_name
-        if self.class.attribute_alias?(name)
-          name = self.class.attribute_alias(name)
-        end
-
-        primary_key = self.class.primary_key
-        # CPK
-        # name = primary_key if name == "id" && primary_key
-        name = primary_key if name == "id" && primary_key && !composite?
-        sync_with_transaction_state if name == primary_key
-        _read_attribute(name, &block)
-      end
-
-      def _read_attribute(attr_name, &block) # :nodoc
-        # CPK
-        if attr_name.kind_of?(Array)
-          attr_name.map {|name| @attributes.fetch_value(name.to_s, &block)}
-        else
-          @attributes.fetch_value(attr_name.to_s, &block)
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module AttributeMethods
+    module Read
+      def read_attribute(attr_name, &block)
+        # CPK
+        # name = attr_name.to_s
+        name = attr_name
+        if self.class.attribute_alias?(name)
+          name = self.class.attribute_alias(name)
+        end
+
+        primary_key = self.class.primary_key
+        # CPK
+        # name = primary_key if name == "id" && primary_key
+        name = primary_key if name == "id" && primary_key && !composite?
+
+        _read_attribute(name, &block)
+      end
+
+      def _read_attribute(attr_name, &block) # :nodoc
+        # CPK
+        if attr_name.kind_of?(Array)
+          attr_name.map {|name| @attributes.fetch_value(name.to_s, &block)}
+        else
+          @attributes.fetch_value(attr_name.to_s, &block)
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/attribute_methods/write.rb

@@ -1,35 +1,35 @@
-module ActiveRecord
-  module AttributeMethods
-    module Write
-      def write_attribute(attr_name, value)
-        # CPK
-        #name = attr_name.to_s
-        name = attr_name
-        if self.class.attribute_alias?(name)
-          name = self.class.attribute_alias(name)
-        end
-
-        primary_key = self.class.primary_key
-        # CPK
-        # name = primary_key if name == "id" && primary_key
-        name = primary_key if name == "id" && primary_key && !composite?
-        sync_with_transaction_state if name == primary_key
-        _write_attribute(name, value)
-      end
-
-      def _write_attribute(attr_name, value) # :nodoc:
-        # CPK
-        if attr_name.kind_of?(Array)
-          attr_name.each_with_index do |attr_child_name, i|
-            child_value = value ? value[i] : value
-            @attributes.write_from_user(attr_child_name.to_s, child_value)
-          end
-        else
-          @attributes.write_from_user(attr_name.to_s, value)
-        end
-
-        value
-      end
-    end
-  end
-end
+module ActiveRecord
+  module AttributeMethods
+    module Write
+      def write_attribute(attr_name, value)
+        # CPK
+        #name = attr_name.to_s
+        name = attr_name
+        if self.class.attribute_alias?(name)
+          name = self.class.attribute_alias(name)
+        end
+
+        primary_key = self.class.primary_key
+        # CPK
+        # name = primary_key if name == "id" && primary_key
+        name = primary_key if name == "id" && primary_key && !composite?
+
+        _write_attribute(name, value)
+      end
+
+      def _write_attribute(attr_name, value) # :nodoc:
+        # CPK
+        if attr_name.kind_of?(Array)
+          attr_name.each_with_index do |attr_child_name, i|
+            child_value = value ? value[i] : value
+            @attributes.write_from_user(attr_child_name.to_s, child_value)
+          end
+        else
+          @attributes.write_from_user(attr_name.to_s, value)
+        end
+
+        value
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/attribute_methods.rb

@@ -1,9 +1,21 @@
-module ActiveRecord
-  module AttributeMethods
-    def has_attribute?(attr_name)
-      # CPK
-      # @attributes.key?(attr_name.to_s)
-      Array(attr_name).all? {|single_attr| @attributes.key?(single_attr.to_s) }
-    end
-  end
-end
+module ActiveRecord
+  module AttributeMethods
+    def has_attribute?(attr_name)
+      # CPK
+      # attr_name = attr_name.to_s
+      # attr_name = self.class.attribute_aliases[attr_name] || attr_name
+      # @attributes.key?(attr_name)
+      Array(attr_name).all? do |attr|
+        attr = attr.to_s
+        attr = self.class.attribute_aliases[attr] || attr
+        @attributes.key?(attr)
+      end
+    end
+
+    def _has_attribute?(attr_name)
+      # CPK
+      # @attributes.key?(attr_name)
+      Array(attr_name).all? { |attr| @attributes.key?(attr) }
+    end
+  end
+end

data/lib/composite_primary_keys/autosave_association.rb

@@ -1,60 +1,60 @@
-module ActiveRecord
-  module AutosaveAssociation
-    def save_has_one_association(reflection)
-      association = association_instance_get(reflection.name)
-      record      = association && association.load_target
-
-      if record && !record.destroyed?
-        autosave = reflection.options[:autosave]
-
-        if autosave && record.marked_for_destruction?
-          record.destroy
-        elsif autosave != false
-          # CPK
-          #key = reflection.options[:primary_key] ? send(reflection.options[:primary_key]) : id
-          key = reflection.options[:primary_key] ? self[reflection.options[:primary_key]] : id
-
-          if (autosave && record.changed_for_autosave?) || new_record? || record_changed?(reflection, record, key)
-            unless reflection.through_reflection
-              record[reflection.foreign_key] = key
-              if inverse_reflection = reflection.inverse_of
-                record.association(inverse_reflection.name).loaded!
-              end
-            end
-
-            saved = record.save(validate: !autosave)
-            raise ActiveRecord::Rollback if !saved && autosave
-            saved
-          end
-        end
-      end
-    end
-
-    def save_belongs_to_association(reflection)
-      association = association_instance_get(reflection.name)
-      return unless association && association.loaded? && !association.stale_target?
-
-      record = association.load_target
-      if record && !record.destroyed?
-        autosave = reflection.options[:autosave]
-
-        if autosave && record.marked_for_destruction?
-          self[reflection.foreign_key] = nil
-          record.destroy
-        elsif autosave != false
-          saved = record.save(validate: !autosave) if record.new_record? || (autosave && record.changed_for_autosave?)
-
-          if association.updated?
-            # CPK
-            # association_id = record.send(reflection.options[:primary_key] || :id)
-            association_id = reflection.options[:primary_key] ? record[reflection.options[:primary_key]] : record.id
-            self[reflection.foreign_key] = association_id
-            association.loaded!
-          end
-
-          saved if autosave
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module AutosaveAssociation
+    def save_has_one_association(reflection)
+      association = association_instance_get(reflection.name)
+      record      = association && association.load_target
+
+      if record && !record.destroyed?
+        autosave = reflection.options[:autosave]
+
+        if autosave && record.marked_for_destruction?
+          record.destroy
+        elsif autosave != false
+          # CPK
+          #key = reflection.options[:primary_key] ? send(reflection.options[:primary_key]) : id
+          key = reflection.options[:primary_key] ? self[reflection.options[:primary_key]] : id
+
+          if (autosave && record.changed_for_autosave?) || new_record? || record_changed?(reflection, record, key)
+            unless reflection.through_reflection
+              record[reflection.foreign_key] = key
+              if inverse_reflection = reflection.inverse_of
+                record.association(inverse_reflection.name).loaded!
+              end
+            end
+
+            saved = record.save(validate: !autosave)
+            raise ActiveRecord::Rollback if !saved && autosave
+            saved
+          end
+        end
+      end
+    end
+
+    def save_belongs_to_association(reflection)
+      association = association_instance_get(reflection.name)
+      return unless association && association.loaded? && !association.stale_target?
+
+      record = association.load_target
+      if record && !record.destroyed?
+        autosave = reflection.options[:autosave]
+
+        if autosave && record.marked_for_destruction?
+          self[reflection.foreign_key] = nil
+          record.destroy
+        elsif autosave != false
+          saved = record.save(validate: !autosave) if record.new_record? || (autosave && record.changed_for_autosave?)
+
+          if association.updated?
+            # CPK
+            # association_id = record.send(reflection.options[:primary_key] || :id)
+            association_id = reflection.options[:primary_key] ? record[reflection.options[:primary_key]] : record.id
+            self[reflection.foreign_key] = association_id
+            association.loaded!
+          end
+
+          saved if autosave
+        end
+      end
+    end
+  end
+end