lhm-shopify 4.2.0 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a16e83f2a989c0624948b4ef8bfe2c3b7359aa1420ee5d2c41dee1b9ec6e29
-  data.tar.gz: 9baa1e49780b70edd51caec39460a3ad440f2d7f10f65aa8295da541a762cd42
+  metadata.gz: 0c6d17339f7cb0ec6d9dfa2620e24e5912a4af9302e376297e212be626bd2b15
+  data.tar.gz: a50feeaf0d1fa60c07c0410b1e01024a82ec1b5b243bf25013ea57c5c7a84c07
 SHA512:
-  metadata.gz: 0d96f3ba67d232682ecb5fa27f9f7cb33f850125546364a41ede17c6dda187e00d8b91e6ab8a5189022e9fd3117af4e9bb6272c1392d0d8510252cea6ae9ac00
-  data.tar.gz: 407a0497d1ce019d3f7e835ceb157441a1cd76f5723a7a7d3a61d95c2232adb42ac56b6aba9b07d5720eeeab0e6ce6a68d50d297dbd9736fd4e641835d372a86
+  metadata.gz: dcd984207e3b4a341ddf72b3be5674d175330a72b292e754a1e7d646924dd191a454c5dbe3c38ed1e2772f08347f3da2e467e16adb9bb107d4fd9f38b3d6d63d
+  data.tar.gz: 1e8e0771a774b017c2d8dd64092d7eaaf5fbaba98cbc5772e478be2871d882f55769607abe92b63bd10d62e717e3cb07d90e8e0bb685801994debd48ab618ebb

data/.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+registries:
+  ruby-shopify:
+    type: rubygems-server
+    url: https://pkgs.shopify.io/basic/gems/ruby
+    username: ${{secrets.RUBYGEMS_SERVER_PKGS_SHOPIFY_IO_USERNAME}}
+    password: ${{secrets.RUBYGEMS_SERVER_PKGS_SHOPIFY_IO_PASSWORD}}
+  github-com:
+    type: git
+    url: https://github.com
+    username: ${{secrets.DEPENDENCIES_GITHUB_USER}}
+    password: ${{secrets.DEPENDENCIES_GITHUB_TOKEN}}
+updates:
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 100
+    insecure-external-code-execution: allow
+    registries: "*"

data/.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         activerecord: ["6.1", "7.0", "7.1"]
-        ruby: ["3.0", "3.1", "3.2", "head"]
+        ruby: ["3.0", "3.1", "3.2", "3.3", "head"]
         mysql: ["5.7", "8.0"]
         adapter: ["mysql2", "trilogy"]
         exclude:

data/.gitignore

@@ -2,7 +2,6 @@
 .bundle
 pkg/*
 .rvmrc
-.ruby-version
 .ruby-gemset
 bin/rake
 gemfiles/vendor

data/.ruby-version

@@ -0,0 +1 @@
+3.2.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Unreleased
 
+# 4.2.2 (Jun, 2024)
+* Avoid using the INSTANT algorithm.
+
+# 4.2.1 (Mar, 2024)
+* Retry more errors when using Trilogy.
+
 # 4.2.0 (Mar, 2024)
 * Support `DROP DEFAULT` & `SET DEFAULT` in `change_column` operations.
 

data/Gemfile.lock

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

data/dev.yml

@@ -5,7 +5,7 @@ up:
           or: [mysql@5.7]
           conflicts: [shopify/shopify/mysql-client, mysql-connector-c, mysql, mysql-client]
       - wget
-  - ruby: 3.2.2
+  - ruby
   - bundler
   - podman
   - custom:

data/gemfiles/activerecord_6.1.gemfile.lock

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

data/gemfiles/activerecord_7.0.gemfile.lock

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

data/gemfiles/activerecord_7.1.gemfile.lock

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

data/lib/lhm/migrator.rb

@@ -53,7 +53,7 @@ module Lhm
     # @param [String] name Name of the column to add
     # @param [String] definition Valid SQL column definition
     def add_column(name, definition)
-      ddl('alter table `%s` add column `%s` %s' % [@name, name, definition])
+      ddl('alter table `%s` add column `%s` %s, ALGORITHM=INPLACE' % [@name, name, definition])
     end
 
     # Change an existing column to a new definition
@@ -94,7 +94,7 @@ module Lhm
       definition += " COMMENT #{@connection.quote(col[:comment])}" if col[:comment]
       definition += " COLLATE #{@connection.quote(col[:collate])}" if col[:collate]
 
-      ddl('alter table `%s` change column `%s` `%s` %s' % [@name, old, nu, definition])
+      ddl('alter table `%s` change column `%s` `%s` %s, ALGORITHM=INPLACE' % [@name, old, nu, definition])
       @renames[old.to_s] = nu.to_s
     end
 
@@ -108,7 +108,7 @@ module Lhm
     #
     # @param [String] name Name of the column to delete
     def remove_column(name)
-      ddl('alter table `%s` drop `%s`' % [@name, name])
+      ddl('alter table `%s` drop `%s`, ALGORITHM=INPLACE' % [@name, name])
     end
 
     # Add an index to a table

data/lib/lhm/sql_retry.rb

@@ -186,13 +186,26 @@ module Lhm
     def retriable_trilogy_errors
       return unless defined?(Trilogy::BaseError)
 
-      {
+      errors = {
         ActiveRecord::StatementInvalid => [
-          # Those sometimes appear as Trilogy::TimeoutError, and sometimes as ActiveRecord::StatementInvalid
           /Lock wait timeout exceeded/,
+          /Timeout waiting for a response from the last query/,
+          /Deadlock found when trying to get lock/,
+          /Query execution was interrupted/,
+          /Lost connection to MySQL server during query/,
+          /Max connect timeout reached/,
+          /Unknown MySQL server host/,
+          /connection is locked to hostgroup/,
+          /The MySQL server is running with the --read-only option so it cannot execute this statement/,
         ],
         Trilogy::ConnectionError => nil,
       }
+
+      if ActiveRecord::VERSION::STRING >= "7.1"
+        errors[ActiveRecord::ConnectionFailed] = nil
+      end
+
+      errors
     end
   end
 end

data/lib/lhm/version.rb

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

data/spec/integration/cleanup_spec.rb

@@ -2,6 +2,7 @@
 # Schmidt
 
 require File.expand_path(File.dirname(__FILE__)) + '/integration_helper'
+require 'ostruct'
 
 describe Lhm, 'cleanup' do
   include IntegrationHelper

data/spec/unit/migrator_spec.rb

@@ -97,7 +97,7 @@ describe Lhm::Migrator do
       @creator.add_column('logins', 'INT(12)')
 
       value(@creator.statements).must_equal([
-        'alter table `lhmn_alt` add column `logins` INT(12)'
+        'alter table `lhmn_alt` add column `logins` INT(12), ALGORITHM=INPLACE'
       ])
     end
 
@@ -105,7 +105,7 @@ describe Lhm::Migrator do
       @creator.remove_column('logins')
 
       value(@creator.statements).must_equal([
-        'alter table `lhmn_alt` drop `logins`'
+        'alter table `lhmn_alt` drop `logins`, ALGORITHM=INPLACE'
       ])
     end
 
@@ -151,10 +151,10 @@ describe Lhm::Migrator do
       value(@creator.statements.length).must_equal(2)
 
       value(@creator.statements[0])
-        .must_equal('alter table `lhmn_alt` add column `first` VARCHAR(64)')
+        .must_equal('alter table `lhmn_alt` add column `first` VARCHAR(64), ALGORITHM=INPLACE')
 
       value(@creator.statements[1])
-        .must_equal('alter table `lhmn_alt` add column `last` VARCHAR(64)')
+        .must_equal('alter table `lhmn_alt` add column `last` VARCHAR(64), ALGORITHM=INPLACE')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm-shopify
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.2
 platform: ruby
 authors:
 - SoundCloud
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
@@ -190,9 +190,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -320,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: online schema changer for mysql