composite_primary_keys 7.0.13 → 7.0.14

data/lib/composite_primary_keys.rb

@@ -1,110 +1,110 @@
-#--
-# 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
-
-# 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/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.1.7'
+  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/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/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'

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.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

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -1,77 +1,77 @@
-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
+
+          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

data/lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb

@@ -1,59 +1,59 @@
-module ActiveRecord
-  module Associations
-    class HasAndBelongsToManyAssociation
-      def insert_record(record, validate = true, raise = false)
-        if record.new_record?
-          if raise
-            record.save!(:validate => validate)
-          else
-            return unless record.save(:validate => validate)
-          end
-        end
-
-        if options[:insert_sql]
-          owner.class.connection.insert(interpolate(options[:insert_sql], record))
-        else
-          # CPK
-          #stmt = join_table.compile_insert(
-          #  join_table[reflection.foreign_key]             => owner.id,
-          #  join_table[reflection.association_foreign_key] => record.id
-          #)
-          join_values = Hash.new
-          Array(reflection.foreign_key).zip(Array(owner.id)) do |name, value|
-            attribute = join_table[name]
-            join_values[attribute] = value
-          end
-
-          Array(reflection.association_foreign_key).zip(Array(record.id)) do |name, value|
-            attribute = join_table[name]
-            join_values[attribute] = value
-          end
-
-          stmt = join_table.compile_insert(join_values)
-
-          owner.class.connection.insert stmt.to_sql
-        end
-
-        record
-      end
-
-      def delete_records(records, method)
-        if sql = options[:delete_sql]
-          records.each { |record| owner.class.connection.delete(interpolate(sql, record)) }
-        else
-          relation = join_table
-          # CPK
-          # stmt = relation.where(relation[reflection.foreign_key].eq(owner.id).
-          #  and(relation[reflection.association_foreign_key].in(records.map { |x| x.id }.compact))
-          #).compile_delete
-
-          predicate1 = cpk_id_predicate(relation, Array(reflection.foreign_key), Array(owner.id))
-          predicate2 = cpk_in_predicate(relation, Array(reflection.association_foreign_key), records.map { |x| x.id }) unless records == :all
-          stmt = relation.where(predicate1.and(predicate2)).compile_delete
-
-          owner.class.connection.delete stmt.to_sql
-        end
-      end
-    end    
-  end
-end
+module ActiveRecord
+  module Associations
+    class HasAndBelongsToManyAssociation
+      def insert_record(record, validate = true, raise = false)
+        if record.new_record?
+          if raise
+            record.save!(:validate => validate)
+          else
+            return unless record.save(:validate => validate)
+          end
+        end
+
+        if options[:insert_sql]
+          owner.class.connection.insert(interpolate(options[:insert_sql], record))
+        else
+          # CPK
+          #stmt = join_table.compile_insert(
+          #  join_table[reflection.foreign_key]             => owner.id,
+          #  join_table[reflection.association_foreign_key] => record.id
+          #)
+          join_values = Hash.new
+          Array(reflection.foreign_key).zip(Array(owner.id)) do |name, value|
+            attribute = join_table[name]
+            join_values[attribute] = value
+          end
+
+          Array(reflection.association_foreign_key).zip(Array(record.id)) do |name, value|
+            attribute = join_table[name]
+            join_values[attribute] = value
+          end
+
+          stmt = join_table.compile_insert(join_values)
+
+          owner.class.connection.insert stmt.to_sql
+        end
+
+        record
+      end
+
+      def delete_records(records, method)
+        if sql = options[:delete_sql]
+          records.each { |record| owner.class.connection.delete(interpolate(sql, record)) }
+        else
+          relation = join_table
+          # CPK
+          # stmt = relation.where(relation[reflection.foreign_key].eq(owner.id).
+          #  and(relation[reflection.association_foreign_key].in(records.map { |x| x.id }.compact))
+          #).compile_delete
+
+          predicate1 = cpk_id_predicate(relation, Array(reflection.foreign_key), Array(owner.id))
+          predicate2 = cpk_in_predicate(relation, Array(reflection.association_foreign_key), records.map { |x| x.id }) unless records == :all
+          stmt = relation.where(predicate1.and(predicate2)).compile_delete
+
+          owner.class.connection.delete stmt.to_sql
+        end
+      end
+    end    
+  end
+end