lhm-shopify 4.0.0 → 4.1.1

data/spec/integration/sql_retry/lock_wait_timeout_test_helper.rb

@@ -14,13 +14,21 @@ class LockWaitTimeoutTestHelper
 
     @lock_duration = lock_duration
 
-    # While implementing this, I discovered that MySQL seems to have an off-by-one
-    # bug with the innodb_lock_wait_timeout. If you ask it to wait 2 seconds, it will wait 3.
-    # In order to avoid surprisingly the user, let's account for that here, but also
-    # guard against a case where we go below 1, the minimum value.
-    raise ArgumentError, "innodb_lock_wait_timeout must be greater than or equal to 2" unless innodb_lock_wait_timeout >= 2
     raise ArgumentError, "innodb_lock_wait_timeout must be an integer" if innodb_lock_wait_timeout.class != Integer
-    @innodb_lock_wait_timeout = innodb_lock_wait_timeout - 1
+
+    result = DATABASE.query(@main_conn, "SELECT VERSION()")
+    mysql_version = result.to_a.dig(0, "VERSION()").split("-", 2)[0]
+
+    if mysql_version.start_with?("8")
+      @innodb_lock_wait_timeout = innodb_lock_wait_timeout
+    else
+      # While implementing this, I discovered that MySQL seems to have an off-by-one
+      # bug with the innodb_lock_wait_timeout. If you ask it to wait 2 seconds, it will wait 3.
+      # In order to avoid surprisingly the user, let's account for that here, but also
+      # guard against a case where we go below 1, the minimum value.
+      raise ArgumentError, "innodb_lock_wait_timeout must be greater than or equal to 2" unless innodb_lock_wait_timeout >= 2
+      @innodb_lock_wait_timeout = innodb_lock_wait_timeout - 1
+    end
 
     @threads = []
     @queue = Queue.new
@@ -51,7 +59,7 @@ class LockWaitTimeoutTestHelper
   end
 
   def record_count(connection = main_conn)
-    response = connection.query("SELECT COUNT(id) FROM #{test_table_name}")
+    response = mysql_exec(connection, "SELECT COUNT(id) FROM #{test_table_name}")
     response.first.values.first
   end
 
@@ -79,7 +87,7 @@ class LockWaitTimeoutTestHelper
   attr_reader :main_conn, :lock_duration, :innodb_lock_wait_timeout
 
   def new_mysql_connection
-    Mysql2::Client.new(
+    DATABASE.client.new(
       host: '127.0.0.1',
       username: db_config['master']['user'],
       password: db_config['master']['password'],
@@ -103,8 +111,8 @@ class LockWaitTimeoutTestHelper
   private
 
   def mysql_exec(connection, statement)
-    if connection.class == Mysql2::Client
-      connection.query(statement)
+    if connection.class == DATABASE.client
+      DATABASE.query(connection, statement)
     elsif connection.class.to_s.include?("ActiveRecord")
       connection.execute(statement)
     else

data/spec/integration/sql_retry/proxysql_helper.rb

@@ -2,7 +2,7 @@ class ProxySQLHelper
   class << self
     # Flips the destination hostgroup for /maintenance:lhm/ from 0 (i.e. writer) to 1 (i.e. reader)
     def with_lhm_hostgroup_flip
-      conn = Mysql2::Client.new(
+      conn = DATABASE.client.new(
         host: '127.0.0.1',
         username: "remote-admin",
         password: "password",

data/spec/integration/sql_retry/retry_with_proxysql_spec.rb

@@ -1,5 +1,4 @@
 require 'minitest/autorun'
-require 'mysql2'
 require 'lhm'
 require 'toxiproxy'
 
@@ -50,7 +49,7 @@ describe Lhm::SqlRetry, "ProxiSQL tests for LHM retry" do
       end
     end
 
-    assert_equal @connection.execute("Select * from #{DBConnectionHelper.test_table_name} WHERE id=2000").to_a.first.first, 2000
+    assert_equal 2000, @connection.select_one("SELECT * FROM #{DBConnectionHelper.test_table_name} WHERE id=2000")["id"]
 
     logs = @logger.string.split("\n")
 

data/spec/integration/table_spec.rb

@@ -23,7 +23,7 @@ describe Lhm::Table do
       end
 
       it 'should parse columns' do
-        value(@table.columns['id'][:type]).must_match(/(bigint|int)\(\d+\)/)
+        value(@table.columns['id'][:type]).must_match(/(bigint|int)(\(\d+\))?/)
       end
 
       it 'should return true for method that should be renamed' do

data/spec/test_helper.rb

@@ -14,6 +14,7 @@ require 'after_do'
 require 'byebug'
 require 'pathname'
 require 'lhm'
+require 'active_record'
 
 $project = Pathname.new(File.dirname(__FILE__) + '/..').cleanpath
 $spec = $project.join('spec')
@@ -21,8 +22,31 @@ $fixtures = $spec.join('fixtures')
 
 $db_name = 'test'
 
-require 'active_record'
-require 'mysql2'
+Database = Struct.new(:adapter, :client, :error_class, :timeout_error) do
+  def query(connection, sql)
+    results = connection.query(sql)
+    results = results.each_hash if adapter == "trilogy"
+    results
+  end
+end
+
+DATABASE =
+  case ENV['DATABASE_ADAPTER']
+  when 'trilogy'
+    require 'trilogy'
+
+    if ActiveRecord.version < ::Gem::Version.new('7.1.0')
+      require 'activerecord-trilogy-adapter'
+      require 'trilogy_adapter/connection'
+
+      ActiveRecord::Base.public_send :extend, TrilogyAdapter::Connection
+    end
+
+    Database.new('trilogy', Trilogy, Trilogy::BaseError, Trilogy::TimeoutError)
+  else
+    require 'mysql2'
+    Database.new('mysql2', Mysql2::Client, Mysql2::Error, Mysql2::Error::TimeoutError)
+  end
 
 logger = Logger.new STDOUT
 logger.level = Logger::WARN
@@ -53,7 +77,7 @@ end
 
 def init_test_db
   db_config = YAML.load_file(File.expand_path(File.dirname(__FILE__)) + '/integration/database.yml')
-  conn = Mysql2::Client.new(
+  conn = DATABASE.client.new(
     :host => '127.0.0.1',
     :username => db_config['master']['user'],
     :password => db_config['master']['password'],

data/spec/unit/atomic_switcher_spec.rb

@@ -21,8 +21,8 @@ describe Lhm::AtomicSwitcher do
   describe 'atomic switch' do
     it 'should perform a single atomic rename' do
       value(@switcher.atomic_switch).must_equal(
-        "rename table `origin` to `#{ @migration.archive_name }`, " \
-        '`destination` to `origin`'
+        "RENAME TABLE `origin` TO `#{ @migration.archive_name }`, " \
+        '`destination` TO `origin`'
       )
     end
   end

data/spec/unit/chunker_spec.rb

@@ -20,7 +20,7 @@ describe Lhm::Chunker do
     @destination = Lhm::Table.new('bar')
     @migration = Lhm::Migration.new(@origin, @destination)
     @connection = mock()
-    @connection.stubs(:execute).returns([["dummy"]])
+    @connection.stubs(:select_value).returns("dummy")
     # This is a poor man's stub
     @throttler = Object.new
     def @throttler.run
@@ -42,11 +42,11 @@ describe Lhm::Chunker do
         5
       end
 
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 4/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(7)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 8 order by id limit 1 offset 4/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(21)
-      @connection.expects(:update).with(regexp_matches(/between 1 and 7/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 8 and 10/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:execute).twice.with(regexp_matches(/show warnings/),EXPECTED_RETRY_FLAGS_CHUNKER).returns([])
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 4/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(7)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 8 order by id limit 1 offset 4/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(21)
+      @connection.expects(:update).with(regexp_matches(/between 1 and 7/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 8 and 10/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:select_all).twice.with(regexp_matches(/show warnings/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns([])
 
       @chunker.run
     end
@@ -57,17 +57,17 @@ describe Lhm::Chunker do
         2
       end
 
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(2)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 3 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(4)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 5 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(6)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 7 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(8)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 9 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(10)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(2)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 3 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(4)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 5 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(6)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 7 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(8)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 9 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(10)
 
-      @connection.expects(:update).with(regexp_matches(/between 1 and 2/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 3 and 4/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 5 and 6/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 7 and 8/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 9 and 10/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 1 and 2/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 3 and 4/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 5 and 6/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 7 and 8/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 9 and 10/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
 
       @chunker.run
     end
@@ -84,17 +84,17 @@ describe Lhm::Chunker do
         end
       end
 
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(2)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 3 order by id limit 1 offset 2/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(5)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 6 order by id limit 1 offset 2/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(8)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 9 order by id limit 1 offset 2/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(nil)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(2)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 3 order by id limit 1 offset 2/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(5)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 6 order by id limit 1 offset 2/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(8)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 9 order by id limit 1 offset 2/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(nil)
 
-      @connection.expects(:update).with(regexp_matches(/between 1 and 2/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 3 and 5/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 6 and 8/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 9 and 10/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 1 and 2/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 3 and 5/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 6 and 8/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 9 and 10/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
 
-      @connection.expects(:execute).twice.with(regexp_matches(/show warnings/),EXPECTED_RETRY_FLAGS_CHUNKER).returns([])
+      @connection.expects(:select_all).twice.with(regexp_matches(/show warnings/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns([])
 
       @chunker.run
     end
@@ -104,8 +104,8 @@ describe Lhm::Chunker do
                                                            :start     => 1,
                                                            :limit     => 1)
 
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 0/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(nil)
-      @connection.expects(:update).with(regexp_matches(/between 1 and 1/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(1)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 0/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(nil)
+      @connection.expects(:update).with(regexp_matches(/between 1 and 1/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(1)
 
       @chunker.run
     end
@@ -118,17 +118,17 @@ describe Lhm::Chunker do
         2
       end
 
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 2 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(3)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 4 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(5)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 6 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(7)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 8 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(9)
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 10 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(nil)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 2 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(3)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 4 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(5)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 6 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(7)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 8 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(9)
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 10 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(nil)
 
-      @connection.expects(:update).with(regexp_matches(/between 2 and 3/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 4 and 5/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 6 and 7/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 8 and 9/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
-      @connection.expects(:update).with(regexp_matches(/between 10 and 10/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(1)
+      @connection.expects(:update).with(regexp_matches(/between 2 and 3/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 4 and 5/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 6 and 7/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 8 and 9/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(2)
+      @connection.expects(:update).with(regexp_matches(/between 10 and 10/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(1)
 
       @chunker.run
     end
@@ -142,9 +142,9 @@ describe Lhm::Chunker do
         2
       end
 
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(2)
-      @connection.expects(:update).with(regexp_matches(/where \(foo.created_at > '2013-07-10' or foo.baz = 'quux'\) and `foo`/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(1)
-      @connection.expects(:execute).with(regexp_matches(/show warnings/),EXPECTED_RETRY_FLAGS_CHUNKER).returns([])
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(2)
+      @connection.expects(:update).with(regexp_matches(/where \(foo.created_at > '2013-07-10' or foo.baz = 'quux'\) and `foo`/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(1)
+      @connection.expects(:select_all).with(regexp_matches(/show warnings/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns([])
 
       def @migration.conditions
         "where foo.created_at > '2013-07-10' or foo.baz = 'quux'"
@@ -162,9 +162,9 @@ describe Lhm::Chunker do
         2
       end
 
-      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/),EXPECTED_RETRY_FLAGS_CHUNKER).returns(2)
-      @connection.expects(:update).with(regexp_matches(/inner join bar on foo.id = bar.foo_id and/),EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(1)
-      @connection.expects(:execute).with(regexp_matches(/show warnings/),EXPECTED_RETRY_FLAGS_CHUNKER).returns([])
+      @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns(2)
+      @connection.expects(:update).with(regexp_matches(/inner join bar on foo.id = bar.foo_id and/i), EXPECTED_RETRY_FLAGS_CHUNK_INSERT).returns(1)
+      @connection.expects(:select_all).with(regexp_matches(/show warnings/i), EXPECTED_RETRY_FLAGS_CHUNKER).returns([])
 
       def @migration.conditions
         'inner join bar on foo.id = bar.foo_id'

data/spec/unit/connection_spec.rb

@@ -93,7 +93,7 @@ describe Lhm::Connection do
   it "Queries should be tagged with ProxySQL tag if reconnect_with_consistent_host is enabled" do
     ar_connection = mock()
     ar_connection.expects(:public_send).with(:select_value, "SHOW TABLES #{Lhm::ProxySQLHelper::ANNOTATION}").returns("dummy")
-    ar_connection.stubs(:execute).times(4).returns([["dummy"]])
+    ar_connection.stubs(:select_value).times(4).returns("dummy")
     ar_connection.stubs(:active?).returns(true)
 
     connection = Lhm::Connection.new(connection: ar_connection, options: {
@@ -108,4 +108,4 @@ describe Lhm::Connection do
 
     assert_equal val, "dummy"
   end
-end
+end

data/spec/unit/entangler_spec.rb

@@ -63,10 +63,9 @@ describe Lhm::Entangler do
     it 'should retry trigger creation when it hits a lock wait timeout' do
       tries = 1
       ar_connection = mock()
+      ar_connection.stubs(:select_value).returns("dummy")
       ar_connection.stubs(:execute)
-                       .returns([["dummy"]], [["dummy"]], [["dummy"]])
-                       .then
-                       .raises(Mysql2::Error, 'Lock wait timeout exceeded; try restarting transaction')
+                   .raises(ActiveRecord::StatementInvalid, 'Lock wait timeout exceeded; try restarting transaction')
       ar_connection.stubs(:active?).returns(true)
 
       connection = Lhm::Connection.new(connection: ar_connection, options: {
@@ -79,15 +78,14 @@ describe Lhm::Entangler do
 
       @entangler = Lhm::Entangler.new(@migration, connection)
 
-      assert_raises(Mysql2::Error) { @entangler.before }
+      assert_raises(ActiveRecord::StatementInvalid) { @entangler.before }
     end
 
     it 'should not retry trigger creation with other mysql errors' do
       ar_connection = mock()
+      ar_connection.stubs(:select_value).returns("dummy")
       ar_connection.stubs(:execute)
-                   .returns([["dummy"]], [["dummy"]], [["dummy"]])
-                   .then
-                   .raises(Mysql2::Error, 'The MySQL server is running with the --read-only option so it cannot execute this statement.')
+                   .raises(DATABASE.error_class, 'The MySQL server is running with the --read-only option so it cannot execute this statement.')
       ar_connection.stubs(:active?).returns(true)
       connection = Lhm::Connection.new(connection: ar_connection, options: {
         reconnect_with_consistent_host: true,
@@ -97,15 +95,14 @@ describe Lhm::Entangler do
       })
 
       @entangler = Lhm::Entangler.new(@migration, connection)
-      assert_raises(Mysql2::Error) { @entangler.before }
+      assert_raises(DATABASE.error_class) { @entangler.before }
     end
 
     it 'should succesfully finish after retrying' do
       ar_connection = mock()
+      ar_connection.stubs(:select_value).returns("dummy")
       ar_connection.stubs(:execute)
-                   .returns([["dummy"]], [["dummy"]], [["dummy"]])
-                   .then
-                   .raises(Mysql2::Error, 'Lock wait timeout exceeded; try restarting transaction')
+                   .raises(ActiveRecord::StatementInvalid, 'Lock wait timeout exceeded; try restarting transaction')
                    .then
                    .returns([["dummy"]])
       ar_connection.stubs(:active?).returns(true)
@@ -124,22 +121,15 @@ describe Lhm::Entangler do
 
     it 'should retry as many times as specified by configuration' do
       ar_connection = mock()
+      ar_connection.stubs(:select_value).returns("dummy")
       ar_connection.stubs(:execute)
-                   .returns([["dummy"]], [["dummy"]], [["dummy"]]) # initial
-                   .then
-                   .raises(Mysql2::Error, 'Lock wait timeout exceeded; try restarting transaction')
-                   .then
-                   .returns([["dummy"]]) # reconnect 1
-                   .then
-                   .raises(Mysql2::Error, 'Lock wait timeout exceeded; try restarting transaction')
-                   .then
-                   .returns([["dummy"]])  # reconnect 2
+                   .raises(DATABASE.error_class, 'Lock wait timeout exceeded; try restarting transaction')
                    .then
-                   .raises(Mysql2::Error, 'Lock wait timeout exceeded; try restarting transaction')
+                   .raises(DATABASE.error_class, 'Lock wait timeout exceeded; try restarting transaction')
                    .then
-                   .returns([["dummy"]])  # reconnect 3
+                   .raises(DATABASE.error_class, 'Lock wait timeout exceeded; try restarting transaction')
                    .then
-                   .raises(Mysql2::Error, 'Lock wait timeout exceeded; try restarting transaction')  # final error
+                   .raises(DATABASE.error_class, 'Lock wait timeout exceeded; try restarting transaction')  # final error
       ar_connection.stubs(:active?).returns(true)
 
       connection = Lhm::Connection.new(connection: ar_connection, options: {
@@ -152,7 +142,7 @@ describe Lhm::Entangler do
 
       @entangler = Lhm::Entangler.new(@migration, connection)
 
-      assert_raises(Mysql2::Error) { @entangler.before }
+      assert_raises(DATABASE.error_class) { @entangler.before }
     end
 
     describe 'super long table names' do

data/spec/unit/throttler/replica_lag_spec.rb

@@ -43,14 +43,6 @@ describe Lhm::Throttler::Replica do
   end
 
   describe "#client" do
-    before do
-      class TestMysql2Client
-        def initialize(config)
-          raise Mysql2::Error.new("connection error")
-        end
-      end
-    end
-
     describe 'on connection error' do
       it 'logs and returns nil' do
         assert_nil(Lhm::Throttler::Replica.new('replica', @dummy_mysql_client_config).connection)
@@ -58,14 +50,14 @@ describe Lhm::Throttler::Replica do
         log_messages = @logs.string.lines
         assert_equal(2, log_messages.length)
         assert log_messages[0].include? "Connecting to replica on database: db"
-        assert log_messages[1].include? "Error connecting to replica: Unknown MySQL server host 'replica'"
+        assert log_messages[1].include? "Error connecting to replica"
       end
     end
 
     describe 'with proper config' do
-      it "creates a new Mysql2::Client" do
+      it "creates a new database client" do
         expected_config = { username: 'user', password: 'pw', database: 'db', host: 'replica' }
-        Mysql2::Client.stubs(:new).with(expected_config).returns(mock())
+        DATABASE.client.stubs(:new).with(expected_config).returns(mock())
 
         assert Lhm::Throttler::Replica.new('replica', @dummy_mysql_client_config).connection
       end
@@ -80,7 +72,7 @@ describe Lhm::Throttler::Replica do
           ActiveRecord::Base.stubs(:connection_pool).returns(stub(spec: stub(config: active_record_config)))
         end
 
-        Mysql2::Client.stubs(:new).returns(mock())
+        DATABASE.client.stubs(:new).returns(mock())
 
         assert Lhm::Throttler::Replica.new('replica').connection
 
@@ -137,7 +129,7 @@ describe Lhm::Throttler::Replica do
     describe "#lag on connection error" do
       it "logs and returns 0 replica lag" do
         client = mock()
-        client.stubs(:query).raises(Mysql2::Error, "Can't connect to MySQL server")
+        client.stubs(:query).raises(DATABASE.error_class, "Can't connect to MySQL server")
         Lhm::Throttler::Replica.any_instance.stubs(:client).returns(client)
         Lhm::Throttler::Replica.any_instance.stubs(:config).returns([])
 
@@ -224,7 +216,7 @@ describe Lhm::Throttler::ReplicaLag do
     describe 'with MySQL stopped on the replica' do
       it 'assumes 0 replica lag' do
         client = mock()
-        client.stubs(:query).raises(Mysql2::Error, "Can't connect to MySQL server")
+        client.stubs(:query).raises(DATABASE.error_class, "Can't connect to MySQL server")
         Lhm::Throttler::Replica.any_instance.stubs(:client).returns(client)
 
         Lhm::Throttler::Replica.any_instance.stubs(:prepare_connection_config).returns([])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm-shopify
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.1
 platform: ruby
 authors:
 - SoundCloud
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
@@ -112,6 +112,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: trilogy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +193,6 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -188,15 +201,15 @@ files:
 - README.md
 - Rakefile
 - dev.yml
+- docker-compose-mysql-5.7.yml
+- docker-compose-mysql-8.0.yml
 - docker-compose.yml
-- gemfiles/activerecord_6.0.gemfile
-- gemfiles/activerecord_6.0.gemfile.lock
 - gemfiles/activerecord_6.1.gemfile
 - gemfiles/activerecord_6.1.gemfile.lock
 - gemfiles/activerecord_7.0.gemfile
 - gemfiles/activerecord_7.0.gemfile.lock
-- gemfiles/activerecord_7.1.0.beta1.gemfile
-- gemfiles/activerecord_7.1.0.beta1.gemfile.lock
+- gemfiles/activerecord_7.1.gemfile
+- gemfiles/activerecord_7.1.gemfile.lock
 - lhm.gemspec
 - lib/lhm-shopify.rb
 - lib/lhm.rb
@@ -307,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: online schema changer for mysql

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-before_script:
-  - "mysql -e 'create database lhm;'"
-rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-sudo: false
-gemfile:
-  - gemfiles/ar-2.3_mysql.gemfile
-  - gemfiles/ar-3.2_mysql.gemfile
-  - gemfiles/ar-3.2_mysql2.gemfile
-  - gemfiles/ar-4.0_mysql2.gemfile
-  - gemfiles/ar-4.1_mysql2.gemfile
-  - gemfiles/ar-4.2_mysql2.gemfile
-matrix:
-  exclude:
-    - rvm: 2.2
-      gemfile: gemfiles/ar-3.2_mysql.gemfile
-    - rvm: 2.2
-      gemfile: gemfiles/ar-2.3_mysql.gemfile

data/gemfiles/activerecord_6.0.gemfile.lock

@@ -1,71 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    lhm-shopify (4.0.0)
-      retriable (>= 3.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.3)
-      activesupport (= 6.0.3)
-    activerecord (6.0.3)
-      activemodel (= 6.0.3)
-      activesupport (= 6.0.3)
-    activesupport (6.0.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    after_do (0.4.0)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    byebug (11.1.3)
-    concurrent-ruby (1.2.2)
-    docile (1.4.0)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.0)
-    minitest (5.20.0)
-    mocha (2.1.0)
-      ruby2_keywords (>= 0.0.5)
-    mysql2 (0.5.5)
-    rake (13.0.6)
-    retriable (3.1.2)
-    ruby2_keywords (0.0.5)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    thor (1.2.2)
-    thread_safe (0.3.6)
-    toxiproxy (2.0.2)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
-    zeitwerk (2.6.11)
-
-PLATFORMS
-  arm64-darwin-21
-  arm64-darwin-22
-  x86_64-darwin-20
-  x86_64-linux
-
-DEPENDENCIES
-  activerecord (= 6.0.3)
-  after_do
-  appraisal
-  byebug
-  lhm-shopify!
-  minitest
-  mocha
-  mysql2
-  rake
-  simplecov
-  toxiproxy
-
-BUNDLED WITH
-   2.2.22

data/gemfiles/activerecord_7.1.0.beta1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "7.1.0.beta1"
-
-gemspec path: "../"