composite_primary_keys 8.1.8 → 9.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 98777241ea29aef880ba2b53631fb47686751a898df5b7200cd64a06fb84b838
-  data.tar.gz: 0f5d62c48beab81bcc7a31dd9a025af2867eeb8821482e2aabc0933ae10b95e5
+SHA1:
+  metadata.gz: 2e62c2248e714242837c9bd00862bd0411c02f00
+  data.tar.gz: 587c5f4beabb743d14fd3d7febb134d2fdfa3ab5
 SHA512:
-  metadata.gz: 498c215b18b6056347095a00e81edf399cb0a684c8130413fbb0db87181451bf0801d9c5446b2d34d707137df0e984267d79a9f432accf0287003719a1e229b3
-  data.tar.gz: 1ed759331f302c751f4f93899d3d95945c8c768cd279f817b6431add9c7d97e5caa6b47f8500b8871fa6993a145b288fc6e56f7067ab2f5c479956a10e303d71
+  metadata.gz: 82894133f71054b13e6fa8293e968fff35732cddd7b7856749d9b67b40a81798130f66974acb6561e137899feb591119cab35657b4b98eaf892a12a938dd5ccf
+  data.tar.gz: d5605252ae0c73bef65b92993562032808e86d6ba192eda0e8c5f12681d9465679ab947b2a76b8a93e8423ef1ae673ce0611f66275d16611e7af9ceb4c8de03e

data/History.rdoc

@@ -1,28 +1,5 @@
-== 8.1.8 (2020-01-01)
-Fix handling CPK with fields containing comma, #505 (Sergey Semyonov)
-
-== 8.1.7 (2019-05-04)
-
-Fix key not being an array in subquery on has_many :through (Eric Proulx)
-Convert batches to arrays before continuing loop (Jeremy Mickelson)
-
-== 8.1.6 (2017-05-20)
-
-Query cache with bind params (ttw)
-Fix TestIds#test_set_ids_string. Sqlite's serial and integer are a bit different (Boris Peterbarg)
-Associations with inverse fix (Boris Peterbarg)
-Fix save_has_one_association and add a test for it (Boris Peterbarg)
-Fix save_belongs_to_association override (Boris Peterbarg)
-Extend approach from #344 to fix autosave for has_one associations as well (Cameron Finucane)
-
-== 8.1.5 (2017-01-01)
-
-* Don't nest PK twice when looking up id, fixes #319 (Kerey Roper)
-
-== 8.1.4 (2016-07-27)
-
-* Create OR predicates in a nicely balanced tree fixing #320 (Nathan Samson)
-* Fix find in batches (apurvis)
+== 9.0.0.beta1 (2015-08-04)
+* Rails 5 support (Sammy Larbi)
 
 == 8.1.3 (2016-04-16)
 
@@ -46,6 +23,7 @@ Extend approach from #344 to fix autosave for has_one associations as well (Came
 * Remove call to verify_active_connections! which was removed from AR 4.1 (Steve Pletcher)
 * Aligned the establish connection paramater handling to be similar to latest version of rails (Harish Shetty)
 
+
 == 8.1.0 (2014-03-23)
 
 * ActiveRecord 4.2.1 support (Charlie Savage)

data/README.rdoc

@@ -20,6 +20,7 @@ Every major version of ActiveRecord has included numerous internal changes.  As
 CPK has to be rewritten for each version of ActiveRecord.  To help keep
 things straight, here is the mapping:
 
+    Version 9.x is designed to work with ActiveRecord 5.0.x
     Version 8.x is designed to work with ActiveRecord 4.2.x
     Version 7.x is designed to work with ActiveRecord 4.1.x
     Version 6.x is designed to work with ActiveRecord 4.0.x

data/README_DB2.rdoc

@@ -1,33 +1,33 @@
-Composite Primary key support for db2 
-
-== Driver Support
-
-DB2 support requires the IBM_DB driver provided by http://rubyforge.org/projects/rubyibm/
-project. Install using gem install ibm_db. Tested against version 0.60 of the driver.
-This rubyforge project appears to be permenant location for the IBM adapter.
-Older versions of the driver available from IBM Alphaworks will not work. 
-
-== Driver Bug and workaround provided as part of this plugin
-
-Unlike the basic quote routine available for Rails AR, the DB2 adapter's quote
-method doesn't return " column_name = 1 " when string values (integers in string type variable) 
-are passed for quoting numeric column. Rather it returns "column_name = '1'. 
-DB2 doesn't accept single quoting numeric columns in SQL. Currently, as part of 
-this plugin a fix is provided for the DB2 adapter since this plugin does 
-pass string values like this. Perhaps a patch should be sent to the DB2 adapter
-project for a permanant fix.
-
-== Database Setup
-
-Database must be manually created using a separate command. Read the rake task
-for creating tables and change the db name, user and passwords accordingly.
-
-== Tested Database Server version
-
-This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
-
-== Tested Database Client version
-
-This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
-
-
+Composite Primary key support for db2 
+
+== Driver Support
+
+DB2 support requires the IBM_DB driver provided by http://rubyforge.org/projects/rubyibm/
+project. Install using gem install ibm_db. Tested against version 0.60 of the driver.
+This rubyforge project appears to be permenant location for the IBM adapter.
+Older versions of the driver available from IBM Alphaworks will not work. 
+
+== Driver Bug and workaround provided as part of this plugin
+
+Unlike the basic quote routine available for Rails AR, the DB2 adapter's quote
+method doesn't return " column_name = 1 " when string values (integers in string type variable) 
+are passed for quoting numeric column. Rather it returns "column_name = '1'. 
+DB2 doesn't accept single quoting numeric columns in SQL. Currently, as part of 
+this plugin a fix is provided for the DB2 adapter since this plugin does 
+pass string values like this. Perhaps a patch should be sent to the DB2 adapter
+project for a permanant fix.
+
+== Database Setup
+
+Database must be manually created using a separate command. Read the rake task
+for creating tables and change the db name, user and passwords accordingly.
+
+== Tested Database Server version
+
+This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
+
+== Tested Database Client version
+
+This is tested against DB2 v9.1 in Ubuntu Feisty Fawn (7.04)
+
+

data/Rakefile

@@ -1,34 +1,34 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rubygems/package_task'
-
-# Set global variable so other tasks can access them
-::PROJECT_ROOT = File.expand_path(".")
-::GEM_NAME = 'composite_primary_keys'
-
-# Read the spec file
-spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
-
-# Setup Rake tasks for managing the gem
-Gem::PackageTask.new(spec).define
-
-# Now load in other task files
-Dir.glob('tasks/**/*.rake').each do |rake_file|
-  load File.join(File.dirname(__FILE__), rake_file)
-end
-
-# Set up test tasks for each supported connection adapter
-%w(mysql sqlite3 oracle oracle_enhanced postgresql ibm_db sqlserver).each do |adapter|
-  namespace adapter do
-    desc "Run tests using the #{adapter} adapter"
-    task "test" do
-      ENV["ADAPTER"] = adapter
-      Rake::TestTask.new("subtest_#{adapter}") do |t|
-        t.libs << "test"
-      end
-      Rake::Task["subtest_#{adapter}"].invoke
-    end
-  end
-end
+require 'rubygems'
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'rubygems/package_task'
+
+# Set global variable so other tasks can access them
+::PROJECT_ROOT = File.expand_path(".")
+::GEM_NAME = 'composite_primary_keys'
+
+# Read the spec file
+spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
+
+# Setup Rake tasks for managing the gem
+Gem::PackageTask.new(spec).define
+
+# Now load in other task files
+Dir.glob('tasks/**/*.rake').each do |rake_file|
+  load File.join(File.dirname(__FILE__), rake_file)
+end
+
+# Set up test tasks for each supported connection adapter
+%w(mysql sqlite3 oracle oracle_enhanced postgresql ibm_db sqlserver).each do |adapter|
+  namespace adapter do
+    desc "Run tests using the #{adapter} adapter"
+    task "test" do
+      ENV["ADAPTER"] = adapter
+      Rake::TestTask.new("subtest_#{adapter}") do |t|
+        t.libs << "test"
+      end
+      Rake::Task["subtest_#{adapter}"].invoke
+    end
+  end
+end

data/lib/composite_primary_keys.rb

@@ -26,13 +26,10 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~>4.2.0'
+  gem 'activerecord', '~>5.0.0.beta3'
   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'
@@ -61,19 +58,17 @@ require 'active_record/locking/optimistic'
 require 'active_record/nested_attributes'
 
 require 'active_record/connection_adapters/abstract_adapter'
-require 'active_record/connection_adapters/abstract_mysql_adapter'
 
 require 'active_record/relation/batches'
+require 'active_record/relation/where_clause'
 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'
+require 'active_record/validations/uniqueness' unless ENV["TESTING_CPK"] == "true"
 
 # 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'
@@ -98,20 +93,18 @@ require 'composite_primary_keys/associations/singular_association'
 require 'composite_primary_keys/associations/collection_association'
 
 require 'composite_primary_keys/dirty'
-require 'composite_primary_keys/autosave_association'
 
 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_mysql_adapter'
 require 'composite_primary_keys/connection_adapters/abstract/connection_specification_changes'
 
 require 'composite_primary_keys/relation/batches'
+require 'composite_primary_keys/relation/where_clause'
 require 'composite_primary_keys/relation/calculations'
 require 'composite_primary_keys/relation/finder_methods'
 require 'composite_primary_keys/relation/predicate_builder'

data/lib/composite_primary_keys/associations/association.rb

@@ -1,22 +1,24 @@
 module ActiveRecord
   module Associations
     class Association
-      def creation_attributes
-        attributes = {}
+      silence_warnings do
+        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.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
+            if reflection.options[:as]
+              attributes[reflection.type] = owner.class.base_class.name
+            end
           end
-        end
 
-        attributes
+          attributes
+        end
       end
     end
   end

data/lib/composite_primary_keys/associations/association_scope.rb

@@ -1,69 +1,42 @@
 module ActiveRecord
   module Associations
     class AssociationScope
+      silence_warnings do
+        def next_chain_scope(scope, table, reflection, association_klass, foreign_table, next_reflection)
+          join_keys = reflection.join_keys(association_klass)
+          key = join_keys.key
+          foreign_key = join_keys.foreign_key
+          # CPK
+          # constraint = table[key].eq(foreign_table[foreign_key])
+          constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
 
-      def self.get_bind_values(owner, chain)
-        binds = []
-        last_reflection = chain.last
-
-        # CPK
-        # binds << last_reflection.join_id_for(owner)
-        values = last_reflection.join_id_for(owner)
-        binds += Array(values)
-
-        if last_reflection.type
-          binds << owner.class.base_class.name
-        end
-
-        chain.each_cons(2).each do |reflection, next_reflection|
           if reflection.type
-            binds << next_reflection.klass.base_class.name
+            value = transform_value(next_reflection.klass.base_class.name)
+            scope = scope.where(table.name => { reflection.type => value })
           end
-        end
-        binds
-      end
-
-      def next_chain_scope(scope, table, reflection, tracker, assoc_klass, foreign_table, next_reflection)
-        join_keys = reflection.join_keys(assoc_klass)
-        key = join_keys.key
-        foreign_key = join_keys.foreign_key
 
-        # CPK
-        # constraint = table[key].eq(foreign_table[foreign_key])
-        constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
-
-        if reflection.type
-          value    = next_reflection.klass.base_class.name
-          bind_val = bind scope, table.table_name, reflection.type, value, tracker
-          scope    = scope.where(table[reflection.type].eq(bind_val))
+          scope = scope.joins(join(foreign_table, constraint))
         end
 
-        scope.joins(join(foreign_table, constraint))
-      end
-
-      def last_chain_scope(scope, table, reflection, owner, tracker, assoc_klass)
-        join_keys = reflection.join_keys(assoc_klass)
-        key = join_keys.key
-        foreign_key = join_keys.foreign_key
-
-        if key.kind_of?(Array) || foreign_key.kind_of?(Array)
-          key = Array(key) unless key.kind_of?(Array)
-          foreign_key = Array(foreign_key) unless foreign_key.kind_of?(Array)
-          key.zip(foreign_key).map do |k, fk|
-            bind_val = bind scope, table.table_name, k.to_s, owner[fk], tracker
-            scope    = scope.where(table[k].eq(bind_val))
+        def last_chain_scope(scope, table, reflection, owner, association_klass)
+          join_keys = reflection.join_keys(association_klass)
+          key = join_keys.key
+          foreign_key = join_keys.foreign_key
+
+          # CPK
+          if key.kind_of?(Array) || foreign_key.kind_of?(Array)
+            predicate = cpk_join_predicate(table, key, owner, foreign_key)
+            scope = scope.where(predicate)
+          else
+            value = transform_value(owner[foreign_key])
+            scope = scope.where(table.name => { key => value })
           end
-        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
+          if reflection.type
+            polymorphic_type = transform_value(owner.class.base_class.name)
+            scope = scope.where(table.name => { reflection.type => polymorphic_type })
+          end
 
-          scope.where(table[reflection.type].eq(bind_val))
-        else
           scope
         end
       end

data/lib/composite_primary_keys/associations/collection_association.rb

@@ -1,15 +1,29 @@
 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
+    def get_records
+      cpk_applies = target.try(:composite?) || owner.try(:composite?)
+      return scope.to_a if cpk_applies
+      super
+    end
+
+    def ids_writer(ids)
+      pk_type = reflection.primary_key_type
+      ids = Array(ids).reject(&:blank?)
+      ids.map! { |i| pk_type.cast(i) }
+      # CPK
+      if reflection.association_primary_key.is_a?(Array)
+        predicate = Class.new.extend(CompositePrimaryKeys::Predicates).cpk_in_predicate(klass.arel_table, reflection.association_primary_key, ids)
+        records = klass.where(predicate).index_by do |r|
+          reflection.association_primary_key.map{ |k| r.send(k) }
+        end.values_at(*ids)
+      else
+        records = klass.where(reflection.association_primary_key => ids).index_by do |r|
+          r.send(reflection.association_primary_key)
+        end.values_at(*ids)
       end
-      alias_method_chain :get_records, :cpk_support
+      replace(records)
     end
   end
 end
 
-ActiveRecord::Associations::CollectionAssociation.send(:include, CompositePrimaryKeys::CollectionAssociation)
+ActiveRecord::Associations::CollectionAssociation.prepend CompositePrimaryKeys::CollectionAssociation

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -1,67 +1,29 @@
 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
-
+      silence_warnings do
+        def delete_count(method, scope)
           if method == :delete_all
-            update_counter(-scope.delete_all)
+            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
+            # scope.update_all(reflection.foreign_key => nil)
+            conds = Array(reflection.foreign_key).inject(Hash.new) do |mem, key|
+              mem[key] = nil
+              mem
             end
-            update_counter(-scope.update_all(update_hash))
+            scope.update_all(conds)
           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
+        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