composite_primary_keys 11.0.3 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2211207f8a43539739b1d61b5d9f0c655e5ef3d1a0d53a7399fe550c25d36e
-  data.tar.gz: 512b0acad25f57c1d9796c7196827bf9a3c58be3319df5f6c0a11ea16658da09
+  metadata.gz: f55d6d32e63e96e3824998bbf0923818681cff80a944742a6a832908c560830e
+  data.tar.gz: 34c936d0f6eb9174bfabef659c7abf7774f2ce34251887d0408922251a06e06f
 SHA512:
-  metadata.gz: 19c175e1fc9f6ee5290573b75a1370314cfdb0598f65397ac99d616cc48d7a8a7a679ead3040f17249ff3419cbb0bb39355dc458dc4c12ce1235cf04b6dcf8be
-  data.tar.gz: ae880cc7d8c05910b601b9ca99a935468ec70bc6f440daf1015e1932f1544d73340f3bbacd8513a7cfe1f0f86d31df7c74b0ca2da47d31424027b58a012ce2d0
+  metadata.gz: 4edb592bacd34a108d44ca19706ad9012e048a3a81a449b6ee7726f07cf435acc19839599556db7fc24b2971315fc45966e093690285d1a30cd812e29f7ca48f
+  data.tar.gz: 42a0143eaa30e435beacf9e5be4e77f065af10a0dde691392bfa8599905da38a8f97213b3d67978d5c46ad33592f610674b33d55dd438e22e59f1476c7366219

data/History.rdoc

@@ -1,3 +1,8 @@
+== 11.1.0 (2018-11-14)
+* Support ActiveRecord 5.2.1 (S1Artem Tselovalnikov, Caleb Buxton, Charlie Savage)
+* Fix counter cache (Tomonori Murakami)
+* Fix error on autosave has_one relations when the :primary_key option is set (Charlie Savage)
+
 == 11.0.3 (2018-06-25)
 * Fix overridden attribute readers and writers (Charlie Savage)
 

data/README.rdoc

@@ -20,7 +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 11.x is designed to work with ActiveRecord 5.2.x (note this is in progress)
+    Version 11.x is designed to work with ActiveRecord 5.2.x
     Version 10.x is designed to work with ActiveRecord 5.1.x
     Version  9.x is designed to work with ActiveRecord 5.0.x
     Version  8.x is designed to work with ActiveRecord 4.2.x

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~> 5.2.0.rc1'
+  gem 'activerecord', '~> 5.2.1'
   require 'active_record'
 end
 
@@ -101,6 +101,7 @@ 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/postgresql/database_statements'
+require 'composite_primary_keys/connection_adapters/sqlserver/database_statements'
 
 require 'composite_primary_keys/relation/batches'
 require 'composite_primary_keys/relation/where_clause'

data/lib/composite_primary_keys/arel/sqlserver.rb

@@ -1,3 +1,5 @@
+require 'activerecord-sqlserver-adapter'
+
 module Arel
   module Visitors
     class SQLServer

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

@@ -14,62 +14,6 @@ module ActiveRecord
           end
         end
 
-        def associated_records_by_owner(preloader)
-          owners_map = owners_by_key
-          # CPK
-          # owner_keys = owners_map.keys.compact
-          owner_keys = if reflection.foreign_key.is_a?(Array)
-            owners.map do |owner|
-              Array(owner_key_name).map do |owner_key|
-                owner[owner_key]
-              end
-            end.compact.uniq
-          else
-            owners_map.keys.compact
-          end
-
-          # Each record may have multiple owners, and vice-versa
-          records_by_owner = owners.each_with_object({}) do |owner,h|
-            h[owner] = []
-          end
-
-          if owner_keys.any?
-            # Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
-            # Make several smaller queries if necessary or make one query if the adapter supports it
-            sliced  = owner_keys.each_slice(klass.connection.in_clause_length || owner_keys.size)
-
-            records = load_slices sliced
-            records.each do |record, owner_key|
-              owners_map[owner_key].each do |owner|
-                records_by_owner[owner] << record
-              end
-            end
-          end
-
-          records_by_owner
-        end
-
-        def load_slices(slices)
-          @preloaded_records = slices.flat_map { |slice|
-            records_for(slice)
-          }
-
-          # CPK
-          # @preloaded_records.map { |record|
-          #   key = record[association_key_name]
-          #   key = key.to_s if key_conversion_required?
-          #
-          #   [record, key]
-          # }
-          @preloaded_records.map { |record|
-            key = Array(association_key_name).map do |key_name|
-              record[key_name]
-            end.join(CompositePrimaryKeys::ID_SEP)
-
-            [record, key]
-          }
-        end
-
         def owners_by_key
           unless defined?(@owners_by_key)
             @owners_by_key = owners.each_with_object({}) do |owner, h|

data/lib/composite_primary_keys/autosave_association.rb

@@ -1,6 +1,34 @@
 module ActiveRecord
   module AutosaveAssociation
-    private
+    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)

data/lib/composite_primary_keys/connection_adapters/abstract_mysql_adapter.rb

@@ -2,20 +2,18 @@ module ActiveRecord
   module ConnectionAdapters
     class AbstractMysqlAdapter
       def subquery_for(key, select)
-        subsubselect = select.clone
-        subsubselect.projections = [key]
+        subselect = select.clone
+        subselect.projections = [key]
 
         # Materialize subquery by adding distinct
         # to work with MySQL 5.7.6 which sets optimizer_switch='derived_merge=on'
-        subsubselect.distinct unless select.limit || select.offset || select.orders.any?
-
-        subselect = Arel::SelectManager.new(select.engine)
+        subselect.distinct unless select.limit || select.offset || select.orders.any?
 
         # CPK
-        #subselect.project Arel.sql(key.name)
-        subselect.project Arel.sql(Array(key).map(&:name).join(', '))
+        #key_name = quote_column_name(key.name)
+        key_name = Array(key).map {|a_key| quote_column_name(a_key.name)}.join(',')
 
-        subselect.from subsubselect.as('__active_record_temp')
+        Arel::SelectManager.new(subselect.as("__active_record_temp")).project(Arel.sql(key_name))
       end
     end
   end

data/lib/composite_primary_keys/connection_adapters/sqlserver/database_statements.rb

@@ -0,0 +1,23 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module DatabaseStatements
+        def sql_for_insert(sql, pk, id_value, sequence_name, binds)
+          sql = if pk && self.class.use_output_inserted
+            # CPK
+            # quoted_pk = SQLServer::Utils.extract_identifiers(pk).quoted
+            # sql.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk}"
+            quoted_pks = [pk].flatten.map {|pk| "INSERTED.#{SQLServer::Utils.extract_identifiers(pk).quoted}"}
+            sql.dup.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT #{quoted_pks.join(", ")}"
+          else
+            "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
+          end
+
+          # CPK
+          # super
+          [sql, binds]
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/counter_cache.rb

@@ -11,17 +11,22 @@ module ActiveRecord
         end
 
         if touch
-          touch_updates = touch_updates(touch)
+          names = touch if touch != true
+          touch_updates = touch_attributes_with_time(*names)
           updates << sanitize_sql_for_assignment(touch_updates) unless touch_updates.empty?
         end
 
+        if id.is_a?(Relation) && self == id.klass
+          relation = id
         # CPK
-        if primary_key.is_a?(Array)
+        elsif primary_key.is_a?(Array)
           predicate = self.cpk_id_predicate(self.arel_table, self.primary_key, id)
-          unscoped.where(predicate).update_all updates.join(", ")
+          relation = unscoped.where!(predicate)
         else
-          unscoped.where(primary_key => id).update_all updates.join(", ")
+          relation = unscoped.where!(primary_key => id)
         end
+
+        relation.update_all updates.join(", ")
       end
     end
   end

data/lib/composite_primary_keys/relation/finder_methods.rb

@@ -18,7 +18,7 @@ module CompositePrimaryKeys
         end
 
         if block_given?
-          relation._select!(join_dependency.aliases.columns)
+          join_dependency.apply_column_aliases(relation)
           yield relation, join_dependency
         else
           relation

data/lib/composite_primary_keys/version.rb

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

data/test/connections/databases.yml

@@ -11,7 +11,6 @@ ibm_db:
 mysql:
   adapter: mysql2
   username: root
-  password: mysql
   database: composite_primary_keys_unittest
 
 oracle:

data/test/fixtures/db_definitions/mysql.sql

@@ -116,16 +116,7 @@ create table employees (
     id int not null auto_increment,
     department_id int default null,
     location_id int default null,
-    primary key (id)
-);
-
-create table salaries (
-    id int not null auto_increment,
-    employee_id int,
-    location_id int,
-    year int not null,
-    month int not null,
-    value int default null,
+    name varchar(50) default null,
     primary key (id)
 );
 

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -23,8 +23,6 @@ drop table memberships;
 drop table membership_statuses;
 drop sequence membership_statuses_seq;
 drop table departments;
-drop table salaries;
-drop sequence salaries_seq;
 drop table employees;
 drop sequence employees_seq;
 drop table comments;

data/test/fixtures/db_definitions/oracle.sql

@@ -124,18 +124,8 @@ create sequence employees_seq start with 1000;
 create table employees (
     id            number(11) not null primary key,
     department_id number(11) default null,
-    location_id   number(11) default null
-);
-
-create sequence salaries_seq start with 1000;
-
-create table salaries (
-    id          number(11) not null primary key,
-    employee_id number(11) default null,
-    location_id number(11) default null,
-    year        int not null,
-    month       int not null,
-    value       int default null
+    location_id   number(11) default null,
+    name          varchar(50) not null
 );
 
 create sequence comments_seq start with 1000;

data/test/fixtures/db_definitions/postgresql.sql

@@ -118,16 +118,7 @@ create table employees (
     id            serial not null,
     department_id int default null,
     location_id   int default null,
-    primary key (id)
-);
-
-create table salaries (
-    id          serial not null,
-    employee_id int,
-    location_id int,
-    year        int not null,
-    month       int not null,
-    value       int default null,
+    name          text not null,
     primary key (id)
 );
 

data/test/fixtures/db_definitions/sqlite.sql

@@ -109,16 +109,8 @@ create table departments (
 create table employees (
     id integer not null primary key autoincrement,
     department_id integer null,
-    location_id integer null
-);
-
-create table salaries (
-    id integer not null primary key autoincrement,
-    employee_id integer,
-    location_id integer,
-    year int not null,
-    month int not null,
-    value int default null
+    location_id integer null,
+    name varchar(50) not null
 );
 
 create table comments (

data/test/fixtures/db_definitions/sqlserver.sql

@@ -111,7 +111,8 @@ CREATE TABLE departments (
 CREATE TABLE employees (
     id            [int] IDENTITY(1000,1) NOT NULL,
     department_id [int] NULL,
-    location_id   [int] NULL
+    location_id   [int] NULL,
+    name [varchar](50) NOT NULL
 );
 
 CREATE TABLE comments (

data/test/fixtures/department.rb

@@ -1,5 +1,11 @@
 class Department < ActiveRecord::Base
   self.primary_keys = :department_id, :location_id
-  has_many :employees, :foreign_key => [:department_id, :location_id]
-  has_one :head, :class_name => 'Employee', :foreign_key => [:department_id, :location_id], :dependent => :delete
+  has_many :employees,
+           # We intentionally redefine primary key for test purposes. #455
+           :primary_key =>  [:department_id, :location_id],
+           :foreign_key => [:department_id, :location_id]
+  has_one :head, :class_name => 'Employee',  :autosave => true, :dependent => :delete,
+                 # We intentionally redefine primary key for test purposes. #455
+                 :primary_key =>  [:department_id, :location_id],
+                 :foreign_key => [:department_id, :location_id]
 end

data/test/fixtures/employee.rb

@@ -2,9 +2,4 @@ class Employee < ActiveRecord::Base
 	belongs_to :department, :foreign_key => [:department_id, :location_id]
 	has_many :comments, :as => :person
 	has_and_belongs_to_many :groups
-	has_many :salaries, :primary_key => [:id, :location_id],
-		                  :foreign_key => [:employee_id, :location_id]
-	has_one :one_salary, :class_name => "Salary",
-		                   :primary_key => [:id, :location_id],
-		                   :foreign_key => [:employee_id, :location_id]
 end

data/test/fixtures/employees.yml

@@ -2,18 +2,27 @@ steve:
   id: 1
   department_id: 1
   location_id: 1
+  name: Steve
 
 jill:
   id: 2
   department_id: 1
   location_id: 1
+  name: Jill
 
 sarah:
   id: 3
   department_id: 2
   location_id: 1
+  name: Sarah
 
 robert:
   id: 4
   department_id: 2
-  location_id: 1
+  location_id: 1
+  name: Robert
+
+mindy:
+  department_id: 3
+  location_id: 2
+  name: Mindy

data/test/test_associations.rb

@@ -82,18 +82,27 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_has_one_association_primary_key_and_foreign_key_are_present
-    steve = employees(:steve)
-    steve_salary = steve.create_one_salary(year: "2015", month: "1")
+    department = departments(:human_resources)
+
+    assert_equal(1, department.employees.count)
+    assert_equal('Mindy', department.employees[0].name)
 
-    jill = employees(:jill)
-    jill_salary = jill.create_one_salary(year: "2015", month: "1")
+    head = department.create_head(name: 'Rick')
+    assert_equal(department.department_id, head.department_id)
+    assert_equal(department.location_id, head.location_id)
 
-    steve_salary.reload
-    jill_salary.reload
-    assert_equal(steve.id, steve_salary.employee_id)
-    assert_equal(1, steve_salary.location_id)
-    assert_equal(jill.id, jill_salary.employee_id)
-    assert_equal(1, jill_salary.location_id)
+    department.reload
+    assert_equal(1, department.employees.count)
+    assert_equal('Rick', department.employees[0].name)
+  end
+
+  def test_has_one_autosave
+    department = departments(:engineering)
+    assert_equal('Sarah', department.head.name)
+
+    department.head.name = 'Sarah1'
+    department.save!
+    assert_equal('Sarah1', department.head.name)
   end
 
   def test_has_many_association_is_not_cached_to_where_it_returns_the_wrong_ones
@@ -107,35 +116,18 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_has_many_association_primary_key_and_foreign_key_are_present
-    steve = employees(:steve)
-    steve_salary = steve.salaries.create(year: 2015, month: 1)
-
-    jill = employees(:jill)
-    jill_salary = jill.salaries.create(year: 2015, month: 1)
-
-    steve_salary.reload
-    jill_salary.reload
-    assert_equal(steve.id, steve_salary.employee_id)
-    assert_equal(1, steve_salary.location_id)
-    assert_equal(jill.id, jill_salary.employee_id)
-    assert_equal(1, jill_salary.location_id)
-  end
-
-  def test_belongs_to_association_primary_key_and_foreign_key_are_present
-    bogus_foreign_key = 2_500_000
-    salary_01 = Salary.new(
-      year: 2015,
-      month: 1,
-      employee_id: bogus_foreign_key,
-      location_id: 1
-    )
-    salary_01.save!
-    employee_01 = salary_01.create_employee
-    employee_01.reload
-
-    assert_equal(salary_01.employee_id, employee_01.id, "Generated id used")
-    assert_not_equal(bogus_foreign_key, employee_01.id, "Bogus value ignored")
-    assert_equal(1, employee_01.location_id)
+    department = departments(:accounting)
+    assert_equal(2, department.employees.count)
+    assert_equal('Steve', department.employees[0].name)
+    assert_equal('Jill', department.employees[1].name)
+
+    head = department.employees.create(name: 'Rick')
+
+    department.reload
+    assert_equal(3, department.employees.count)
+    assert_equal('Steve', department.employees[0].name)
+    assert_equal('Jill', department.employees[1].name)
+    assert_equal('Rick', department.employees[2].name)
   end
 
   def test_find_includes_product_tariffs_product

data/test/test_counter_cache.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestCounterCache < ActiveSupport::TestCase
-  fixtures :tariffs
+  fixtures :dorms, :rooms, :tariffs
 
   def test_update_counter
     tariff = tariffs(:flat)

data/test/test_delete.rb

@@ -105,7 +105,7 @@ class TestDelete < ActiveSupport::TestCase
 
   def test_create_destroy_has_and_belongs_to_many_on_non_cpk
     records_before = ActiveRecord::Base.connection.execute('select * from employees_groups')
-    employee = Employee.create
+    employee = Employee.create!(department_id: 3, location_id: 2, name: 'Jon')
     employee.groups << Group.create(name: 'test')
     employee.destroy!
     records_after = ActiveRecord::Base.connection.execute('select * from employees_groups')

data/test/test_find.rb

@@ -102,13 +102,13 @@ class TestFind < ActiveSupport::TestCase
   def test_find_by_all_associations
     departments = Department.all
     employees = Employee.where(:department => departments)
-    assert_equal(4, employees.to_a.count)
+    assert_equal(5, employees.to_a.count)
   end
 
   def test_expand_all
     departments = Department.all
     employees = Employee.where(:department => departments)
-    assert_equal(4, employees.count)
+    assert_equal(5, employees.count)
   end
 
   def test_find_one_with_params_id

data/test/test_preload.rb

@@ -91,4 +91,11 @@ class TestPreload < ActiveSupport::TestCase
     assert_equal(1, employees.first.groups_2.size)
     assert_equal(2, employees.second.groups_2.size)
   end
+
+  def test_preload_settings_inversion
+    user = User.preload(:readings).find_by!(:name => 'Santiago')
+    assert_equal(2, user.readings.count)
+    reading = user.readings.first
+    assert_equal(true, reading.association(:user).loaded?)
+  end
 end

data/test/test_suite.rb

@@ -6,6 +6,7 @@
   test_calculations
   test_callbacks
   test_composite_arrays
+  test_counter_cache
   test_create
   test_delete
   test_dumpable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 11.0.3
+  version: 11.1.0
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ files:
 - lib/composite_primary_keys/connection_adapters/abstract_mysql_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
-- lib/composite_primary_keys/connection_adapters/sqlserver_adapter.rb
+- lib/composite_primary_keys/connection_adapters/sqlserver/database_statements.rb
 - lib/composite_primary_keys/core.rb
 - lib/composite_primary_keys/counter_cache.rb
 - lib/composite_primary_keys/fixtures.rb
@@ -200,7 +200,6 @@ files:
 - test/fixtures/room_attribute_assignments.yml
 - test/fixtures/room_attributes.yml
 - test/fixtures/rooms.yml
-- test/fixtures/salary.rb
 - test/fixtures/seat.rb
 - test/fixtures/seats.yml
 - test/fixtures/street.rb

data/lib/composite_primary_keys/connection_adapters/sqlserver_adapter.rb

@@ -1,21 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class SQLServerAdapter
-      def sql_for_insert(sql, pk, id_value, sequence_name, binds)
-        sql = if pk && self.class.use_output_inserted
-          # CPK
-          # quoted_pk = SQLServer::Utils.extract_identifiers(pk).quoted
-          # sql.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk}"
-          quoted_pks = [pk].flatten.map {|pk| "INSERTED.#{SQLServer::Utils.extract_identifiers(pk).quoted}"}
-          sql.dup.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT #{quoted_pks.join(", ")}"
-        else
-          "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
-        end
-
-        # CPK
-        # super
-        [sql, binds]
-      end
-    end
-  end
-end

data/test/fixtures/salary.rb

@@ -1,5 +0,0 @@
-class Salary < ActiveRecord::Base
-  belongs_to :employee,
-    :primary_key => [:id, :location_id],
-    :foreign_key => [:employee_id, :location_id]
-end