deimos-ruby 1.14.1 → 1.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d94fcbeb955de22fde06b29f63809cae7305d91f029ba8ec0b36e4dbbe037a2
-  data.tar.gz: 611e5cc68a5d9e661ff692f05692d7ba24e4804f5761479802a632cbdd2a0fd7
+  metadata.gz: 81c75c30750ad501a4d954681e7ea0c5ddef83c54e313a284d6abb0fde4c059a
+  data.tar.gz: 223a1cf8f77db5d0cb901a00c1a4a1eeb7eb2c9a243e8fa07a5deb32bcac849e
 SHA512:
-  metadata.gz: 5100b19ede901f0b7a4e20f0aa6c15d487e9355d95ea46d984c8fcb587039be4be9529991197148e630ad3670c65d79ab0653ff57c28e224236a4d966bebe7e1
-  data.tar.gz: '082ad2e7be4d85fa3e8e242cdc7f192a35f99424675f5bddc3e11a3c19477ce5abf0df629117ca4f714ca107ea5be0a93a8aa5041a1f67cc628517f451005bb1'
+  metadata.gz: 95605e56b2852137a1645fa3497903d138045cdcf51902c4cad29321e78d0626f2ceb439789db46b69cb08f305f580efa804c768c9a781c0f96e677e4cf2f340
+  data.tar.gz: 4375d5c1bdde5b53598a1a11910615fda36d69e1dd92650becf710dd312425f07521fa70e0bebe4567e1d9931b5f70e71654f3dc0c74685141cb945193019672

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 1.14.4 - 2022-06-18
+
+- Fix import in ActiveRecordConsumer on mysql
+
+# 1.14.3 - 2022-06-17
+
+- Fix issue with ActiveRecordConsumer double-decoding keys in batch mode.
+
+# 1.14.2 - 2022-05-26
+
+- Fix crash with `test_consume_message` when passing in an instance of a schema class instead of a hash.
+
 # 1.14.1 - 2022-05-25
 
 - Fix: When using key schemas, ActiveRecordConsumers were not finding the record by default.

data/lib/deimos/active_record_consume/batch_consumption.rb

@@ -44,14 +44,12 @@ module Deimos
       # @param key [String] The encoded key.
       # @return [Hash] The key attributes.
       def record_key(key)
-        decoded_key = decode_key(key)
-
-        if decoded_key.nil?
+        if key.nil?
           {}
-        elsif decoded_key.is_a?(Hash)
-          @key_converter.convert(decoded_key)
+        elsif key.is_a?(Hash)
+          @key_converter.convert(key)
         else
-          { @klass.primary_key => decoded_key }
+          { @klass.primary_key => key }
         end
       end
 
@@ -102,12 +100,13 @@ module Deimos
 
         options = if key_cols.empty?
                     {} # Can't upsert with no key, just do regular insert
+                  elsif ActiveRecord::Base.connection.adapter_name.downcase =~ /mysql/
+                    {
+                      on_duplicate_key_update: :all
+                    }
                   else
                     {
                       on_duplicate_key_update: {
-                        # conflict_target must explicitly list the columns for
-                        # Postgres and SQLite. Not required for MySQL, but this
-                        # ensures consistent behaviour.
                         conflict_target: key_cols,
                         columns: :all
                       }

data/lib/deimos/utils/schema_class.rb

@@ -6,10 +6,12 @@ module Deimos
     module SchemaClass
       class << self
         # Converts a raw payload into an instance of the Schema Class
-        # @param payload [Hash]
+        # @param payload [Hash, Deimos::SchemaClass::Base]
         # @param schema [String]
         # @return [Deimos::SchemaClass::Record]
         def instance(payload, schema)
+          return payload if payload.is_a?(Deimos::SchemaClass::Base)
+
           klass = "Schemas::#{schema.underscore.camelize}".safe_constantize
           return payload if klass.nil? || payload.nil?
 

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.14.1'
+  VERSION = '1.14.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.4
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf