composite_primary_keys 12.0.7 → 12.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9669e29673330db679efb20ca257d87ce1cdad3d6fe69681a54ac706a0cd5f82
-  data.tar.gz: db2ba7fcc0f91b8cd6c54c177dd5ca9d7cb7d04b47f1ec42e43691283a1f16d1
+  metadata.gz: 8349636fa2a670d60ef8f8cf288d31f805aafebb8c3f0d121c23aafb4f34dc08
+  data.tar.gz: 7932c338e6e3fad7831715dff3b879a9364356e19b93eeba8e5db55e74f6ad25
 SHA512:
-  metadata.gz: 6bfb9ac058f43b9e18499e7517029e41278272f91955058eaf87d3ecac4649906e84ee9e01a8b6466128cfe998bfe94eec6fbb7e9f0d1945a3e9a749a6990a93
-  data.tar.gz: 435cb41a8e3499508285444be01f8c585c747f98a0c6174353ac31f3ed147a8f165478dfce8bd975a10142d7357bdcee7121f9726ced186ceb2062e0bde36625
+  metadata.gz: 9659459ef7f9d4a0331e778904d7c3fe869c18c638a9b852bd1961cd8892699e6ef6e7cbea3127510926277cc6ad21a1ecd5d0e722f229b883361be02dc7aff9
+  data.tar.gz: 7dd7ce6eac76e6728f00337f325d55014b04e209458d826e439454a53eee9668f4e5cb165a2dfa07d4c9821d75f88666b156a66a875c78e87ce97dec35f7d262

data/History.rdoc

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

data/lib/composite_primary_keys.rb

@@ -100,7 +100,7 @@ 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/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,31 +5,16 @@ 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
-          pk.map {|key| value.first[key]}
+          id_value || pk.map {|key| value.first[key]}
         elsif pk.is_a?(Array)
-          # 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
+          # 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)
         else
-          last_inserted_id(value)
+          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  = 7
+    TINY  = 8
     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.7
+  version: 12.0.8
 platform: ruby
 authors:
 - Charlie Savage
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord