composite_primary_keys 11.1.0 → 11.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f55d6d32e63e96e3824998bbf0923818681cff80a944742a6a832908c560830e
-  data.tar.gz: 34c936d0f6eb9174bfabef659c7abf7774f2ce34251887d0408922251a06e06f
+  metadata.gz: 76e658e30475707dc7495c8f5f5647c18ad0a67edc3cc5787a312a1785418524
+  data.tar.gz: f824d0c22fb21ec5d7d8311047433a6661cb5c134549ee46460e6c693b0cbe4c
 SHA512:
-  metadata.gz: 4edb592bacd34a108d44ca19706ad9012e048a3a81a449b6ee7726f07cf435acc19839599556db7fc24b2971315fc45966e093690285d1a30cd812e29f7ca48f
-  data.tar.gz: 42a0143eaa30e435beacf9e5be4e77f065af10a0dde691392bfa8599905da38a8f97213b3d67978d5c46ad33592f610674b33d55dd438e22e59f1476c7366219
+  metadata.gz: 0721b3f2dcb649fd585baf7facf0747d73edf8929e1f7c2ef9b4522ce3824b23d94cec7caafd810d7ea77e03043ee3cc31abfd6dca16eb012556be147c634fe0
+  data.tar.gz: 40282b497748d0a9eda0cc461c38c4dc91714560022fa37e7466e085a65ea2bd53b85f50cd5845560a2ab43e0c24544b76faf493457f9f9f166ce3761b420285

data/History.rdoc

@@ -1,3 +1,10 @@
+== 11.2.0 (2019-03-16)
+* When creating new records, honor composite key autoincrementing fields if possible (Antti Pitkänen)
+* Update Association#run to more closely match ActiveRecord (Fabian Mersch)
+* Updates needed due to changes in ActiveRecord (Sammy Larbi)
+* Fix construct_join_attributes method (Brad Slaughter)
+* Fix destroy_all on HABTM (Brad Slaughter)
+
 == 11.1.0 (2018-11-14)
 * Support ActiveRecord 5.2.1 (S1Artem Tselovalnikov, Caleb Buxton, Charlie Savage)
 * Fix counter cache (Tomonori Murakami)

data/lib/composite_primary_keys.rb

@@ -50,21 +50,19 @@ require 'active_record/associations/join_dependency'
 require 'active_record/associations/preloader/association'
 require 'active_record/associations/singular_association'
 require 'active_record/associations/collection_association'
+require 'active_record/associations/through_association'
 
 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/database_statements'
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 require 'active_record/connection_adapters/postgresql/database_statements'
 
-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/query_methods'
 require 'active_record/relation/predicate_builder/association_query_value'
 
 require 'active_record/validations/uniqueness'
@@ -92,12 +90,14 @@ require 'composite_primary_keys/associations/has_many_through_association'
 require 'composite_primary_keys/associations/join_dependency'
 require 'composite_primary_keys/associations/preloader/association'
 require 'composite_primary_keys/associations/collection_association'
+require 'composite_primary_keys/associations/through_association'
 
 require 'composite_primary_keys/attribute_methods/primary_key'
 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/database_statements'
 require 'composite_primary_keys/connection_adapters/abstract_adapter'
 require 'composite_primary_keys/connection_adapters/abstract_mysql_adapter'
 require 'composite_primary_keys/connection_adapters/postgresql/database_statements'

data/lib/composite_primary_keys/associations/has_many_through_association.rb

@@ -1,66 +1,7 @@
 module ActiveRecord
   module Associations
     class HasManyThroughAssociation
-      def cpk_join_through_predicate(*records)
-        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)
-      end
-
-      def delete_records(records, method)
-        ensure_not_nested
-
-        scope = through_association.scope
-        # CPK
-        # scope.where! construct_join_attributes(*records)
-        if source_reflection.klass.composite?
-          scope.where! cpk_join_through_predicate(*records)
-        else
-          scope.where! construct_join_attributes(*records)
-        end
-
-        case method
-        when :destroy
-          if scope.klass.primary_key
-            count = scope.destroy_all.length
-          else
-            scope.to_a.each do |record|
-              record.run_callbacks :destroy
-            end
-
-            arel = scope.arel
-
-            stmt = Arel::DeleteManager.new arel.engine
-            stmt.from scope.klass.arel_table
-            stmt.wheres = arel.constraints
-
-            count = scope.klass.connection.delete(stmt, 'SQL', scope.bind_values)
-          end
-        when :nullify
-          count = scope.update_all(source_reflection.foreign_key => nil)
-        else
-          count = scope.delete_all
-        end
-
-        delete_through_records(records)
-
-        if source_reflection.options[:counter_cache] && method != :destroy
-          counter = source_reflection.counter_cache_column
-          klass.decrement_counter counter, records.map(&:id)
-        end
-
-        if through_reflection.collection? && update_through_counter?(method)
-          update_counter(-count, through_reflection)
-        end
-
-        update_counter(-count)
-      end
 
       def through_records_for(record)
         # CPK

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

@@ -43,7 +43,7 @@ module ActiveRecord
                       convert_key(key)
                     end
                   else
-                    record[association_key_name]
+                    convert_key(record[association_key_name])
                   end
 
             owner = owners_by_key[key]

data/lib/composite_primary_keys/associations/through_association.rb

@@ -0,0 +1,24 @@
+module ActiveRecord
+  module Associations
+    module ThroughAssociation
+      alias :original_construct_join_attributes :construct_join_attributes
+
+      def construct_join_attributes(*records)
+        # CPK
+        if source_reflection.klass.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/connection_adapters/abstract/database_statements.rb

@@ -0,0 +1,17 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module DatabaseStatements
+      def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
+        sql, binds = to_sql_and_binds(arel, binds)
+        value = exec_insert(sql, name, binds, pk, sequence_name)
+
+        # CPK
+        if value && pk.is_a?(Array)
+          id_value || value.rows.first
+        else
+          id_value || last_inserted_id(value)
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/persistence.rb

@@ -56,5 +56,25 @@ module ActiveRecord
         connection.delete(dm, "#{self} Destroy")
       end
     end
+
+    def _create_record(attribute_names = self.attribute_names)
+      attribute_names &= self.class.column_names
+      attributes_values = attributes_with_values_for_create(attribute_names)
+
+      new_id = self.class._insert_record(attributes_values)
+
+      # CPK
+      if self.composite? && self.id.compact.empty?
+        self.id = new_id
+      else
+        self.id ||= new_id if self.class.primary_key
+      end
+
+      @new_record = false
+
+      yield(self) if block_given?
+
+      id
+    end
   end
 end

data/lib/composite_primary_keys/relation/batches.rb

@@ -7,12 +7,19 @@ module CompositePrimaryKeys
           return BatchEnumerator.new(of: of, start: start, finish: finish, relation: self)
         end
 
-        if arel.orders.present? || arel.taken.present?
-          act_on_order_or_limit_ignored(error_on_ignore)
+        if arel.orders.present?
+          act_on_ignored_order(error_on_ignore)
         end
 
-        relation = relation.reorder(batch_order).limit(of)
+        batch_limit = of
+        if limit_value
+          remaining   = limit_value
+          batch_limit = remaining if remaining < batch_limit
+        end
+
+        relation = relation.reorder(batch_order).limit(batch_limit)
         relation = apply_limits(relation, start, finish)
+        relation.skip_query_cache! # Retaining the results in the query cache would undermine the point of batching
         batch_relation = relation
 
         loop do
@@ -39,7 +46,20 @@ module CompositePrimaryKeys
 
           yield yielded_relation
 
-          break if ids.length < of
+          break if ids.length < batch_limit
+
+          if limit_value
+            remaining -= ids.length
+
+            if remaining == 0
+              # Saves a useless iteration when the limit is a multiple of the
+              # batch size.
+              break
+            elsif remaining < batch_limit
+              relation = relation.limit(remaining)
+            end
+          end
+
           # CPK
           # batch_relation = relation.where(arel_attribute(primary_key).gt(primary_key_offset))
           batch_relation = if composite?

data/lib/composite_primary_keys/version.rb

@@ -1,7 +1,7 @@
 module CompositePrimaryKeys
   module VERSION
     MAJOR = 11
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/fixtures/db_definitions/postgresql.sql

@@ -54,8 +54,8 @@ create table product_tariffs (
 );
 
 create table suburbs (
-    city_id   int         not null,
-    suburb_id int         not null,
+    city_id   serial         not null,
+    suburb_id serial         not null,
     name      varchar(50) not null,
     primary key (city_id, suburb_id)
 );

data/test/fixtures/db_definitions/sqlite.sql

@@ -20,8 +20,8 @@ create table reference_types (
 );
 
 create table reference_codes (
-    reference_type_id int(11),
-    reference_code int(11) not null,
+    reference_type_id int,
+    reference_code int not null,
     code_label varchar(50) default null,
     abbreviation varchar(50) default null,
     description varchar(50) default null,
@@ -29,14 +29,14 @@ create table reference_codes (
 );
 
 create table products (
-    id int(11) not null primary key,
+    id int not null primary key,
     name varchar(50) default null,
     created_at TIMESTAMP,
     updated_at TIMESTAMP
 );
 
 create table tariffs (
-    tariff_id int(11) not null,
+    tariff_id int not null,
     start_date date not null,
     amount integer(11) default null,
     created_at TIMESTAMP,
@@ -45,23 +45,23 @@ create table tariffs (
 );
 
 create table product_tariffs (
-    product_id int(11) not null,
-    tariff_id int(11) not null,
+    product_id int not null,
+    tariff_id int not null,
     tariff_start_date date not null,
     primary key (product_id, tariff_id, tariff_start_date)
 );
 
 create table suburbs (
-    city_id int(11) not null,
-    suburb_id int(11) not null,
+    city_id int identity(1,1) not null,
+    suburb_id int identity(1,1) not null,
     name varchar(50) not null,
     primary key (city_id, suburb_id)
 );
 
 create table streets (
     id integer not null primary key autoincrement,
-    city_id int(11) not null,
-    suburb_id int(11) not null,
+    city_id int not null,
+    suburb_id int not null,
     name varchar(50) not null
 );
 
@@ -77,9 +77,9 @@ create table articles (
 
 create table readings (
     id integer not null primary key autoincrement,
-    user_id int(11) not null,
-    article_id int(11) not null,
-    rating int(11) not null
+    user_id int not null,
+    article_id int not null,
+    rating int not null
 );
 
 create table groups (

data/test/test_associations.rb

@@ -33,6 +33,11 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(3, products.inject(0) {|sum, product| sum + product.product_tariffs.length})
   end
 
+  def test_find_includes_2
+    products = ProductTariff.where(:tariff_id => 2).order('product_id, tariff_id').includes(:tariff)
+    assert_equal(2, products.length)
+  end
+
   def test_find_includes_eager_loading
     product = products(:second_product)
     product_tarrif = product_tariffs(:second_free)
@@ -59,6 +64,15 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(3, tariffs.inject(0) {|sum, tariff| sum + tariff.product_tariffs.length})
   end
 
+  def test_find_each_does_not_throw_error
+    tariffs = Tariff.includes(:product_tariffs)
+    worked = false
+    tariffs.first.product_tariffs.order(:tariff_id).find_each do |pt|
+      worked = true
+    end
+    assert worked
+  end
+
   def test_association_with_composite_primary_key_can_be_autosaved
     room = Room.new(dorm_id: 1000, room_id: 1001)
     room_assignment = RoomAssignment.new(student_id: 1000)

data/test/test_create.rb

@@ -48,6 +48,17 @@ class TestCreate < ActiveSupport::TestCase
     end
   end
 
+  def test_create_generated_keys
+    # Not all databases support columns with multiple identity fields
+    if defined?(ActiveRecord::ConnectionAdapters::PostgreSQL) ||
+       defined?(ActiveRecord::ConnectionAdapters::SQLite3)
+
+      suburb = Suburb.create!(:name => 'Capitol Hill')
+      refute_nil(suburb.city_id)
+      refute_nil(suburb.suburb_id)
+    end
+  end
+
   def test_create_on_association
     suburb = Suburb.first
     suburb.streets.create(:name => "my street")

data/test/test_delete.rb

@@ -116,6 +116,19 @@ class TestDelete < ActiveSupport::TestCase
     end
   end
 
+  def test_create_destroy_all_has_and_belongs_to_many_on_non_cpk
+    records_before = ActiveRecord::Base.connection.execute('select * from employees_groups')
+    employee = Employee.create!(department_id: 3, location_id: 2, name: 'Jon')
+    employee.groups << Group.create(name: 'test')
+    employee.groups.destroy_all
+    records_after = ActiveRecord::Base.connection.execute('select * from employees_groups')
+    if records_before.respond_to?(:count)
+      assert_equal records_before.count, records_after.count
+    elsif records_before.respond_to?(:row_count) # OCI8:Cursor for oracle adapter
+      assert_equal records_before.row_count, records_after.row_count
+    end
+  end
+
   def test_delete_not_destroy_on_cpk
     tariff = Tariff.where(tariff_id: 2).first
     tariff.delete

data/test/test_preload.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestPreload < ActiveSupport::TestCase
-  fixtures :comments, :users, :employees, :groups, :hacks
+  fixtures :comments, :users, :employees, :groups, :hacks, :readings
 
   class UserForPreload < User
     has_many :comments_with_include_condition, -> { where('person_type = ?', 'User')},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 11.1.0
+  version: 11.2.0
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,6 +100,7 @@ files:
 - lib/composite_primary_keys/associations/has_many_through_association.rb
 - lib/composite_primary_keys/associations/join_dependency.rb
 - lib/composite_primary_keys/associations/preloader/association.rb
+- lib/composite_primary_keys/associations/through_association.rb
 - lib/composite_primary_keys/attribute_methods.rb
 - lib/composite_primary_keys/attribute_methods/primary_key.rb
 - lib/composite_primary_keys/attribute_methods/read.rb
@@ -109,6 +110,7 @@ files:
 - lib/composite_primary_keys/composite_arrays.rb
 - lib/composite_primary_keys/composite_predicates.rb
 - lib/composite_primary_keys/composite_relation.rb
+- lib/composite_primary_keys/connection_adapters/abstract/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
 - lib/composite_primary_keys/connection_adapters/abstract_mysql_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql/database_statements.rb
@@ -270,8 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord