lhm-shopify 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c6d17339f7cb0ec6d9dfa2620e24e5912a4af9302e376297e212be626bd2b15
-  data.tar.gz: a50feeaf0d1fa60c07c0410b1e01024a82ec1b5b243bf25013ea57c5c7a84c07
+  metadata.gz: 8e88f970c0a74075057e83cd9dddaff855c4b1260279604badc45af7d4f096f0
+  data.tar.gz: 722aefe84a0e97d6702b4b2706df2ad9c9084dec24be0e3e790fa4f4f535ea73
 SHA512:
-  metadata.gz: dcd984207e3b4a341ddf72b3be5674d175330a72b292e754a1e7d646924dd191a454c5dbe3c38ed1e2772f08347f3da2e467e16adb9bb107d4fd9f38b3d6d63d
-  data.tar.gz: 1e8e0771a774b017c2d8dd64092d7eaaf5fbaba98cbc5772e478be2871d882f55769607abe92b63bd10d62e717e3cb07d90e8e0bb685801994debd48ab618ebb
+  metadata.gz: f423dbc69088a1e314e0b460a051f5a3438754382a5f26008e2ed1e754da771467a532c9f269cbfd2e1e0aa347e600b3dbabc436f8cc94c32d0d99819cb0f832
+  data.tar.gz: 047c7221c4eb28d5bc01a16287b5e813e46dbc6b7effae12ff6778660e8e295adb53490d9825c8ca714df6e00b3abef50cff522a2f29a0ae9c6834797e9c93e5

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Unreleased
 
+# 4.2.3 (Jul, 2024)
+* Fix check for warnings against PKs with line breaks
+
 # 4.2.2 (Jun, 2024)
 * Avoid using the INSTANT algorithm.
 

data/Gemfile.lock

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

data/gemfiles/activerecord_6.1.gemfile.lock

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

data/gemfiles/activerecord_7.0.gemfile.lock

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

data/gemfiles/activerecord_7.1.gemfile.lock

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

data/lib/lhm/chunker.rb

@@ -23,7 +23,6 @@ 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=)
@@ -81,7 +80,7 @@ module Lhm
 
     def raise_on_non_pk_duplicate_warning
       @connection.select_all("SHOW WARNINGS", should_retry: true, log_prefix: LOG_PREFIX).each do |row|
-        next if row["Message"].match?(@pk_duplicate_warning_regexp)
+        next if row["Message"].start_with?("Duplicate entry") && row["Message"].match?(/for key '(#{@migration.destination_name}\.)?PRIMARY'\z/)
 
         m = "Unexpected warning found for inserted row: #{row["Message"]}"
         Lhm.logger.warn(m)

data/lib/lhm/version.rb

@@ -2,5 +2,5 @@
 # Schmidt
 
 module Lhm
-  VERSION = '4.2.2'
+  VERSION = '4.2.3'
 end

data/spec/fixtures/composite_primary_key_with_varchar_columns.ddl

@@ -0,0 +1,10 @@
+CREATE TABLE `composite_primary_key_with_varchar_columns` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `shop_id` bigint NOT NULL,
+  `owner_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+  `owner_id` bigint NOT NULL,
+  `namespace` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+  `key` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+  PRIMARY KEY (`shop_id`,`owner_type`,`owner_id`,`namespace`,`key`),
+  UNIQUE KEY `id` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC

data/spec/fixtures/composite_primary_key_with_varchar_columns_dest.ddl

@@ -0,0 +1,10 @@
+CREATE TABLE `composite_primary_key_with_varchar_columns_dest` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `shop_id` bigint NOT NULL,
+  `owner_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+  `owner_id` bigint NOT NULL,
+  `namespace` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+  `key` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+  PRIMARY KEY (`shop_id`,`owner_type`,`owner_id`,`namespace`,`key`),
+  UNIQUE KEY `id` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC

data/spec/integration/chunker_spec.rb

@@ -61,6 +61,46 @@ describe Lhm::Chunker do
       end
     end
 
+    it 'should copy and ignore duplicate composite primary key with line breaks' do
+      origin = table_create(:composite_primary_key_with_varchar_columns)
+      destination = table_create(:composite_primary_key_with_varchar_columns_dest)
+      migration = Lhm::Migration.new(origin, destination)
+
+      execute("insert into composite_primary_key_with_varchar_columns set id = 1001, shop_id = 1, owner_type = 'Product', owner_id = 1, namespace = '
+  23
+
+  23
+', `key` = '
+  14
+
+  1
+'")
+      execute("insert into composite_primary_key_with_varchar_columns set id = 1002, shop_id = 1, owner_type = 'Product', owner_id = 1, namespace = '
+  23
+
+  22
+', `key` = '
+  14
+
+  1
+'")
+      execute("insert into composite_primary_key_with_varchar_columns_dest set id = 1002, shop_id = 1, owner_type = 'Product', owner_id = 1, namespace = '
+  23
+
+  22
+', `key` = '
+  14
+
+  1
+'")
+
+      Lhm::Chunker.new(migration, connection, {raise_on_warning: true, throttler: throttler, printer: printer} ).run
+
+      replica do
+        value(count_all(destination.name)).must_equal(2)
+      end
+    end
+
     it 'should copy and raise on unexpected warnings' do
       origin = table_create(:custom_primary_key)
       destination = table_create(:custom_primary_key_dest)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm-shopify
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - SoundCloud
@@ -9,10 +9,10 @@ authors:
 - Rany Keddo
 - Tobias Bielohlawek
 - Tobias Schmidt
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
@@ -254,6 +254,8 @@ files:
 - spec/fixtures/bigint_table.ddl
 - spec/fixtures/composite_primary_key.ddl
 - spec/fixtures/composite_primary_key_dest.ddl
+- spec/fixtures/composite_primary_key_with_varchar_columns.ddl
+- spec/fixtures/composite_primary_key_with_varchar_columns_dest.ddl
 - spec/fixtures/custom_primary_key.ddl
 - spec/fixtures/custom_primary_key_dest.ddl
 - spec/fixtures/destination.ddl
@@ -307,7 +309,7 @@ licenses:
 - BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -322,8 +324,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: online schema changer for mysql
 test_files: []