composite_primary_keys 7.0.16 → 8.0.0

data/lib/composite_primary_keys.rb

@@ -1,115 +1,113 @@
-#--
-# Copyright (c) 2006-2012 Nic Williams and Charlie Savage
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-unless defined?(ActiveRecord)
-  require 'rubygems'
-  gem 'activerecord', '~>4.1.7'
-  require 'active_record'
-end
-
-# Arel files we override
-require 'arel/visitors/to_sql'
-
-# AR files we override
-require 'active_record/counter_cache'
-require 'active_record/fixtures'
-require 'active_record/model_schema'
-require 'active_record/persistence'
-require 'active_record/relation'
-require 'active_record/sanitization'
-
-require 'active_record/associations/association'
-require 'active_record/associations/association_scope'
-require 'active_record/associations/has_many_association'
-require 'active_record/associations/has_many_through_association'
-require 'active_record/associations/join_dependency'
-require 'active_record/associations/join_dependency/join_part'
-require 'active_record/associations/join_dependency/join_association'
-require 'active_record/associations/preloader/association'
-require 'active_record/associations/preloader/belongs_to'
-
-require 'active_record/attribute_methods/primary_key'
-require 'active_record/attribute_methods/dirty'
-require 'active_record/attribute_methods/read'
-require 'active_record/attribute_methods/write'
-require 'active_record/locking/optimistic'
-require 'active_record/nested_attributes'
-
-require 'active_record/connection_adapters/abstract_adapter'
-
-require 'active_record/relation/batches'
-require 'active_record/relation/calculations'
-require 'active_record/relation/finder_methods'
-require 'active_record/relation/predicate_builder'
-require 'active_record/relation/query_methods'
-
-require 'active_record/validations/uniqueness'
-
-# CPK files
-require 'composite_primary_keys/arel/visitors/to_sql'
-
-require 'composite_primary_keys/persistence'
-require 'composite_primary_keys/base'
-require 'composite_primary_keys/core'
-require 'composite_primary_keys/composite_arrays'
-require 'composite_primary_keys/composite_predicates'
-require 'composite_primary_keys/fixtures'
-require 'composite_primary_keys/model_schema'
-require 'composite_primary_keys/relation'
-require 'composite_primary_keys/sanitization'
-require 'composite_primary_keys/version'
-
-require 'composite_primary_keys/associations/association'
-require 'composite_primary_keys/associations/association_scope'
-require 'composite_primary_keys/associations/has_many_association'
-require 'composite_primary_keys/associations/has_many_through_association'
-require 'composite_primary_keys/associations/join_dependency'
-require 'composite_primary_keys/associations/join_dependency/join_part'
-require 'composite_primary_keys/associations/join_dependency/join_association'
-require 'composite_primary_keys/associations/preloader/association'
-require 'composite_primary_keys/associations/preloader/belongs_to'
-
-require 'composite_primary_keys/dirty'
-
-require 'composite_primary_keys/attribute_methods/primary_key'
-require 'composite_primary_keys/attribute_methods/dirty'
-require 'composite_primary_keys/attribute_methods/read'
-require 'composite_primary_keys/attribute_methods/write'
-require 'composite_primary_keys/locking/optimistic'
-require 'composite_primary_keys/nested_attributes'
-
-require 'composite_primary_keys/connection_adapters/abstract_adapter'
-require 'composite_primary_keys/connection_adapters/abstract/connection_specification_changes'
-
-require 'composite_primary_keys/relation/batches'
-require 'composite_primary_keys/relation/calculations'
-require 'composite_primary_keys/relation/finder_methods'
-require 'composite_primary_keys/relation/predicate_builder'
-require 'composite_primary_keys/relation/query_methods'
-
-require 'composite_primary_keys/validations/uniqueness'
-
-require 'composite_primary_keys/composite_relation'
+#--
+# Copyright (c) 2006-2012 Nic Williams and Charlie Savage
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+unless defined?(ActiveRecord)
+  require 'rubygems'
+  gem 'activerecord', '4.2.0'
+  require 'active_record'
+end
+
+# AR files we override
+require 'active_record/counter_cache'
+require 'active_record/fixtures'
+require 'active_record/model_schema'
+require 'active_record/persistence'
+require 'active_record/relation'
+require 'active_record/sanitization'
+require 'active_record/attribute_methods'
+
+require 'active_record/associations/association'
+require 'active_record/associations/association_scope'
+require 'active_record/associations/has_many_association'
+require 'active_record/associations/has_many_through_association'
+require 'active_record/associations/join_dependency'
+require 'active_record/associations/join_dependency/join_association'
+require 'active_record/associations/preloader/association'
+require 'active_record/associations/preloader/belongs_to'
+require 'active_record/associations/singular_association'
+require 'active_record/associations/collection_association'
+
+require 'active_record/attribute_set/builder'
+require 'active_record/attribute_methods/primary_key'
+require 'active_record/attribute_methods/read'
+require 'active_record/attribute_methods/write'
+require 'active_record/nested_attributes'
+
+require 'active_record/connection_adapters/abstract_adapter'
+
+require 'active_record/relation/batches'
+require 'active_record/relation/calculations'
+require 'active_record/relation/finder_methods'
+require 'active_record/relation/predicate_builder'
+require 'active_record/relation/query_methods'
+
+require 'active_record/validations/uniqueness'
+
+# CPK files
+require 'composite_primary_keys/persistence'
+require 'composite_primary_keys/base'
+require 'composite_primary_keys/core'
+require 'composite_primary_keys/composite_arrays'
+require 'composite_primary_keys/composite_predicates'
+require 'composite_primary_keys/fixtures'
+require 'composite_primary_keys/model_schema'
+require 'composite_primary_keys/relation'
+require 'composite_primary_keys/sanitization'
+require 'composite_primary_keys/attribute_set/builder'
+require 'composite_primary_keys/attribute_methods'
+require 'composite_primary_keys/version'
+
+require 'composite_primary_keys/associations/association'
+require 'composite_primary_keys/associations/association_scope'
+require 'composite_primary_keys/associations/has_many_association'
+require 'composite_primary_keys/associations/has_many_through_association'
+require 'composite_primary_keys/associations/join_dependency'
+require 'composite_primary_keys/associations/join_dependency/join_association'
+require 'composite_primary_keys/associations/preloader/association'
+require 'composite_primary_keys/associations/preloader/belongs_to'
+require 'composite_primary_keys/associations/singular_association'
+require 'composite_primary_keys/associations/collection_association'
+
+require 'composite_primary_keys/dirty'
+
+require 'composite_primary_keys/attribute_methods/primary_key'
+require 'composite_primary_keys/attribute_methods/dirty'
+require 'composite_primary_keys/attribute_methods/read'
+require 'composite_primary_keys/attribute_methods/write'
+require 'composite_primary_keys/nested_attributes'
+
+require 'composite_primary_keys/connection_adapters/abstract_adapter'
+require 'composite_primary_keys/connection_adapters/abstract/connection_specification_changes'
+
+require 'composite_primary_keys/relation/batches'
+require 'composite_primary_keys/relation/calculations'
+require 'composite_primary_keys/relation/finder_methods'
+require 'composite_primary_keys/relation/predicate_builder'
+require 'composite_primary_keys/relation/query_methods'
+
+require 'composite_primary_keys/validations/uniqueness'
+
+require 'composite_primary_keys/composite_relation'

data/lib/composite_primary_keys/associations/association.rb

@@ -1,23 +1,23 @@
-module ActiveRecord
-  module Associations
-    class Association
-      def creation_attributes
-        attributes = {}
-
-        if (reflection.macro == :has_one || reflection.macro == :has_many) && !options[:through]
-          # CPK
-          # attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
-          Array(reflection.foreign_key).zip(Array(reflection.active_record_primary_key)).each do |key1, key2|
-            attributes[key1] = owner[key2]
-          end
-
-          if reflection.options[:as]
-            attributes[reflection.type] = owner.class.base_class.name
-          end
-        end
-
-        attributes
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Associations
+    class Association
+      def creation_attributes
+        attributes = {}
+
+        if (reflection.has_one? || reflection.collection?) && !options[:through]
+          # CPK
+          # attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
+          Array(reflection.foreign_key).zip(Array(reflection.active_record_primary_key)).each do |key1, key2|
+            attributes[key1] = owner[key2]
+          end
+
+          if reflection.options[:as]
+            attributes[reflection.type] = owner.class.base_class.name
+          end
+        end
+
+        attributes
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -1,77 +1,73 @@
-module ActiveRecord
-  module Associations
-    class AssociationScope
-      def add_constraints(scope, owner, assoc_klass, refl, tracker)
-        chain = refl.chain
-        scope_chain = refl.scope_chain
-
-        tables = construct_tables(chain, assoc_klass, refl, tracker)
-
-        chain.each_with_index do |reflection, i|
-          table, foreign_table = tables.shift, tables.first
-
-          if reflection.source_macro == :belongs_to
-            if reflection.options[:polymorphic]
-              key = reflection.association_primary_key(assoc_klass)
-            else
-              key = reflection.association_primary_key
-            end
-
-            foreign_key = reflection.foreign_key
-          else
-            key         = reflection.foreign_key
-            foreign_key = reflection.active_record_primary_key
-          end
-
-          if reflection == chain.last
-            # CPK - TODO add back in tracker support
-            #bind_val = bind scope, table.table_name, key.to_s, owner[foreign_key], tracker
-            #scope    = scope.where(table[key].eq(bind_val))
-            predicate = cpk_join_predicate(table, key, owner, foreign_key)
-            scope = scope.where(predicate)
-
-            if reflection.type
-              value    = owner.class.base_class.name
-              bind_val = bind scope, table.table_name, reflection.type.to_s, value, tracker
-              scope    = scope.where(table[reflection.type].eq(bind_val))
-            end
-          else
-            # CPK
-            #constraint = table[key].eq(foreign_table[foreign_key])
-            constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
-
-            if reflection.type
-              value    = chain[i + 1].klass.base_class.name
-              bind_val = bind scope, table.table_name, reflection.type.to_s, value, tracker
-              scope    = scope.where(table[reflection.type].eq(bind_val))
-            end
-
-            scope = scope.joins(join(foreign_table, constraint))
-          end
-
-          is_first_chain = i == 0
-          klass = is_first_chain ? assoc_klass : reflection.klass
-
-          # Exclude the scope of the association itself, because that
-          # was already merged in the #scope method.
-          scope_chain[i].each do |scope_chain_item|
-            item  = eval_scope(klass, scope_chain_item, owner)
-
-            if scope_chain_item == refl.scope
-              scope.merge! item.except(:where, :includes, :bind)
-            end
-
-            if is_first_chain
-              scope.includes! item.includes_values
-            end
-
-            scope.where_values += item.where_values
-            scope.order_values |= item.order_values
-          end
-        end
-
-        scope
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Associations
+    class AssociationScope
+      def add_constraints(scope, owner, assoc_klass, refl, tracker)
+        chain = refl.chain
+        scope_chain = refl.scope_chain
+
+        tables = construct_tables(chain, assoc_klass, refl, tracker)
+
+        chain.each_with_index do |reflection, i|
+          table, foreign_table = tables.shift, tables.first
+
+          join_keys = reflection.join_keys(assoc_klass)
+          key = join_keys.key
+          foreign_key = join_keys.foreign_key
+          
+          if reflection == chain.last
+            # CPK - TODO add back in tracker support
+            if key.kind_of?(Array) || foreign_key.kind_of?(Array)
+              predicate = cpk_join_predicate(table, key, owner, foreign_key)
+              scope = scope.where(predicate)
+            else
+              bind_val = bind scope, table.table_name, key.to_s, owner[foreign_key], tracker
+              scope    = scope.where(table[key].eq(bind_val))
+            end
+            
+            
+            if reflection.type
+              value    = owner.class.base_class.name
+              bind_val = bind scope, table.table_name, reflection.type, value, tracker
+              scope    = scope.where(table[reflection.type].eq(bind_val))
+            end
+          else
+            # CPK
+            #constraint = table[key].eq(foreign_table[foreign_key])
+            constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
+
+            if reflection.type
+              value    = chain[i + 1].klass.base_class.name
+              bind_val = bind scope, table.table_name, reflection.type, value, tracker
+              scope    = scope.where(table[reflection.type].eq(bind_val))
+            end
+
+            scope = scope.joins(join(foreign_table, constraint))
+          end
+
+          is_first_chain = i == 0
+          klass = is_first_chain ? assoc_klass : reflection.klass
+
+          # Exclude the scope of the association itself, because that
+          # was already merged in the #scope method.
+          scope_chain[i].each do |scope_chain_item|
+            item  = eval_scope(klass, scope_chain_item, owner)
+
+            if scope_chain_item == refl.scope
+              scope.merge! item.except(:where, :includes, :bind)
+            end
+
+            if is_first_chain
+              scope.includes! item.includes_values
+            end
+
+            scope.where_values += item.where_values
+            scope.bind_values  += item.bind_values
+            scope.order_values |= item.order_values
+          end
+        end
+
+        scope
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/associations/collection_association.rb

@@ -0,0 +1,15 @@
+module CompositePrimaryKeys
+  module CollectionAssociation
+    extend ActiveSupport::Concern
+    included do
+      def get_records_with_cpk_support
+        cpk_applies = (target && target.respond_to?(:composite?) && target.composite?) || (owner && owner.respond_to?(:composite?) && owner.composite?)
+        return scope.to_a if cpk_applies
+        get_records_without_cpk_support
+      end
+      alias_method_chain :get_records, :cpk_support
+    end
+  end
+end
+
+ActiveRecord::Associations::CollectionAssociation.send(:include, CompositePrimaryKeys::CollectionAssociation)

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -1,56 +1,69 @@
-module ActiveRecord
-  module Associations
-    class HasManyAssociation
-      def delete_records(records, method)
-        if method == :destroy
-          records.each(&:destroy!)
-          update_counter(-records.length) unless inverse_updates_counter_cache?
-        else
-          if records == :all || !reflection.klass.primary_key
-            scope = self.scope
-          else
-            # CPK
-            # scope = self.scope.where(reflection.klass.primary_key => records)
-            table = Arel::Table.new(reflection.table_name)
-            and_conditions = records.map do |record|
-              eq_conditions = Array(reflection.association_primary_key).map do |name|
-                table[name].eq(record[name])
-              end
-              Arel::Nodes::And.new(eq_conditions)
-            end
-
-            condition = and_conditions.shift
-            and_conditions.each do |and_condition|
-              condition = condition.or(and_condition)
-            end
-
-            scope = self.scope.where(condition)
-          end
-
-          if method == :delete_all
-            update_counter(-scope.delete_all)
-          else
-            # CPK
-            # update_counter(-scope.update_all(reflection.foreign_key => nil))
-            update_hash = Array(reflection.foreign_key).inject(Hash.new) do |hash, key|
-              hash[key] = nil
-              hash
-            end
-            update_counter(-scope.update_all(update_hash))
-          end
-        end
-      end
-
-      def foreign_key_present?
-        if reflection.klass.primary_key
-          # CPK
-          #owner.attribute_present?(reflection.association_primary_key)
-          owner.attribute_present?(reflection.association_primary_key)
-          Array(reflection.klass.primary_key).all? {|key| owner.attribute_present?(key)}
-        else
-          false
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  module Associations
+    class HasManyAssociation
+      def delete_count(method, scope)
+        if method == :delete_all
+          scope.delete_all
+        else
+          # CPK
+          # scope.update_all(reflection.foreign_key => nil)
+          conds = Array(reflection.foreign_key).inject(Hash.new) do |mem, key|
+            mem[key] = nil
+            mem
+          end
+          scope.update_all(conds)
+        end
+      end
+
+      def delete_records(records, method)
+        if method == :destroy
+          records.each(&:destroy!)
+          update_counter(-records.length) unless inverse_updates_counter_cache?
+        else
+          if records == :all || !reflection.klass.primary_key
+            scope = self.scope
+          else
+            # CPK
+            # scope = self.scope.where(reflection.klass.primary_key => records)
+            table = Arel::Table.new(reflection.table_name)
+            and_conditions = records.map do |record|
+              eq_conditions = Array(reflection.association_primary_key).map do |name|
+                table[name].eq(record[name])
+              end
+              Arel::Nodes::And.new(eq_conditions)
+            end
+
+            condition = and_conditions.shift
+            and_conditions.each do |and_condition|
+              condition = condition.or(and_condition)
+            end
+
+            scope = self.scope.where(condition)
+          end
+
+          if method == :delete_all
+            update_counter(-scope.delete_all)
+          else
+            # CPK
+            # update_counter(-scope.update_all(reflection.foreign_key => nil))
+            update_hash = Array(reflection.foreign_key).inject(Hash.new) do |hash, key|
+              hash[key] = nil
+              hash
+            end
+            update_counter(-scope.update_all(update_hash))
+          end
+        end
+      end
+
+      def foreign_key_present?
+        if reflection.klass.primary_key
+          # CPK
+          # owner.attribute_present?(reflection.association_primary_key)
+          Array(reflection.klass.primary_key).all? {|key| owner.attribute_present?(key)}
+        else
+          false
+        end
+      end
+    end
+  end
+end