composite_primary_keys 12.0.6 → 12.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea522edb09ab0dfd60a25bb34aa7c31a50f1afc2260b54189338a694dce48c5b
-  data.tar.gz: 5aefc2529dbfe80f7453ad75e2d3043fb329dc8294ac80f56ef2ce60988d8d45
+  metadata.gz: 2465cca0fa83a628e24f3221e88095690295c99b2bf46818bd2ebd76df8300b5
+  data.tar.gz: a22c2b61575c26e23e51b314c05c158663c26ce7a9c64fb56019d596edc6a844
 SHA512:
-  metadata.gz: f482042e909cbd80341bb609387d41fe82236d82c9f26aa5742e0c4ce470eb873ced0b48a461ec3836b361e0075c9c831f75e2f69023787738e6cca0e5a34026
-  data.tar.gz: 649981635ecf30e0a94dfd811230395af0c0ab1111beec027fc9787d5185e57572f2b0677f8e4e88f01cf2cc784d1d0a2ccbd04ae30898ee2e860a9950a5e355
+  metadata.gz: 3147006b49f98c3d1e88dbec56590fad63c13506634427361e14e06d611e75666c89c48c3e9151d174dc075d850a238285be6bc62739d8971d7bf190bc6e9db9
+  data.tar.gz: 34d811c5ab6afb7d5b4b9dc871b2df660f42abaf146ffc7faa60c9d4d2edfb8c1a8fa6e49b40488a6090a7bb64218fafb6b0e965744b4daa0d11c0fc34605abf

data/History.rdoc

@@ -1,3 +1,15 @@
+== 12.0.9 (2021-02-22)
+* Third time is hopefully the charm on MySQL/MariaDB auto increment fix
+
+== 12.0.8 (2021-02-16)
+* Revert to previous MySQL/MariaDB auto increment fix
+
+== 12.0.7 (2021-02-15)
+* Switch to GitHub actions (ta1kt0me)
+* Fix MySQL/MariaDB query cache issue bug introduced in version 12.0.3 - see #539 (Charlie Savage)
+* Do a better job of supporting composite keys with an auto incrementing field for
+  MySQL and MariaDB (Charlie Savage)
+
 == 12.0.6 (2021-01-04)
 * Fix issue when calling in_batches without a block (Charlie Savage)
 

data/lib/composite_primary_keys.rb

@@ -99,7 +99,6 @@ require_relative 'composite_primary_keys/nested_attributes'
 
 require_relative 'composite_primary_keys/connection_adapters/abstract/database_statements'
 require_relative 'composite_primary_keys/connection_adapters/abstract_adapter'
-require_relative 'composite_primary_keys/connection_adapters/mysql/database_statements'
 require_relative 'composite_primary_keys/connection_adapters/postgresql/database_statements'
 require_relative 'composite_primary_keys/connection_adapters/sqlserver/database_statements'
 

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

@@ -5,16 +5,31 @@ module ActiveRecord
         sql, binds = to_sql_and_binds(arel, binds)
         value = exec_insert(sql, name, binds, pk, sequence_name)
 
+        return id_value if id_value
+
         if pk.is_a?(Array) && !value.empty?
           # This is a CPK model and the query result is not empty. Thus we can figure out the new ids for each
           # auto incremented field
-          id_value || pk.map {|key| value.first[key]}
+          pk.map {|key| value.first[key]}
         elsif pk.is_a?(Array)
-          # This is CPK, but we don't know what autoincremented fields were updated. So return nil, which means
-          # the existing id_value of the model will be used.
-          id_value || Array.new(pk.size)
+          # This is CPK, but we don't know what autoincremented fields were updated.
+          result = Array.new(pk.size)
+
+          # Is there an autoincrementing field?
+          auto_key = pk.find do |key|
+            attribute = arel.ast.relation[key]
+            column = column_for_attribute(attribute)
+            if column.respond_to?(:auto_increment?)
+              column.auto_increment?
+            end
+          end
+
+          if auto_key
+            result[pk.index(auto_key)] = last_inserted_id(value)
+          end
+          result
         else
-          id_value || last_inserted_id(value)
+          last_inserted_id(value)
         end
       end
     end

data/lib/composite_primary_keys/version.rb

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

data/test/connections/databases.ci.yml

@@ -1,7 +1,9 @@
 mysql:
   adapter: mysql2
-  username: travis
-  password: ""
+  username: github
+  password: github
+  host: 127.0.0.1
+  port: 3306
   encoding: utf8mb4
   charset: utf8mb4
   collation: utf8mb4_bin
@@ -11,6 +13,7 @@ postgresql:
   adapter: postgresql
   database: composite_primary_keys_unittest
   username: postgres
+  password: postgres
   host: localhost
 
 sqlite:

data/test/test_create.rb

@@ -48,12 +48,21 @@ class TestCreate < ActiveSupport::TestCase
     end
   end
 
+  def test_create_with_array
+    date = Date.new(2027, 01, 27)
+    tariff = Tariff.create!(id: [10, date], amount: 27)
+    refute_nil(tariff)
+    assert_equal([10, date], tariff.id)
+    assert_equal(date, tariff.start_date)
+    assert_equal(27, tariff.amount)
+  end
+
   def test_create_with_partial_serial
     attributes = {:location_id => 100}
 
     # SQLite does not support an autoincrementing field in a composite key
     if Department.connection.class.name == "ActiveRecord::ConnectionAdapters::SQLite3Adapter"
-      attributes[:id] = 100
+      attributes[:id] = 200
     end
 
     department = Department.new(attributes)
@@ -177,4 +186,21 @@ class TestCreate < ActiveSupport::TestCase
     suburb = Suburb.find_or_create_by!(:name => 'New Suburb', :city_id => 3, :suburb_id => 1)
     refute_nil(suburb)
   end
+
+  def test_cache
+    Suburb.cache do
+      # Suburb does not exist
+      suburb = Suburb.find_by(:city_id => 10, :suburb_id => 10)
+      assert_nil(suburb)
+
+      # Create it
+      suburb = Suburb.create!(:name => 'New Suburb', :city_id => 10, :suburb_id => 10)
+
+      # Should be able to find it
+      suburb = Suburb.find_by(:city_id => 10)
+      refute_nil(suburb)
+      refute_nil(suburb.city_id)
+      refute_nil(suburb.suburb_id)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 12.0.6
+  version: 12.0.9
 platform: ruby
 authors:
 - Charlie Savage
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Composite key support for ActiveRecord
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -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
@@ -201,7 +200,7 @@ homepage: https://github.com/composite-primary-keys/composite_primary_keys
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,16 +215,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.8
+signing_key:
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
-- test/abstract_unit.rb
 - test/README_tests.rdoc
+- test/abstract_unit.rb
 - test/test_associations.rb
-- test/test_attributes.rb
 - test/test_attribute_methods.rb
+- test/test_attributes.rb
 - test/test_calculations.rb
 - test/test_callbacks.rb
 - test/test_composite_arrays.rb

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