lhm-shopify 3.3.5 → 3.4.2

data/spec/integration/cleanup_spec.rb

@@ -31,12 +31,13 @@ describe Lhm, 'cleanup' do
 
     describe 'cleanup' do
       it 'should show temporary tables' do
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup
         end
-        output.must_include('Would drop LHM backup tables')
-        output.must_match(/lhma_[0-9_]*_users/)
-        output.must_match(/lhma_[0-9_]*_permissions/)
+        value(output).must_include('Would drop LHM backup tables')
+        value(output).must_match(/lhma_[0-9_]*_users/)
+        value(output).must_match(/lhma_[0-9_]*_permissions/)
       end
 
       it 'should show temporary tables within range' do
@@ -48,12 +49,13 @@ describe Lhm, 'cleanup' do
         table_name2 = Lhm::Migration.new(table2, nil, nil, {}, Time.now - 172800).archive_name
         table_rename(:permissions, table_name2)
 
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup false, { :until => Time.now - 86400 }
         end
-        output.must_include('Would drop LHM backup tables')
-        output.must_match(/lhma_[0-9_]*_users/)
-        output.must_match(/lhma_[0-9_]*_permissions/)
+        value(output).must_include('Would drop LHM backup tables')
+        value(output).must_match(/lhma_[0-9_]*_users/)
+        value(output).must_match(/lhma_[0-9_]*_permissions/)
       end
 
       it 'should exclude temporary tables outside range' do
@@ -65,30 +67,40 @@ describe Lhm, 'cleanup' do
         table_name2 = Lhm::Migration.new(table2, nil, nil, {}, Time.now).archive_name
         table_rename(:permissions, table_name2)
 
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup false, { :until => Time.now - 172800 }
         end
-        output.must_include('Would drop LHM backup tables')
-        output.wont_match(/lhma_[0-9_]*_users/)
-        output.wont_match(/lhma_[0-9_]*_permissions/)
+        value(output).must_include('Would drop LHM backup tables')
+        value(output).wont_match(/lhma_[0-9_]*_users/)
+        value(output).wont_match(/lhma_[0-9_]*_permissions/)
       end
 
       it 'should show temporary triggers' do
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup
         end
-        output.must_include('Would drop LHM triggers')
-        output.must_include('lhmt_ins_users')
-        output.must_include('lhmt_del_users')
-        output.must_include('lhmt_upd_users')
-        output.must_include('lhmt_ins_permissions')
-        output.must_include('lhmt_del_permissions')
-        output.must_include('lhmt_upd_permissions')
+        value(output).must_include('Would drop LHM triggers')
+        value(output).must_include('lhmt_ins_users')
+        value(output).must_include('lhmt_del_users')
+        value(output).must_include('lhmt_upd_users')
+        value(output).must_include('lhmt_ins_permissions')
+        value(output).must_include('lhmt_del_permissions')
+        value(output).must_include('lhmt_upd_permissions')
       end
 
       it 'should delete temporary tables' do
-        Lhm.cleanup(true).must_equal(true)
-        Lhm.cleanup.must_equal(true)
+        value(Lhm.cleanup(true)).must_equal(true)
+        value(Lhm.cleanup).must_equal(true)
+      end
+
+      it 'outputs deleted tables and triggers' do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
+          Lhm.cleanup(true)
+        end
+        value(output).must_include('Dropped triggers lhmt_ins_users, lhmt_upd_users, lhmt_del_users, lhmt_ins_permissions, lhmt_upd_permissions, lhmt_del_permissions')
       end
     end
 
@@ -96,27 +108,26 @@ describe Lhm, 'cleanup' do
       it 'should show lhmn table for the specified table only' do
         table_create(:permissions)
         table_rename(:permissions, 'lhmn_permissions')
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup_current_run(false, 'permissions')
-        end.split("\n")
-
-        assert_equal "The following DDLs would be executed:", output[0]
-        assert_equal "drop trigger if exists lhmt_ins_permissions", output[1]
-        assert_equal "drop trigger if exists lhmt_upd_permissions", output[2]
-        assert_equal "drop trigger if exists lhmt_del_permissions", output[3]
-        assert_match(/rename table lhmn_permissions to lhma_[0-9_]*_permissions_failed/, output[4])
-        assert_equal 5, output.length
+        end
+
+        value(output).must_include("The following DDLs would be executed:")
+        value(output).must_include("drop trigger if exists lhmt_ins_permissions")
+        value(output).must_include("drop trigger if exists lhmt_upd_permissions")
+        value(output).must_include("drop trigger if exists lhmt_del_permissions")
       end
 
       it 'should show temporary triggers for the specified table only' do
-        output = capture_stdout do
+        output = capture_stdout do |logger|
+          Lhm.logger = logger
           Lhm.cleanup_current_run(false, 'permissions')
-        end.split("\n")
-        assert_equal "The following DDLs would be executed:", output[0]
-        assert_equal "drop trigger if exists lhmt_ins_permissions", output[1]
-        assert_equal "drop trigger if exists lhmt_upd_permissions", output[2]
-        assert_equal "drop trigger if exists lhmt_del_permissions", output[3]
-        assert_equal 4, output.length
+        end
+        value(output).must_include("The following DDLs would be executed:")
+        value(output).must_include("drop trigger if exists lhmt_ins_permissions")
+        value(output).must_include("drop trigger if exists lhmt_upd_permissions")
+        value(output).must_include("drop trigger if exists lhmt_del_permissions")
       end
 
       it 'should delete temporary tables and triggers for the specified table only' do

data/spec/integration/entangler_spec.rb

@@ -26,7 +26,7 @@ describe Lhm::Entangler do
       end
 
       slave do
-        count(:destination, 'common', 'inserted').must_equal(1)
+        value(count(:destination, 'common', 'inserted')).must_equal(1)
       end
     end
 
@@ -38,7 +38,7 @@ describe Lhm::Entangler do
       end
 
       slave do
-        count(:destination, 'common', 'inserted').must_equal(0)
+        value(count(:destination, 'common', 'inserted')).must_equal(0)
       end
     end
 
@@ -49,7 +49,7 @@ describe Lhm::Entangler do
       end
 
       slave do
-        count(:destination, 'common', 'updated').must_equal(1)
+        value(count(:destination, 'common', 'updated')).must_equal(1)
       end
     end
 
@@ -59,7 +59,7 @@ describe Lhm::Entangler do
       execute("insert into origin (common) values ('inserted')")
 
       slave do
-        count(:destination, 'common', 'inserted').must_equal(0)
+        value(count(:destination, 'common', 'inserted')).must_equal(0)
       end
     end
   end

data/spec/integration/integration_helper.rb

@@ -3,6 +3,7 @@
 require 'test_helper'
 require 'yaml'
 require 'active_support'
+require 'logger'
 
 begin
   $db_config = YAML.load_file(File.expand_path(File.dirname(__FILE__)) + '/database.yml')
@@ -212,7 +213,8 @@ module IntegrationHelper
   def capture_stdout
     out = StringIO.new
     $stdout = out
-    yield
+    logger = Logger.new($stdout)
+    yield logger
     return out.string
   ensure
     $stdout = ::STDOUT

data/spec/integration/lhm_spec.rb

@@ -17,7 +17,7 @@ describe Lhm do
       end
 
       slave do
-        table_read(:users).columns['logins'].must_equal({
+        value(table_read(:users).columns['logins']).must_equal({
           :type           => 'int(12)',
           :is_nullable    => 'YES',
           :column_default => '0',
@@ -35,7 +35,7 @@ describe Lhm do
       end
 
       slave do
-        table_read(:custom_primary_key).columns['logins'].must_equal({
+        value(table_read(:custom_primary_key).columns['logins']).must_equal({
           :type           => 'int(12)',
           :is_nullable    => 'YES',
           :column_default => '0',
@@ -53,7 +53,7 @@ describe Lhm do
       end
 
       slave do
-        table_read(:composite_primary_key).columns['logins'].must_equal({
+        value(table_read(:composite_primary_key).columns['logins']).must_equal({
           :type           => 'int(12)',
           :is_nullable    => 'YES',
           :column_default => '0',
@@ -82,7 +82,7 @@ describe Lhm do
         end
 
         slave do
-          connection.primary_key('users').must_equal(['username', 'id'])
+          value(connection.primary_key('users')).must_equal(['username', 'id'])
         end
       end
 
@@ -104,7 +104,7 @@ describe Lhm do
 
         it 'migrates the existing data' do
           slave do
-            count_all(:permissions).must_equal(11)
+            value(count_all(:permissions)).must_equal(11)
           end
         end
       end
@@ -120,7 +120,7 @@ describe Lhm do
 
         it 'migrates all data' do
           slave do
-            count_all(:permissions).must_equal(13)
+            value(count_all(:permissions)).must_equal(13)
           end
         end
       end
@@ -132,7 +132,7 @@ describe Lhm do
       end
 
       slave do
-        table_read(:users).columns['logins'].must_equal({
+        value(table_read(:users).columns['logins']).must_equal({
           :type => 'int(12)',
           :is_nullable => 'YES',
           :column_default => '0',
@@ -150,7 +150,7 @@ describe Lhm do
       end
 
       slave do
-        count_all(:users).must_equal(23)
+        value(count_all(:users)).must_equal(23)
       end
     end
 
@@ -170,7 +170,7 @@ describe Lhm do
       end
 
       slave do
-        index_on_columns?(:users, [:comment, :created_at]).must_equal(true)
+        value(index_on_columns?(:users, [:comment, :created_at])).must_equal(true)
       end
     end
 
@@ -180,7 +180,7 @@ describe Lhm do
       end
 
       slave do
-        index?(:users, :my_index_name).must_equal(true)
+        value(index?(:users, :my_index_name)).must_equal(true)
       end
     end
 
@@ -190,7 +190,7 @@ describe Lhm do
       end
 
       slave do
-        index_on_columns?(:users, :group).must_equal(true)
+        value(index_on_columns?(:users, :group)).must_equal(true)
       end
     end
 
@@ -200,7 +200,7 @@ describe Lhm do
       end
 
       slave do
-        index_on_columns?(:users, :comment, :unique).must_equal(true)
+        value(index_on_columns?(:users, :comment, :unique)).must_equal(true)
       end
     end
 
@@ -210,7 +210,7 @@ describe Lhm do
       end
 
       slave do
-        index_on_columns?(:users, [:username, :created_at]).must_equal(false)
+        value(index_on_columns?(:users, [:username, :created_at])).must_equal(false)
       end
     end
 
@@ -220,7 +220,7 @@ describe Lhm do
       end
 
       slave do
-        index?(:users, :index_with_a_custom_name).must_equal(false)
+        value(index?(:users, :index_with_a_custom_name)).must_equal(false)
       end
     end
 
@@ -230,7 +230,7 @@ describe Lhm do
       end
 
       slave do
-        index?(:users, :index_with_a_custom_name).must_equal(false)
+        value(index?(:users, :index_with_a_custom_name)).must_equal(false)
       end
     end
 
@@ -240,7 +240,7 @@ describe Lhm do
       end
 
       slave do
-        table_read(:users).columns['flag'].must_equal({
+        value(table_read(:users).columns['flag']).must_equal({
           :type => 'tinyint(1)',
           :is_nullable => 'YES',
           :column_default => nil,
@@ -256,7 +256,7 @@ describe Lhm do
       end
 
       slave do
-        table_read(:users).columns['comment'].must_equal({
+        value(table_read(:users).columns['comment']).must_equal({
           :type => 'varchar(20)',
           :is_nullable => 'NO',
           :column_default => 'none',
@@ -274,7 +274,7 @@ describe Lhm do
       end
 
       slave do
-        table_read(:small_table).columns['id'].must_equal({
+        value(table_read(:small_table).columns['id']).must_equal({
           :type => 'int(5)',
           :is_nullable => 'NO',
           :column_default => nil,
@@ -295,7 +295,7 @@ describe Lhm do
       slave do
         table_data = table_read(:users)
         assert_nil table_data.columns['username']
-        table_read(:users).columns['login'].must_equal({
+        value(table_read(:users).columns['login']).must_equal({
           :type => 'varchar(255)',
           :is_nullable => 'YES',
           :column_default => nil,
@@ -305,7 +305,7 @@ describe Lhm do
 
         result = select_one('SELECT login from users')
         result = result['login'] if result.respond_to?(:has_key?)
-        result.must_equal('a user')
+        value(result).must_equal('a user')
       end
     end
 
@@ -320,7 +320,7 @@ describe Lhm do
       slave do
         table_data = table_read(:users)
         assert_nil table_data.columns['group']
-        table_read(:users).columns['fnord'].must_equal({
+        value(table_read(:users).columns['fnord']).must_equal({
           :type => 'varchar(255)',
           :is_nullable => 'YES',
           :column_default => 'Superfriends',
@@ -330,7 +330,7 @@ describe Lhm do
 
         result = select_one('SELECT `fnord` from users')
         result = result['fnord'] if result.respond_to?(:has_key?)
-        result.must_equal('Superfriends')
+        value(result).must_equal('Superfriends')
       end
     end
 
@@ -347,7 +347,7 @@ describe Lhm do
       slave do
         table_data = table_read(:users)
         assert_nil table_data.columns['username']
-        table_read(:users).columns['user_name'].must_equal({
+        value(table_read(:users).columns['user_name']).must_equal({
              :type => 'varchar(255)',
              :is_nullable => 'YES',
              :column_default => nil,
@@ -357,7 +357,7 @@ describe Lhm do
 
         result = select_one('SELECT `user_name` from users')
         result = result['user_name'] if result.respond_to?(:has_key?)
-        result.must_equal('a user')
+        value(result).must_equal('a user')
       end
     end
 
@@ -375,7 +375,7 @@ describe Lhm do
       slave do
         table_data = table_read(:users)
         assert_nil table_data.columns['reference']
-        table_read(:users).columns['ref'].must_equal({
+        value(table_read(:users).columns['ref']).must_equal({
            :type => 'int(11)',
            :is_nullable => 'YES',
            :column_default => nil,
@@ -385,7 +385,7 @@ describe Lhm do
 
         result = select_one('SELECT `ref` from users')
         result = result['ref'] if result.respond_to?(:has_key?)
-        result.must_equal(10)
+        value(result).must_equal(10)
       end
     end
 
@@ -402,7 +402,7 @@ describe Lhm do
       slave do
         table_data = table_read(:users)
         assert_nil table_data.columns['group']
-        table_read(:users).columns['fnord'].must_equal({
+        value(table_read(:users).columns['fnord']).must_equal({
            :type => 'varchar(255)',
            :is_nullable => 'YES',
            :column_default => nil,
@@ -412,7 +412,7 @@ describe Lhm do
 
         result = select_one('SELECT `fnord` from users')
         result = result['fnord'] if result.respond_to?(:has_key?)
-        result.must_equal(nil)
+        assert_nil(result)
       end
     end
 
@@ -427,7 +427,7 @@ describe Lhm do
       slave do
         table_data = table_read(:users)
         assert_nil table_data.columns['username']
-        table_read(:users).columns['user_name'].must_equal({
+        value(table_read(:users).columns['user_name']).must_equal({
           :type => 'varchar(255)',
           :is_nullable => 'YES',
           :column_default => nil,
@@ -437,7 +437,7 @@ describe Lhm do
 
         result = select_one('SELECT `user_name` from users')
         result = result['user_name'] if result.respond_to?(:has_key?)
-        result.must_equal('a user')
+        value(result).must_equal('a user')
       end
     end
 
@@ -454,7 +454,7 @@ describe Lhm do
       slave do
         table_data = table_read(:users)
         assert_nil table_data.columns['username']
-        table_read(:users).columns['user_name'].must_equal({
+        value(table_read(:users).columns['user_name']).must_equal({
           :type => 'varchar(255)',
           :is_nullable => 'NO',
           :column_default => nil,
@@ -464,7 +464,7 @@ describe Lhm do
 
         result = select_one('SELECT `user_name` from users')
         result = result['user_name'] if result.respond_to?(:has_key?)
-        result.must_equal('a user')
+        value(result).must_equal('a user')
       end
     end
 
@@ -501,7 +501,7 @@ describe Lhm do
       slave do
         table_data = table_read(:users)
         assert_nil table_data.columns['fnord']
-        table_read(:users).columns['group'].must_equal({
+        value(table_read(:users).columns['group']).must_equal({
           :type => 'varchar(255)',
           :is_nullable => 'YES',
           :column_default => 'Superfriends',
@@ -525,11 +525,11 @@ describe Lhm do
       end
 
       slave do
-        table_read(:lines).columns.must_include 'by'
-        table_read(:lines).columns.wont_include 'lines'
-        index_on_columns?(:lines, ['between'], :unique).must_equal true
-        index_on_columns?(:lines, ['by']).must_equal false
-        count_all(:lines).must_equal(2)
+        value(table_read(:lines).columns).must_include 'by'
+        value(table_read(:lines).columns).wont_include 'lines'
+        value(index_on_columns?(:lines, ['between'], :unique)).must_equal true
+        value(index_on_columns?(:lines, ['by'])).must_equal false
+        value(count_all(:lines)).must_equal(2)
       end
     end
 
@@ -554,7 +554,7 @@ describe Lhm do
         insert.join
 
         slave do
-          count_all(:users).must_equal(60)
+          value(count_all(:users)).must_equal(60)
         end
       end
 
@@ -577,7 +577,7 @@ describe Lhm do
         delete.join
 
         slave do
-          count_all(:users).must_equal(40)
+          value(count_all(:users)).must_equal(40)
         end
       end
     end

data/spec/integration/lock_wait_timeout_spec.rb

@@ -24,7 +24,7 @@ describe Lhm do
     session_innodb_lock_wait_timeout = connection.select_one("SHOW SESSION VARIABLES LIKE 'innodb_lock_wait_timeout'")['Value'].to_i
     session_lock_wait_timeout = connection.select_one("SHOW SESSION VARIABLES LIKE 'lock_wait_timeout'")['Value'].to_i
 
-    session_lock_wait_timeout.must_equal global_lock_wait_timeout + Lhm::Invoker::LOCK_WAIT_TIMEOUT_DELTA
-    session_innodb_lock_wait_timeout.must_equal global_innodb_lock_wait_timeout + Lhm::Invoker::LOCK_WAIT_TIMEOUT_DELTA
+    value(session_lock_wait_timeout).must_equal global_lock_wait_timeout + Lhm::Invoker::LOCK_WAIT_TIMEOUT_DELTA
+    value(session_innodb_lock_wait_timeout).must_equal global_innodb_lock_wait_timeout + Lhm::Invoker::LOCK_WAIT_TIMEOUT_DELTA
   end
 end

data/spec/integration/locked_switcher_spec.rb

@@ -32,8 +32,8 @@ describe Lhm::LockedSwitcher do
       switcher.run
 
       slave do
-        data_source_exists?(@origin).must_equal true
-        table_read(@migration.archive_name).columns.keys.must_include 'origin'
+        value(data_source_exists?(@origin)).must_equal true
+        value(table_read(@migration.archive_name).columns.keys).must_include 'origin'
       end
     end
 
@@ -42,8 +42,8 @@ describe Lhm::LockedSwitcher do
       switcher.run
 
       slave do
-        data_source_exists?(@destination).must_equal false
-        table_read(@origin.name).columns.keys.must_include 'destination'
+        value(data_source_exists?(@destination)).must_equal false
+        value(table_read(@origin.name).columns.keys).must_include 'destination'
       end
     end
   end

data/spec/integration/table_spec.rb

@@ -15,28 +15,24 @@ describe Lhm::Table do
       end
 
       it 'should parse primary key' do
-        @table.pk.must_equal('pk')
+        value(@table.pk).must_equal('pk')
       end
 
       it 'should parse indices' do
-        @table.
-          indices['index_custom_primary_key_on_id'].
-          must_equal(['id'])
+        value(@table.indices['index_custom_primary_key_on_id']).must_equal(['id'])
       end
 
       it 'should parse columns' do
-        @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
-        @table.satisfies_id_column_requirement?.must_equal true
+        value(@table.satisfies_id_column_requirement?).must_equal true
       end
 
       it 'should support bigint tables' do
         @table = table_create(:bigint_table)
-        @table.satisfies_id_column_requirement?.must_equal true
+        value(@table.satisfies_id_column_requirement?).must_equal true
       end
     end
 
@@ -47,7 +43,7 @@ describe Lhm::Table do
 
       it 'should return false for a non-int id column' do
         @table = table_create(:wo_id_int_column)
-        @table.satisfies_id_column_requirement?.must_equal false
+        value(@table.satisfies_id_column_requirement?).must_equal false
       end
     end
   end
@@ -60,15 +56,15 @@ describe Lhm::Table do
       end
 
       it 'should parse table name in show create table' do
-        @table.name.must_equal('users')
+        value(@table.name).must_equal('users')
       end
 
       it 'should parse primary key' do
-        @table.pk.must_equal('id')
+        value(@table.pk).must_equal('id')
       end
 
       it 'should parse column type in show create table' do
-        @table.columns['username'][:type].must_equal('varchar(255)')
+        value(@table.columns['username'][:type]).must_equal('varchar(255)')
       end
 
       it 'should parse column metadata' do
@@ -76,15 +72,11 @@ describe Lhm::Table do
       end
 
       it 'should parse indices' do
-        @table.
-          indices['index_users_on_username_and_created_at'].
-          must_equal(['username', 'created_at'])
+        value(@table.indices['index_users_on_username_and_created_at']).must_equal(['username', 'created_at'])
       end
 
       it 'should parse index' do
-        @table.
-          indices['index_users_on_reference'].
-          must_equal(['reference'])
+        value(@table.indices['index_users_on_reference']).must_equal(['reference'])
       end
     end
   end

data/spec/test_helper.rb

@@ -30,3 +30,16 @@ def without_verbose(&block)
 ensure
   $VERBOSE = old_verbose
 end
+
+def printer
+  printer = Lhm::Printer::Base.new
+
+  def printer.notify(*) ;end
+  def printer.end(*) [] ;end
+
+  printer
+end
+
+def throttler
+  Lhm::Throttler::Time.new(:stride => 100)
+end

data/spec/unit/atomic_switcher_spec.rb

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