lhm-shopify 4.1.1 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f23bf2b018fc5af679644fb6c9f424f943a0d4dd58d7e2d8366b389ae4270b
-  data.tar.gz: 14e15f4fc464d721b20889a1841c4a78a609bb3c6aee1a68ee5f3f5e3e89d2ec
+  metadata.gz: dec22d00a0a019706b1a6d62e85e416caf210aa2d0b4f77bb3ccf562f1db8fb2
+  data.tar.gz: 181acf59e61b100dc3320b6674a7cd13a2a1dcf767c7259a88a58dbf4b826bf5
 SHA512:
-  metadata.gz: 86a7153f5278bdf8d26ebd0ca668dab3e4861ad5349e1115796a59b72ac7c8b0eb920cbe74f443e9913efd5b8c2861499c98ba37990d970177e273188656d02a
-  data.tar.gz: f394a26a3dcf8e5737748610db039b28e9cde415a5a82f3b2f29f358f93124155ee6be68c8196bf027b807aedf19feb6f7a60d89097384242f31e65c96907fc7
+  metadata.gz: 8c197de7b7658cdb9c31dd91adde7fdaf54505bc7e910812d8c80edf447f6266630c08a80d773391071c518f72b9527280e1ece7e2bdc00bc60d5a8c22f294ed
+  data.tar.gz: 6f1f7da4e1bd2e61fb8921eb9e724408d01ee576d98eb8ba393c2c2dada846368ec2a187e5c61d77f3691290edc815addd0e93acb8e1fa065c206564243ef798

data/.github/workflows/test.yml

@@ -18,6 +18,11 @@ jobs:
         ruby: ["3.0", "3.1", "3.2", "head"]
         mysql: ["5.7", "8.0"]
         adapter: ["mysql2", "trilogy"]
+        exclude:
+          - activerecord: 6.1
+            ruby: head
+          - activerecord: 7.0
+            ruby: head
 
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord_${{ matrix.activerecord }}.gemfile"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Unreleased
 
+# 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.
+
 # 4.1.1 (Nov, 2023)
 * Fix check for warnings against PK in MySQL 8+
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lhm-shopify (4.1.1)
+    lhm-shopify (4.2.1)
       retriable (>= 3.0.0)
 
 GEM
@@ -38,7 +38,7 @@ GEM
       ruby2_keywords
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.20.0)
+    minitest (5.22.2)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mutex_m (0.1.2)

data/gemfiles/activerecord_6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    lhm-shopify (4.1.1)
+    lhm-shopify (4.2.1)
       retriable (>= 3.0.0)
 
 GEM
@@ -31,7 +31,7 @@ GEM
     docile (1.4.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.20.0)
+    minitest (5.22.2)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.5)

data/gemfiles/activerecord_7.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    lhm-shopify (4.1.1)
+    lhm-shopify (4.2.1)
       retriable (>= 3.0.0)
 
 GEM
@@ -30,7 +30,7 @@ GEM
     docile (1.4.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.20.0)
+    minitest (5.22.2)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mysql2 (0.5.5)

data/gemfiles/activerecord_7.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    lhm-shopify (4.1.1)
+    lhm-shopify (4.2.1)
       retriable (>= 3.0.0)
 
 GEM
@@ -38,7 +38,7 @@ GEM
       ruby2_keywords
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.20.0)
+    minitest (5.22.2)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mutex_m (0.1.2)

data/lib/lhm/migrator.rb

@@ -67,7 +67,11 @@ module Lhm
     # @param [String] name Name of the column to change
     # @param [String] definition Valid SQL column definition
     def change_column(name, definition)
-      ddl('alter table `%s` modify column `%s` %s' % [@name, name, definition])
+      if definition.match?(/^(DROP|SET) DEFAULT/i)
+        ddl('alter table `%s` alter column `%s` %s' % [@name, name, definition])
+      else
+        ddl('alter table `%s` modify column `%s` %s' % [@name, name, definition])
+      end
     end
 
     # Rename an existing column.

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.1.1'
+  VERSION = '4.2.1'
 end

data/spec/unit/migrator_spec.rb

@@ -116,6 +116,22 @@ describe Lhm::Migrator do
         'alter table `lhmn_alt` modify column `logins` INT(11)'
       ])
     end
+
+    it "should drop a default" do
+      @creator.change_column('foo', 'DROP DEFAULT')
+
+      value(@creator.statements).must_equal([
+        'alter table `lhmn_alt` alter column `foo` DROP DEFAULT'
+      ])
+    end
+
+    it "should set a default" do
+      @creator.change_column('foo', "SET DEFAULT 'bar'")
+
+      value(@creator.statements).must_equal([
+        "alter table `lhmn_alt` alter column `foo` SET DEFAULT 'bar'"
+      ])
+    end
   end
 
   describe 'direct changes' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm-shopify
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.1
 platform: ruby
 authors:
 - SoundCloud
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2024-03-11 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.21
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: online schema changer for mysql