composite_primary_keys 12.0.8 → 13.0.1

data/test/test_nested_attributes.rb

@@ -1,67 +1,67 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-# Testing the find action on composite ActiveRecords with two primary keys
-class TestNestedAttributes < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-
-  def test_nested_atttribute_create
-    code_id = 1001
-
-    reference_type = reference_types(:name_prefix)
-    reference_type.update :reference_codes_attributes => [{
-      :reference_code => code_id,
-      :code_label => 'XX',
-      :abbreviation => 'Xx'
-    }]
-    assert_not_nil ReferenceCode.find_by_reference_code(code_id)
-  end
-
-  def test_nested_atttribute_update
-    code_id = 1002
-
-    reference_type = reference_types(:name_prefix)
-    reference_type.update :reference_codes_attributes => [{
-      :reference_code => code_id,
-      :code_label => 'XX',
-      :abbreviation => 'Xx'
-    }]
-
-    reference_code = ReferenceCode.find_by_reference_code(code_id)
-    cpk = CompositePrimaryKeys::CompositeKeys[reference_type.reference_type_id, code_id]
-    reference_type.update :reference_codes_attributes => [{
-      :id => cpk,
-      :code_label => 'AAA',
-      :abbreviation => 'Aaa'
-    }]
-
-    reference_code = ReferenceCode.find_by_reference_code(code_id)
-    assert_kind_of(ReferenceCode, reference_code)
-    assert_equal(reference_code.code_label, 'AAA')
-  end
-
-  def test_nested_atttribute_update_2
-    reference_type = reference_types(:gender)
-    reference_code = reference_codes(:gender_male)
-
-    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id,
-                                                                      :code_label => 'XX',
-                                                                      :abbreviation => 'Xx'}])
-
-    reference_code.reload
-    assert_equal(reference_code.code_label, 'XX')
-    assert_equal(reference_code.abbreviation, 'Xx')
-  end
-
-  def test_nested_atttribute_update_3
-    reference_type = reference_types(:gender)
-    reference_code = reference_codes(:gender_male)
-
-    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id.to_s,
-                                                                      :code_label => 'XX',
-                                                                      :abbreviation => 'Xx'}])
-
-    reference_code.reload
-    assert_equal(reference_code.code_label, 'XX')
-    assert_equal(reference_code.abbreviation, 'Xx')
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+# Testing the find action on composite ActiveRecords with two primary keys
+class TestNestedAttributes < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+
+  def test_nested_atttribute_create
+    code_id = 1001
+
+    reference_type = reference_types(:name_prefix)
+    reference_type.update :reference_codes_attributes => [{
+      :reference_code => code_id,
+      :code_label => 'XX',
+      :abbreviation => 'Xx'
+    }]
+    assert_not_nil ReferenceCode.find_by_reference_code(code_id)
+  end
+
+  def test_nested_atttribute_update
+    code_id = 1002
+
+    reference_type = reference_types(:name_prefix)
+    reference_type.update :reference_codes_attributes => [{
+      :reference_code => code_id,
+      :code_label => 'XX',
+      :abbreviation => 'Xx'
+    }]
+
+    reference_code = ReferenceCode.find_by_reference_code(code_id)
+    cpk = CompositePrimaryKeys::CompositeKeys[reference_type.reference_type_id, code_id]
+    reference_type.update :reference_codes_attributes => [{
+      :id => cpk,
+      :code_label => 'AAA',
+      :abbreviation => 'Aaa'
+    }]
+
+    reference_code = ReferenceCode.find_by_reference_code(code_id)
+    assert_kind_of(ReferenceCode, reference_code)
+    assert_equal(reference_code.code_label, 'AAA')
+  end
+
+  def test_nested_atttribute_update_2
+    reference_type = reference_types(:gender)
+    reference_code = reference_codes(:gender_male)
+
+    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id,
+                                                                      :code_label => 'XX',
+                                                                      :abbreviation => 'Xx'}])
+
+    reference_code.reload
+    assert_equal(reference_code.code_label, 'XX')
+    assert_equal(reference_code.abbreviation, 'Xx')
+  end
+
+  def test_nested_atttribute_update_3
+    reference_type = reference_types(:gender)
+    reference_code = reference_codes(:gender_male)
+
+    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id.to_s,
+                                                                      :code_label => 'XX',
+                                                                      :abbreviation => 'Xx'}])
+
+    reference_code.reload
+    assert_equal(reference_code.code_label, 'XX')
+    assert_equal(reference_code.abbreviation, 'Xx')
+  end
+end

data/test/test_update.rb

@@ -1,97 +1,103 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestUpdate < ActiveSupport::TestCase
-  fixtures :departments, :reference_types, :reference_codes, :rooms, :room_assignments
-
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-      :update => { :description => 'RT Desc' },
-    },
-    :dual   => {
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-      :update => { :description => 'RT Desc' },
-    },
-  }
-
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_setup
-    testing_with do
-      assert_not_nil @klass_info[:update]
-    end
-  end
-
-  def test_update_attributes
-    testing_with do
-      assert(@first.update(@klass_info[:update]))
-      assert(@first.reload)
-      @klass_info[:update].each_pair do |attr_name, new_value|
-        assert_equal(new_value, @first[attr_name])
-      end
-    end
-  end
-
-  def test_update_attributes_with_id_field
-    department = departments(:accounting)
-    department.update_attribute(:location_id, 3)
-    department.reload
-    assert_equal(3, department.location_id)
-  end
-
-  def test_update_primary_key
-    obj = ReferenceCode.find([1,1])
-    obj.reference_type_id = 2
-    obj.reference_code = 3
-    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
-    assert(obj.save)
-    assert(obj.reload)
-    assert_equal(2, obj.reference_type_id)
-    assert_equal(3, obj.reference_code)
-    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
-    assert_equal([2, 3], obj.id)
-  end
-
-  def test_update_attribute
-    obj = ReferenceType.find(1)
-    obj[:abbreviation] = 'a'
-    obj['abbreviation'] = 'b'
-    assert(obj.save)
-    assert(obj.reload)
-    assert_equal('b', obj.abbreviation)
-  end
-
-  def test_update_all
-    ReferenceCode.update_all(description: 'random value')
-
-    ReferenceCode.all.each do |reference_code|
-      assert_equal('random value', reference_code.description)
-    end
-  end
-
-  def test_update_all_join
-    ReferenceCode.joins(:reference_type).
-                  where('reference_types.reference_type_id = ?', 2).
-                  update_all(:description => 'random value')
-
-    query = ReferenceCode.where('reference_type_id = ?', 2).
-                          where(:description => 'random value')
-
-    assert_equal(2, query.count)
-  end
-
-  def test_update_with_uniqueness
-    assignment = room_assignments(:jacksons_room)
-    room_1 = rooms(:branner_room_1)
-    room_2 = rooms(:branner_room_3)
-
-    assert_equal(room_1, assignment.room)
-    assignment.room = room_2
-    assignment.save!
-    assert_equal(room_2, assignment.room)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestUpdate < ActiveSupport::TestCase
+  fixtures :departments, :reference_types, :reference_codes, :rooms, :room_assignments
+
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+      :update => { :description => 'RT Desc' },
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+      :update => { :description => 'RT Desc' },
+    },
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_setup
+    testing_with do
+      assert_not_nil @klass_info[:update]
+    end
+  end
+
+  def test_update_attributes
+    testing_with do
+      assert(@first.update(@klass_info[:update]))
+      assert(@first.reload)
+      @klass_info[:update].each_pair do |attr_name, new_value|
+        assert_equal(new_value, @first[attr_name])
+      end
+    end
+  end
+
+  def test_update_attributes_with_id_field
+    department = departments(:accounting)
+    department.update_attribute(:location_id, 3)
+    department.reload
+    assert_equal(3, department.location_id)
+  end
+
+  def test_update_primary_key
+    obj = ReferenceCode.find([1,1])
+    obj.reference_type_id = 2
+    obj.reference_code = 3
+    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
+    assert(obj.save)
+    assert(obj.reload)
+    assert_equal(2, obj.reference_type_id)
+    assert_equal(3, obj.reference_code)
+    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
+    assert_equal([2, 3], obj.id)
+  end
+
+  def test_update_attribute
+    obj = ReferenceType.find(1)
+    obj[:abbreviation] = 'a'
+    obj['abbreviation'] = 'b'
+    assert(obj.save)
+    assert(obj.reload)
+    assert_equal('b', obj.abbreviation)
+  end
+
+  def test_update_all
+    ReferenceCode.update_all(description: 'random value')
+
+    ReferenceCode.all.each do |reference_code|
+      assert_equal('random value', reference_code.description)
+    end
+  end
+
+  def test_update_all_join
+    tested_update_all = false
+    Arel::Table.engine = nil # should not rely on the global Arel::Table.engine
+    ReferenceCode.joins(:reference_type).
+                  where('reference_types.reference_type_id = ?', 2).
+                  update_all(:description => 'random value')
+
+    query = ReferenceCode.where('reference_type_id = ?', 2).
+                          where(:description => 'random value')
+
+    assert_equal(2, query.count)
+    tested_update_all = true
+  ensure
+    Arel::Table.engine = ActiveRecord::Base
+    assert tested_update_all
+  end
+
+  def test_update_with_uniqueness
+    assignment = room_assignments(:jacksons_room)
+    room_1 = rooms(:branner_room_1)
+    room_2 = rooms(:branner_room_3)
+
+    assert_equal(room_1, assignment.room)
+    assignment.room = room_2
+    assignment.save!
+    assert_equal(room_2, assignment.room)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 12.0.8
+  version: 13.0.1
 platform: ruby
 authors:
 - Charlie Savage
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-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: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +71,6 @@ files:
 - 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/mysql/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/postgresql/database_statements.rb
 - lib/composite_primary_keys/connection_adapters/sqlserver/database_statements.rb
 - lib/composite_primary_keys/core.rb
@@ -88,6 +87,7 @@ files:
 - lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/relation/where_clause.rb
 - lib/composite_primary_keys/sanitization.rb
+- lib/composite_primary_keys/table_metadata.rb
 - lib/composite_primary_keys/transactions.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.8
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: Composite key support for ActiveRecord

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module ConnectionAdapters
-    module MySQL
-      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 pk.is_a?(Array)
-            pk.map do |key|
-              column = column_for(arel.ast.relation.name, key)
-              column.auto_increment? ? last_inserted_id(value) : nil
-            end
-          else
-            id_value || last_inserted_id(value)
-          end
-        end
-      end
-    end
-  end
-end