lhm-shopify 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850cda6d2f610db2985c780d2a90d176e8520b373e21dafbe67df47e9a07ba0f
-  data.tar.gz: 982ab91c6319f5f7803d73d9f3734a57d28a13e76184500a665a5ab5b91d434f
+  metadata.gz: 49f23bf2b018fc5af679644fb6c9f424f943a0d4dd58d7e2d8366b389ae4270b
+  data.tar.gz: 14e15f4fc464d721b20889a1841c4a78a609bb3c6aee1a68ee5f3f5e3e89d2ec
 SHA512:
-  metadata.gz: 8bdb254a7cd2091f7d1d125080bc843b43fc9039a7b2a99cba62752bee84726971e8018fb77738fdd0b15867a7f959ff419802270de75c08c2a72cd44d8b004b
-  data.tar.gz: b7d3a989384483ba9f43dd000f1e46c62805e15a0e15c4fcba0fedc964787d4fb1eafe294a2b23deae2d5b035057739551385eca08d24529d8c8e951ba44b163
+  metadata.gz: 86a7153f5278bdf8d26ebd0ca668dab3e4861ad5349e1115796a59b72ac7c8b0eb920cbe74f443e9913efd5b8c2861499c98ba37990d970177e273188656d02a
+  data.tar.gz: f394a26a3dcf8e5737748610db039b28e9cde415a5a82f3b2f29f358f93124155ee6be68c8196bf027b807aedf19feb6f7a60d89097384242f31e65c96907fc7

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Unreleased
 
+# 4.1.1 (Nov, 2023)
+* Fix check for warnings against PK in MySQL 8+
+
 # 4.1.0 (Oct, 2023)
 * Test against MySQL 8.0.
 * Test against Ruby Head.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lhm-shopify (4.1.0)
+    lhm-shopify (4.1.1)
       retriable (>= 3.0.0)
 
 GEM

data/gemfiles/activerecord_6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    lhm-shopify (4.1.0)
+    lhm-shopify (4.1.1)
       retriable (>= 3.0.0)
 
 GEM

data/gemfiles/activerecord_7.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    lhm-shopify (4.1.0)
+    lhm-shopify (4.1.1)
       retriable (>= 3.0.0)
 
 GEM

data/gemfiles/activerecord_7.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    lhm-shopify (4.1.0)
+    lhm-shopify (4.1.1)
       retriable (>= 3.0.0)
 
 GEM

data/lib/lhm/chunker.rb

@@ -23,6 +23,7 @@ module Lhm
       @chunk_finder = ChunkFinder.new(migration, connection, options)
       @options = options
       @raise_on_warnings = options.fetch(:raise_on_warnings, false)
+      @pk_duplicate_warning_regexp ||= /Duplicate entry .+ for key '(#{@migration.destination_name}\.)?PRIMARY'/
       @verifier = options[:verifier]
       if @throttler = options[:throttler]
         @throttler.connection = @connection if @throttler.respond_to?(:connection=)
@@ -80,11 +81,11 @@ module Lhm
 
     def raise_on_non_pk_duplicate_warning
       @connection.select_all("SHOW WARNINGS", should_retry: true, log_prefix: LOG_PREFIX).each do |row|
-        unless row["Message"].match?(/Duplicate entry .+ for key 'PRIMARY'/)
-          m = "Unexpected warning found for inserted row: #{row["Message"]}"
-          Lhm.logger.warn(m)
-          raise Error.new(m) if @raise_on_warnings
-        end
+        next if row["Message"].match?(@pk_duplicate_warning_regexp)
+
+        m = "Unexpected warning found for inserted row: #{row["Message"]}"
+        Lhm.logger.warn(m)
+        raise Error.new(m) if @raise_on_warnings
       end
     end
 

data/lib/lhm/version.rb

@@ -2,5 +2,5 @@
 # Schmidt
 
 module Lhm
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/spec/integration/chunker_spec.rb

@@ -31,7 +31,6 @@ describe Lhm::Chunker do
       replica do
         value(count_all(@destination.name)).must_equal(1)
       end
-
     end
 
     it 'should copy and ignore duplicate primary key' do
@@ -39,7 +38,7 @@ describe Lhm::Chunker do
       execute("insert into origin set id = 1002 ")
       execute("insert into destination set id = 1002 ")
 
-      Lhm::Chunker.new(@migration, connection, {throttler: throttler, printer: printer} ).run
+      Lhm::Chunker.new(@migration, connection, {raise_on_warnings: true, throttler: throttler, printer: printer} ).run
 
       replica do
         value(count_all(@destination.name)).must_equal(2)
@@ -55,7 +54,7 @@ describe Lhm::Chunker do
       execute("insert into composite_primary_key set id = 1002, shop_id = 1")
       execute("insert into composite_primary_key_dest set id = 1002, shop_id = 1")
 
-      Lhm::Chunker.new(migration, connection, {throttler: throttler, printer: printer} ).run
+      Lhm::Chunker.new(migration, connection, {raise_on_warning: true, throttler: throttler, printer: printer} ).run
 
       replica do
         value(count_all(destination.name)).must_equal(2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm-shopify
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - SoundCloud
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: online schema changer for mysql