lhm-shopify 4.0.0 → 4.1.1

data/lib/lhm/sql_retry.rb

@@ -105,9 +105,7 @@ module Lhm
     def mysql_single_value(name)
       query = Lhm::ProxySQLHelper.tagged("SELECT #{name} LIMIT 1")
 
-      @connection.execute(query).to_a.first.tap do |record|
-        return record&.first
-      end
+      @connection.select_value(query)
     end
 
     def same_host_as_initial?
@@ -140,32 +138,22 @@ module Lhm
             log_with_prefix("Reconnected to wrong host. Started migration on: #{@initial_hostname} (server_id: #{@initial_server_id}), but reconnected to: #{hostname} (server_id: #{server_id}).", :error)
             return false
           end
-        rescue StandardError => e
+        rescue ActiveRecord::ConnectionNotEstablished
           # Retry if ActiveRecord cannot reach host
-          next if /Lost connection to MySQL server at 'reading initial communication packet'/ === e.message
+          next
+        rescue StandardError => e
           log_with_prefix("Encountered error: [#{e.class}] #{e.message}. Will stop reconnection procedure.", :info)
           return false
         end
       end
+
       false
     end
 
     # For a full list of configuration options see https://github.com/kamui/retriable
     def default_retry_config
       {
-        on: {
-          StandardError => [
-            /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/,
-          ]
-        },
+        on: retriable_mysql2_errors || retriable_trilogy_errors,
         multiplier: 1, # each successive interval grows by this factor
         base_interval: 1, # the initial interval in seconds between tries.
         tries: 20, # Number of attempts to make at running your code block (includes initial attempt).
@@ -176,5 +164,35 @@ module Lhm
         end
       }.freeze
     end
+
+    def retriable_mysql2_errors
+      return unless defined?(Mysql2::Error)
+
+      {
+        StandardError => [
+          /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/,
+        ],
+      }
+    end
+
+    def retriable_trilogy_errors
+      return unless defined?(Trilogy::BaseError)
+
+      {
+        ActiveRecord::StatementInvalid => [
+          # Those sometimes appear as Trilogy::TimeoutError, and sometimes as ActiveRecord::StatementInvalid
+          /Lock wait timeout exceeded/,
+        ],
+        Trilogy::ConnectionError => nil,
+      }
+    end
   end
 end

data/lib/lhm/table.rb

@@ -39,10 +39,9 @@ module Lhm
       end
 
       def ddl
-        sql = "show create table `#{ @table_name }`"
-        specification = nil
-        @connection.execute(sql).each { |row| specification = row.last }
-        specification
+        query = "SHOW CREATE TABLE #{ @connection.quote_table_name(@table_name) }"
+
+        @connection.select_one(query)["Create Table"]
       end
 
       def parse

data/lib/lhm/throttler/replica_lag.rb

@@ -91,6 +91,14 @@ module Lhm
 
       attr_reader :host, :connection
 
+      def self.client
+        defined?(Mysql2::Client) ? Mysql2::Client : Trilogy
+      end
+
+      def self.client_error
+        defined?(Mysql2::Error) ? Mysql2::Error : Trilogy::Error
+      end
+
       def initialize(host, connection_config = nil)
         @host = host
         @connection_config = prepare_connection_config(connection_config)
@@ -108,13 +116,11 @@ module Lhm
       private
 
       def client(config)
-        begin
-          Lhm.logger.info "Connecting to #{@host} on database: #{config[:database]}"
-          Mysql2::Client.new(config)
-        rescue Mysql2::Error => e
-          Lhm.logger.info "Error connecting to #{@host}: #{e}"
-          nil
-        end
+        Lhm.logger.info "Connecting to #{@host} on database: #{config[:database]}"
+        self.class.client.new(config)
+      rescue self.class.client_error => e
+        Lhm.logger.info "Error connecting to #{@host}: #{e}"
+        nil
       end
 
       def prepare_connection_config(config_proc)
@@ -133,12 +139,10 @@ module Lhm
       end
 
       def query_connection(query, result)
-        begin
-          @connection.query(query).map { |row| row[result] }
-        rescue Mysql2::Error => e
-          Lhm.logger.info "Unable to connect and/or query #{host}: #{e}"
-          [nil]
-        end
+        @connection.query(query).map { |row| row[result] }
+      rescue self.class.client_error => e
+        Lhm.logger.info "Unable to connect and/or query #{host}: #{e}"
+        [nil]
       end
 
       private

data/lib/lhm/version.rb

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

data/scripts/helpers/wait-for-dbs.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 # Wait for writer
 echo "Waiting for MySQL-1: "
-while ! (mysqladmin ping --host="127.0.0.1" --port=33006 --user=root --password=password --silent 2> /dev/null); do
+while ! (mysqladmin ping --host="127.0.0.1" --port=13006 --user=root --password=password --silent 2> /dev/null); do
   echo -ne "."
   sleep 1
 done
 # Wait for reader
 echo "Waiting for MySQL-2: "
-while ! (mysqladmin ping --host="127.0.0.1" --port=33007 --user=root --password=password --silent 2> /dev/null); do
+while ! (mysqladmin ping --host="127.0.0.1" --port=13007 --user=root --password=password --silent 2> /dev/null); do
   echo -ne "."
   sleep 1
 done
 # Wait for proxysql
 echo "Waiting for ProxySQL:"
-while ! (mysqladmin ping --host="127.0.0.1" --port=33005 --user=root --password=password --silent 2> /dev/null); do
+while ! (mysqladmin ping --host="127.0.0.1" --port=13005 --user=root --password=password --silent 2> /dev/null); do
   echo -ne "."
   sleep 1
 done

data/scripts/mysql/writer/create_users.sql

@@ -3,4 +3,4 @@ CREATE USER IF NOT EXISTS 'writer'@'%' IDENTIFIED BY 'password';
 CREATE USER IF NOT EXISTS 'reader'@'%' IDENTIFIED BY 'password';
 
 CREATE USER IF NOT EXISTS 'replication'@'%' IDENTIFIED BY 'password';
-GRANT REPLICATION SLAVE ON *.* TO' replication'@'%' IDENTIFIED BY 'password';
+GRANT REPLICATION SLAVE ON *.* TO' replication'@'%';

data/spec/integration/atomic_switcher_spec.rb

@@ -33,8 +33,8 @@ describe Lhm::AtomicSwitcher do
       ar_connection = mock()
       ar_connection.stubs(:data_source_exists?).returns(true)
       ar_connection.stubs(:active?).returns(true)
-      ar_connection.stubs(:execute).returns([["dummy"]], [["dummy"]], [["dummy"]])
-                   .then
+      ar_connection.stubs(:select_value).returns("dummy")
+      ar_connection.stubs(:execute)
                    .raises(ActiveRecord::StatementInvalid, 'Lock wait timeout exceeded; try restarting transaction.')
                    .then
                    .returns([["dummy"]]) # Matches initial host -> triggers retry
@@ -62,16 +62,12 @@ describe Lhm::AtomicSwitcher do
       ar_connection = mock()
       ar_connection.stubs(:data_source_exists?).returns(true)
       ar_connection.stubs(:active?).returns(true)
-      ar_connection.stubs(:execute).returns([["dummy"]], [["dummy"]], [["dummy"]])
-                   .then
+      ar_connection.stubs(:select_value).returns("dummy")
+      ar_connection.stubs(:execute)
                    .raises(ActiveRecord::StatementInvalid, 'Lock wait timeout exceeded; try restarting transaction.')
                    .then
-                   .returns([["dummy"]]) # triggers retry 1
-                   .then
                    .raises(ActiveRecord::StatementInvalid, 'Lock wait timeout exceeded; try restarting transaction.')
                    .then
-                   .returns([["dummy"]]) # triggers retry 2
-                   .then
                    .raises(ActiveRecord::StatementInvalid, 'Lock wait timeout exceeded; try restarting transaction.') # triggers retry 2
 
       connection = Lhm::Connection.new(connection: ar_connection, options: {

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)
@@ -74,7 +73,8 @@ describe Lhm::Chunker do
         Lhm::Chunker.new(migration, connection, {raise_on_warnings: true, throttler: throttler, printer: printer} ).run
       end
 
-      assert_match "Unexpected warning found for inserted row: Duplicate entry '1001' for key 'index_custom_primary_key_on_id'", exception.message
+      error_key = index_key("custom_primary_key_dest", "index_custom_primary_key_on_id")
+      assert_match "Unexpected warning found for inserted row: Duplicate entry '1001' for key '#{error_key}'", exception.message
     end
 
     it 'should copy and warn on unexpected warnings by default' do
@@ -87,8 +87,10 @@ describe Lhm::Chunker do
 
       Lhm::Chunker.new(migration, connection, {throttler: throttler, printer: printer} ).run
 
+      error_key = index_key("custom_primary_key_dest", "index_custom_primary_key_on_id")
+
       assert_equal 2, log_messages.length
-      assert log_messages[1].include?("Unexpected warning found for inserted row: Duplicate entry '1001' for key 'index_custom_primary_key_on_id'"), log_messages
+      assert log_messages[1].include?("Unexpected warning found for inserted row: Duplicate entry '1001' for key '#{error_key}'"), log_messages
     end
 
     it 'should log two times for two unexpected warnings' do
@@ -103,9 +105,11 @@ describe Lhm::Chunker do
 
       Lhm::Chunker.new(migration, connection, {throttler: throttler, printer: printer} ).run
 
+      error_key = index_key("custom_primary_key_dest", "index_custom_primary_key_on_id")
+
       assert_equal 3, log_messages.length
-      assert log_messages[1].include?("Unexpected warning found for inserted row: Duplicate entry '1001' for key 'index_custom_primary_key_on_id'"), log_messages
-      assert log_messages[2].include?("Unexpected warning found for inserted row: Duplicate entry '1002' for key 'index_custom_primary_key_on_id'"), log_messages
+      assert log_messages[1].include?("Unexpected warning found for inserted row: Duplicate entry '1001' for key '#{error_key}'"), log_messages
+      assert log_messages[2].include?("Unexpected warning found for inserted row: Duplicate entry '1002' for key '#{error_key}'"), log_messages
     end
 
     it 'should copy and warn on unexpected warnings' do
@@ -118,8 +122,10 @@ describe Lhm::Chunker do
 
       Lhm::Chunker.new(migration, connection, {raise_on_warnings: false, throttler: throttler, printer: printer} ).run
 
+      error_key = index_key("custom_primary_key_dest", "index_custom_primary_key_on_id")
+
       assert_equal 2, log_messages.length
-      assert log_messages[1].include?("Unexpected warning found for inserted row: Duplicate entry '1001' for key 'index_custom_primary_key_on_id'"), log_messages
+      assert log_messages[1].include?("Unexpected warning found for inserted row: Duplicate entry '1001' for key '#{error_key}'"), log_messages
     end
 
     it 'should create the modified destination, even if the source is empty' do
@@ -222,7 +228,7 @@ describe Lhm::Chunker do
         def throttler.replica_connection(replica)
           config = ActiveRecord::Base.connection_pool.db_config.configuration_hash.dup
           config[:host] = replica
-          config[:port] = 33007
+          config[:port] = 13007
           ActiveRecord::Base.send('mysql2_connection', config)
         end
       end
@@ -261,4 +267,12 @@ describe Lhm::Chunker do
       end
     end
   end
+
+  def index_key(table_name, index_name)
+    if mysql_version.start_with?("8")
+      "#{table_name}.#{index_name}"
+    else
+      index_name
+    end
+  end
 end

data/spec/integration/database.yml

@@ -2,17 +2,17 @@ master:
   host: mysql-1
   user: root
   password: password
-  port: 33006
+  port: 13006
 replica:
   host: mysql-2
   user: root
   password: password
-  port: 33007
+  port: 13007
 proxysql:
   host: proxysql
   user: root
   password: password
-  port: 33005
+  port: 13005
 master_toxic:
   host: toxiproxy
   user: root

data/spec/integration/integration_helper.rb

@@ -22,7 +22,7 @@ module IntegrationHelper
   def self.included(base)
     base.after(:each) do
       cleanup_connection = new_mysql_connection
-      results = cleanup_connection.query("SELECT table_name FROM information_schema.tables WHERE table_schema = '#{$db_name}';")
+      results = DATABASE.query(cleanup_connection, "SELECT table_name FROM information_schema.tables WHERE table_schema = '#{$db_name}';")
       table_names_for_cleanup = results.map { |row| "#{$db_name}." + row.values.first }
       cleanup_connection.query("DROP TABLE IF EXISTS #{table_names_for_cleanup.join(', ')};") if table_names_for_cleanup.length > 0
     end
@@ -35,6 +35,14 @@ module IntegrationHelper
     @connection
   end
 
+  def mysql_version
+    @mysql_version ||= begin
+      # This SQL returns a value of shape: X.Y.ZZ-AA-log
+      result = connection.query("SELECT VERSION()")
+      result.dig(0, 0).split("-", 2)[0]
+    end
+  end
+
   def connect_proxysql!
     connect!(
       '127.0.0.1',
@@ -81,7 +89,7 @@ module IntegrationHelper
 
   def ar_conn(host, port, user, password)
     ActiveRecord::Base.establish_connection(
-      :adapter  => 'mysql2',
+      :adapter  => DATABASE.adapter,
       :host     => host,
       :username => user,
       :port     => port,
@@ -171,7 +179,7 @@ module IntegrationHelper
   end
 
   def new_mysql_connection(role='master')
-    Mysql2::Client.new(
+    DATABASE.client.new(
       host: '127.0.0.1',
       database: $db_name,
       username: $db_config[role]['user'],

data/spec/integration/lhm_spec.rb

@@ -9,6 +9,10 @@ describe Lhm do
 
   before(:each) { connect_master!; Lhm.cleanup(true) }
 
+  let(:collation) do
+    mysql_version.start_with?("8.0") ? "utf8mb3_general_ci" : "utf8_general_ci"
+  end
+
   describe 'id column requirement' do
     it 'should migrate the table when id is pk' do
       table_create(:users)
@@ -17,9 +21,11 @@ describe Lhm do
         t.add_column(:logins, "int(12) default '0'")
       end
 
+      expected_type = mysql_version.start_with?("8.0") ? "int" : "int(12)"
+
       replica do
         value(table_read(:users).columns['logins']).must_equal({
-          :type           => 'int(12)',
+          :type           => expected_type,
           :is_nullable    => 'YES',
           :column_default => '0',
           :comment => '',
@@ -35,9 +41,11 @@ describe Lhm do
         t.add_column(:logins, "int(12) default '0'")
       end
 
+      expected_type = mysql_version.start_with?("8.0") ? "int" : "int(12)"
+
       replica do
         value(table_read(:custom_primary_key).columns['logins']).must_equal({
-          :type           => 'int(12)',
+          :type           => expected_type,
           :is_nullable    => 'YES',
           :column_default => '0',
           :comment => '',
@@ -53,9 +61,11 @@ describe Lhm do
         t.add_column(:logins, "int(12) default '0'")
       end
 
+      expected_type = mysql_version.start_with?("8.0") ? "int" : "int(12)"
+
       replica do
         value(table_read(:composite_primary_key).columns['logins']).must_equal({
-          :type           => 'int(12)',
+          :type           => expected_type,
           :is_nullable    => 'YES',
           :column_default => '0',
           :comment => '',
@@ -132,9 +142,11 @@ describe Lhm do
         t.add_column(:logins, "INT(12) DEFAULT '0'")
       end
 
+      expected_type = mysql_version.start_with?("8.0") ? "int" : "int(12)"
+
       replica do
         value(table_read(:users).columns['logins']).must_equal({
-          :type => 'int(12)',
+          :type => expected_type,
           :is_nullable => 'YES',
           :column_default => '0',
           :comment => '',
@@ -272,7 +284,7 @@ describe Lhm do
           :is_nullable => 'NO',
           :column_default => 'none',
           :comment => '',
-          :collate => 'utf8_general_ci',
+          :collate => collation,
         })
       end
     end
@@ -284,9 +296,11 @@ describe Lhm do
         t.change_column(:id, 'int(5)')
       end
 
+      expected_type = mysql_version.start_with?("8.0") ? "int" : "int(5)"
+
       replica do
         value(table_read(:small_table).columns['id']).must_equal({
-          :type => 'int(5)',
+          :type => expected_type,
           :is_nullable => 'NO',
           :column_default => nil,
           :comment => '',
@@ -311,7 +325,7 @@ describe Lhm do
           :is_nullable => 'YES',
           :column_default => nil,
           :comment => '',
-          :collate => 'utf8_general_ci',
+          :collate => collation,
         })
 
         result = select_one('SELECT login from users')
@@ -336,7 +350,7 @@ describe Lhm do
           :is_nullable => 'YES',
           :column_default => 'Superfriends',
           :comment => '',
-          :collate => 'utf8_general_ci',
+          :collate => collation,
         })
 
         result = select_one('SELECT `fnord` from users')
@@ -383,11 +397,13 @@ describe Lhm do
         t.rename_column(:reference, :ref)
       end
 
+      expected_type = mysql_version.start_with?("8.0") ? "int" : "int(11)"
+
       replica do
         table_data = table_read(:users)
         assert_nil table_data.columns['reference']
         value(table_read(:users).columns['ref']).must_equal({
-           :type => 'int(11)',
+           :type => expected_type,
            :is_nullable => 'YES',
            :column_default => nil,
            :comment => 'RefComment',
@@ -418,7 +434,7 @@ describe Lhm do
            :is_nullable => 'YES',
            :column_default => nil,
            :comment => '',
-           :collate => 'utf8_general_ci',
+           :collate => collation,
          })
 
         result = select_one('SELECT `fnord` from users')
@@ -443,7 +459,7 @@ describe Lhm do
           :is_nullable => 'YES',
           :column_default => nil,
           :comment => '',
-          :collate => 'utf8_general_ci',
+          :collate => collation,
         })
 
         result = select_one('SELECT `user_name` from users')
@@ -470,7 +486,7 @@ describe Lhm do
           :is_nullable => 'NO',
           :column_default => nil,
           :comment => '',
-          :collate => 'utf8_general_ci',
+          :collate => collation,
         })
 
         result = select_one('SELECT `user_name` from users')
@@ -517,7 +533,7 @@ describe Lhm do
           :is_nullable => 'YES',
           :column_default => 'Superfriends',
           :comment => '',
-          :collate => 'utf8_general_ci',
+          :collate => collation,
         })
       end
     end

data/spec/integration/proxysql_spec.rb

@@ -1,34 +1,34 @@
 describe "ProxySQL integration" do
   it "Should contact the writer" do
-    conn = Mysql2::Client.new(
+    conn = DATABASE.client.new(
       host: '127.0.0.1',
       username: "writer",
       password: "password",
-      port: "33005",
+      port: "13005",
       )
 
-    assert_equal conn.query("SELECT @@global.hostname as host").each.first["host"], "mysql-1"
+    assert_equal DATABASE.query(conn, "SELECT @@global.hostname as host").each.first["host"], "mysql-1"
   end
 
   it "Should contact the reader" do
-    conn = Mysql2::Client.new(
+    conn = DATABASE.client.new(
       host: '127.0.0.1',
       username: "reader",
       password: "password",
-      port: "33005",
+      port: "13005",
       )
 
-    assert_equal conn.query("SELECT @@global.hostname as host").each.first["host"], "mysql-2"
+    assert_equal DATABASE.query(conn, "SELECT @@global.hostname as host").each.first["host"], "mysql-2"
   end
 
   it "Should override default hostgroup from user if rule matches" do
-    conn = Mysql2::Client.new(
+    conn = DATABASE.client.new(
       host: '127.0.0.1',
       username: "reader",
       password: "password",
-      port: "33005",
+      port: "13005",
       )
 
-    assert_equal conn.query("SELECT @@global.hostname as host #{Lhm::ProxySQLHelper::ANNOTATION}").each.first["host"], "mysql-1"
+    assert_equal DATABASE.query(conn, "SELECT @@global.hostname as host #{Lhm::ProxySQLHelper::ANNOTATION}").each.first["host"], "mysql-1"
   end
-end
+end

data/spec/integration/sql_retry/db_connection_helper.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'mysql2'
 
 class DBConnectionHelper
 
@@ -11,12 +10,11 @@ class DBConnectionHelper
     end
 
     def new_mysql_connection(role = :master, with_data = false, toxic = false)
-
       key = role.to_s + toxic_postfix(toxic)
 
       conn = ActiveRecord::Base.establish_connection(
         :host => '127.0.0.1',
-        :adapter => "mysql2",
+        :adapter => DATABASE.adapter,
         :username => db_config[key]['user'],
         :password => db_config[key]['password'],
         :database => test_db_name,
@@ -49,4 +47,4 @@ class DBConnectionHelper
       end
     end
   end
-end
+end

data/spec/integration/sql_retry/lock_wait_spec.rb

@@ -1,5 +1,4 @@
 require 'minitest/autorun'
-require 'mysql2'
 require 'integration/sql_retry/lock_wait_timeout_test_helper'
 require 'lhm'
 
@@ -22,7 +21,7 @@ describe Lhm::SqlRetry do
     # Assert our pre-conditions
     assert_equal 2, @helper.record_count
 
-    Mysql2::Client.any_instance.stubs(:active?).returns(true)
+    DATABASE.client.any_instance.stubs(:active?).returns(true)
   end
 
   after(:each) do
@@ -43,8 +42,8 @@ describe Lhm::SqlRetry do
 
     exception = assert_raises { @helper.trigger_wait_lock }
 
-    assert_match /Lock wait timeout exceeded; try restarting transaction/, exception.message
-    assert_equal Mysql2::Error::TimeoutError, exception.class
+    assert_match Regexp.new("Lock wait timeout exceeded; try restarting transaction"), exception.message
+    assert_equal DATABASE.timeout_error, exception.class
 
     assert_equal 2, @helper.record_count # no records inserted
     puts "*" * 64
@@ -82,10 +81,10 @@ describe Lhm::SqlRetry do
     logs = @logger.string.split("\n")
     assert_equal 2, logs.length
 
-    assert logs.first.include?("Mysql2::Error::TimeoutError: 'Lock wait timeout exceeded; try restarting transaction' - 1 tries")
+    assert logs.first.include?("Lock wait timeout exceeded; try restarting transaction' - 1 tries")
     assert logs.first.include?("0.2 seconds until the next try")
 
-    assert logs.last.include?("Mysql2::Error::TimeoutError: 'Lock wait timeout exceeded; try restarting transaction' - 2 tries")
+    assert logs.last.include?("Lock wait timeout exceeded; try restarting transaction' - 2 tries")
     assert logs.last.include?("0.2 seconds until the next try")
   end
 
@@ -118,8 +117,8 @@ describe Lhm::SqlRetry do
 
     exception = assert_raises { @helper.trigger_wait_lock }
 
-    assert_match /Lock wait timeout exceeded; try restarting transaction/, exception.message
-    assert_equal Mysql2::Error::TimeoutError, exception.class
+    assert_match Regexp.new("Lock wait timeout exceeded; try restarting transaction"), exception.message
+    assert_equal DATABASE.timeout_error, exception.class
 
     assert_equal 2, @helper.record_count # no records inserted
     puts "*" * 64