composite_primary_keys 12.0.8 → 12.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8349636fa2a670d60ef8f8cf288d31f805aafebb8c3f0d121c23aafb4f34dc08
-  data.tar.gz: 7932c338e6e3fad7831715dff3b879a9364356e19b93eeba8e5db55e74f6ad25
+  metadata.gz: 2465cca0fa83a628e24f3221e88095690295c99b2bf46818bd2ebd76df8300b5
+  data.tar.gz: a22c2b61575c26e23e51b314c05c158663c26ce7a9c64fb56019d596edc6a844
 SHA512:
-  metadata.gz: 9659459ef7f9d4a0331e778904d7c3fe869c18c638a9b852bd1961cd8892699e6ef6e7cbea3127510926277cc6ad21a1ecd5d0e722f229b883361be02dc7aff9
-  data.tar.gz: 7dd7ce6eac76e6728f00337f325d55014b04e209458d826e439454a53eee9668f4e5cb165a2dfa07d4c9821d75f88666b156a66a875c78e87ce97dec35f7d262
+  metadata.gz: 3147006b49f98c3d1e88dbec56590fad63c13506634427361e14e06d611e75666c89c48c3e9151d174dc075d850a238285be6bc62739d8971d7bf190bc6e9db9
+  data.tar.gz: 34d811c5ab6afb7d5b4b9dc871b2df660f42abaf146ffc7faa60c9d4d2edfb8c1a8fa6e49b40488a6090a7bb64218fafb6b0e965744b4daa0d11c0fc34605abf

data/History.rdoc

@@ -1,3 +1,6 @@
+== 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
 

data/lib/composite_primary_keys.rb

@@ -62,7 +62,6 @@ 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/postgresql/database_statements'
-require 'active_record/connection_adapters/mysql/database_statements'
 
 require 'active_record/relation/where_clause'
 
@@ -100,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  = 8
+    TINY  = 9
     STRING = [MAJOR, MINOR, TINY].join('.')
   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: 12.0.9
 platform: ruby
 authors:
 - Charlie Savage
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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

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