lhm-shopify 3.3.5 → 3.4.2

data/spec/unit/chunker_spec.rb

@@ -41,6 +41,7 @@ describe Lhm::Chunker do
       @connection.expects(:select_value).with(regexp_matches(/where id >= 8 order by id limit 1 offset 4/)).returns(21)
       @connection.expects(:update).with(regexp_matches(/between 1 and 7/)).returns(2)
       @connection.expects(:update).with(regexp_matches(/between 8 and 10/)).returns(2)
+      @connection.expects(:query).twice.with(regexp_matches(/show warnings/)).returns([])
 
       @chunker.run
     end
@@ -88,6 +89,8 @@ describe Lhm::Chunker do
       @connection.expects(:update).with(regexp_matches(/between 6 and 8/)).returns(2)
       @connection.expects(:update).with(regexp_matches(/between 9 and 10/)).returns(2)
 
+      @connection.expects(:query).twice.with(regexp_matches(/show warnings/)).returns([])
+
       @chunker.run
     end
 
@@ -136,6 +139,7 @@ describe Lhm::Chunker do
 
       @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/)).returns(2)
       @connection.expects(:update).with(regexp_matches(/where \(foo.created_at > '2013-07-10' or foo.baz = 'quux'\) and `foo`/)).returns(1)
+      @connection.expects(:query).with(regexp_matches(/show warnings/)).returns([])
 
       def @migration.conditions
         "where foo.created_at > '2013-07-10' or foo.baz = 'quux'"
@@ -155,6 +159,7 @@ describe Lhm::Chunker do
 
       @connection.expects(:select_value).with(regexp_matches(/where id >= 1 order by id limit 1 offset 1/)).returns(2)
       @connection.expects(:update).with(regexp_matches(/inner join bar on foo.id = bar.foo_id and/)).returns(1)
+      @connection.expects(:query).with(regexp_matches(/show warnings/)).returns([])
 
       def @migration.conditions
         'inner join bar on foo.id = bar.foo_id'

data/spec/unit/entangler_spec.rb

@@ -34,7 +34,7 @@ describe Lhm::Entangler do
         values (`NEW`.`info`, `NEW`.`tags`)
       }
 
-      @entangler.entangle.must_include strip(ddl)
+      value(@entangler.entangle).must_include strip(ddl)
     end
 
     it 'should create an update trigger to the destination table' do
@@ -45,7 +45,7 @@ describe Lhm::Entangler do
         values (`NEW`.`info`, `NEW`.`tags`)
       }
 
-      @entangler.entangle.must_include strip(ddl)
+      value(@entangler.entangle).must_include strip(ddl)
     end
 
     it 'should create a delete trigger to the destination table' do
@@ -56,7 +56,7 @@ describe Lhm::Entangler do
         where `destination`.`id` = OLD.`id`
       }
 
-      @entangler.entangle.must_include strip(ddl)
+      value(@entangler.entangle).must_include strip(ddl)
     end
 
     it 'should retry trigger creation when it hits a lock wait timeout' do
@@ -101,24 +101,24 @@ describe Lhm::Entangler do
       end
 
       it 'should use truncated names' do
-        @entangler.trigger(:ins).length.must_be :<=, 64
-        @entangler.trigger(:upd).length.must_be :<=, 64
-        @entangler.trigger(:del).length.must_be :<=, 64
+        value(@entangler.trigger(:ins).length).must_be :<=, 64
+        value(@entangler.trigger(:upd).length).must_be :<=, 64
+        value(@entangler.trigger(:del).length).must_be :<=, 64
       end
     end
   end
 
   describe 'removal' do
     it 'should remove insert trigger' do
-      @entangler.untangle.must_include('drop trigger if exists `lhmt_ins_origin`')
+      value(@entangler.untangle).must_include('drop trigger if exists `lhmt_ins_origin`')
     end
 
     it 'should remove update trigger' do
-      @entangler.untangle.must_include('drop trigger if exists `lhmt_upd_origin`')
+      value(@entangler.untangle).must_include('drop trigger if exists `lhmt_upd_origin`')
     end
 
     it 'should remove delete trigger' do
-      @entangler.untangle.must_include('drop trigger if exists `lhmt_del_origin`')
+      value(@entangler.untangle).must_include('drop trigger if exists `lhmt_del_origin`')
     end
   end
 end

data/spec/unit/intersection_spec.rb

@@ -18,7 +18,7 @@ describe Lhm::Intersection do
     destination.columns['retained'] = varchar
 
     intersection = Lhm::Intersection.new(origin, destination)
-    intersection.destination.include?('dropped').must_equal(false)
+    value(intersection.destination.include?('dropped')).must_equal(false)
   end
 
   it 'should have unchanged columns' do
@@ -30,7 +30,7 @@ describe Lhm::Intersection do
     destination.columns['retained'] = varchar
 
     intersection = Lhm::Intersection.new(origin, destination)
-    intersection.destination.must_equal(['retained'])
+    value(intersection.destination).must_equal(['retained'])
   end
 
   it 'should have renamed columns' do
@@ -41,8 +41,8 @@ describe Lhm::Intersection do
     destination.columns['new_name'] = varchar
 
     intersection = Lhm::Intersection.new(origin, destination, { 'old_name' => 'new_name' })
-    intersection.origin.must_equal(['old_name'])
-    intersection.destination.must_equal(['new_name'])
+    value(intersection.origin).must_equal(['old_name'])
+    value(intersection.destination).must_equal(['new_name'])
   end
 
   def varchar

data/spec/unit/lhm_spec.rb

@@ -11,9 +11,9 @@ describe Lhm do
   describe 'logger' do
 
     it 'should use the default parameters if no logger explicitly set' do
-      Lhm.logger.must_be_kind_of Logger
-      Lhm.logger.level.must_equal Logger::INFO
-      Lhm.logger.instance_eval { @logdev }.dev.must_equal STDOUT
+      value(Lhm.logger).must_be_kind_of Logger
+      value(Lhm.logger.level).must_equal Logger::INFO
+      value(Lhm.logger.instance_eval { @logdev }.dev).must_equal STDOUT
     end
 
     it 'should use s new logger if set' do
@@ -21,9 +21,9 @@ describe Lhm do
       l.level = Logger::ERROR
       Lhm.logger = l
 
-      Lhm.logger.level.must_equal Logger::ERROR
-      Lhm.logger.instance_eval { @logdev }.dev.must_be_kind_of File
-      Lhm.logger.instance_eval { @logdev }.dev.path.must_equal 'omg.ponies'
+      value(Lhm.logger.level).must_equal Logger::ERROR
+      value(Lhm.logger.instance_eval { @logdev }.dev).must_be_kind_of File
+      value(Lhm.logger.instance_eval { @logdev }.dev.path).must_equal 'omg.ponies'
     end
   end
 end

data/spec/unit/locked_switcher_spec.rb

@@ -20,32 +20,27 @@ describe Lhm::LockedSwitcher do
 
   describe 'uncommitted' do
     it 'should disable autocommit first' do
-      @switcher.
-        statements[0..1].
-        must_equal([
-          'set @lhm_auto_commit = @@session.autocommit',
-          'set session autocommit = 0'
-        ])
+      value(@switcher.statements[0..1]).must_equal([
+        'set @lhm_auto_commit = @@session.autocommit',
+        'set session autocommit = 0'
+      ])
     end
 
     it 'should reapply original autocommit settings at the end' do
-      @switcher.
-        statements[-1].
-        must_equal('set session autocommit = @lhm_auto_commit')
+      value(@switcher.statements[-1])
+        .must_equal('set session autocommit = @lhm_auto_commit')
     end
   end
 
   describe 'switch' do
     it 'should lock origin and destination table, switch, commit and unlock' do
-      @switcher.
-        switch.
-        must_equal([
-          'lock table `origin` write, `destination` write',
-          "alter table `origin` rename `#{ @migration.archive_name }`",
-          'alter table `destination` rename `origin`',
-          'commit',
-          'unlock tables'
-        ])
+      value(@switcher.switch).must_equal([
+        'lock table `origin` write, `destination` write',
+        "alter table `origin` rename `#{ @migration.archive_name }`",
+        'alter table `destination` rename `origin`',
+        'commit',
+        'unlock tables'
+      ])
     end
   end
 end

data/spec/unit/migrator_spec.rb

@@ -18,7 +18,7 @@ describe Lhm::Migrator do
     it 'should add an index' do
       @creator.add_index(:a)
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'create index `index_alt_on_a` on `lhmn_alt` (`a`)'
       ])
     end
@@ -26,7 +26,7 @@ describe Lhm::Migrator do
     it 'should add a composite index' do
       @creator.add_index([:a, :b])
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'create index `index_alt_on_a_and_b` on `lhmn_alt` (`a`, `b`)'
       ])
     end
@@ -34,7 +34,7 @@ describe Lhm::Migrator do
     it 'should add an index with prefix length' do
       @creator.add_index(['a(10)', 'b'])
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'create index `index_alt_on_a_and_b` on `lhmn_alt` (`a`(10), `b`)'
       ])
     end
@@ -42,7 +42,7 @@ describe Lhm::Migrator do
     it 'should add an index with a custom name' do
       @creator.add_index([:a, :b], :custom_index_name)
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'create index `custom_index_name` on `lhmn_alt` (`a`, `b`)'
       ])
     end
@@ -56,7 +56,7 @@ describe Lhm::Migrator do
     it 'should add a unique index' do
       @creator.add_unique_index(['a(5)', :b])
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'create unique index `index_alt_on_a_and_b` on `lhmn_alt` (`a`(5), `b`)'
       ])
     end
@@ -64,7 +64,7 @@ describe Lhm::Migrator do
     it 'should add a unique index with a custom name' do
       @creator.add_unique_index([:a, :b], :custom_index_name)
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'create unique index `custom_index_name` on `lhmn_alt` (`a`, `b`)'
       ])
     end
@@ -78,7 +78,7 @@ describe Lhm::Migrator do
     it 'should remove an index' do
       @creator.remove_index(['b', 'a'])
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'drop index `index_alt_on_b_and_a` on `lhmn_alt`'
       ])
     end
@@ -86,7 +86,7 @@ describe Lhm::Migrator do
     it 'should remove an index with a custom name' do
       @creator.remove_index([:a, :b], :custom_index_name)
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'drop index `custom_index_name` on `lhmn_alt`'
       ])
     end
@@ -96,7 +96,7 @@ describe Lhm::Migrator do
     it 'should add a column' do
       @creator.add_column('logins', 'INT(12)')
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'alter table `lhmn_alt` add column `logins` INT(12)'
       ])
     end
@@ -104,7 +104,7 @@ describe Lhm::Migrator do
     it 'should remove a column' do
       @creator.remove_column('logins')
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'alter table `lhmn_alt` drop `logins`'
       ])
     end
@@ -112,7 +112,7 @@ describe Lhm::Migrator do
     it 'should change a column' do
       @creator.change_column('logins', 'INT(11)')
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'alter table `lhmn_alt` modify column `logins` INT(11)'
       ])
     end
@@ -122,7 +122,7 @@ describe Lhm::Migrator do
     it 'should accept a ddl statement' do
       @creator.ddl('alter table `%s` add column `f` tinyint(1)' % @creator.name)
 
-      @creator.statements.must_equal([
+      value(@creator.statements).must_equal([
         'alter table `lhmn_alt` add column `f` tinyint(1)'
       ])
     end
@@ -132,15 +132,13 @@ describe Lhm::Migrator do
     it 'should add two columns' do
       @creator.add_column('first', 'VARCHAR(64)')
       @creator.add_column('last', 'VARCHAR(64)')
-      @creator.statements.length.must_equal(2)
+      value(@creator.statements.length).must_equal(2)
 
-      @creator.
-        statements[0].
-        must_equal('alter table `lhmn_alt` add column `first` VARCHAR(64)')
+      value(@creator.statements[0])
+        .must_equal('alter table `lhmn_alt` add column `first` VARCHAR(64)')
 
-      @creator.
-        statements[1].
-        must_equal('alter table `lhmn_alt` add column `last` VARCHAR(64)')
+      value(@creator.statements[1])
+        .must_equal('alter table `lhmn_alt` add column `last` VARCHAR(64)')
     end
   end
 end

data/spec/unit/printer_spec.rb

@@ -1,6 +1,9 @@
 require File.expand_path(File.dirname(__FILE__)) + '/unit_helper'
 
 require 'lhm/printer'
+require 'logger'
+
+
 
 describe Lhm::Printer do
   include UnitHelper
@@ -12,24 +15,17 @@ describe Lhm::Printer do
     end
 
     it 'prints the percentage' do
-      mock = MiniTest::Mock.new
+      r, w = IO.pipe
+      Lhm.logger = Logger.new(w)
+
       10.times do |i|
-        mock.expect(:write, :return_value) do |message|
-          message = message.first if message.is_a?(Array)
-          assert_match(/^\r/, message)
-          assert_match(/#{i}\/10/, message)
-        end
+        @printer.notify(i, 10)
+        assert_match(/#{i}\/10/, log_expression_message(r.gets))
       end
-
-      @printer.instance_variable_set(:@output, mock)
-      10.times { |i| @printer.notify(i, 10) }
-      mock.verify
     end
 
     it 'always prints a bigger message' do
       @length = 0
-      printer_mock = mock()
-      printer_mock.expects(:write).at_least_once
 
       def assert_length(printer)
         new_length = printer.instance_variable_get(:@max_length)
@@ -37,7 +33,6 @@ describe Lhm::Printer do
         @length = new_length
       end
 
-      @printer.instance_variable_set(:@output, printer_mock)
       @printer.notify(10, 100)
       assert_length(@printer)
       @printer.notify(0, 100)
@@ -51,27 +46,20 @@ describe Lhm::Printer do
     end
 
     it 'prints the end message' do
-      mock = MiniTest::Mock.new
-      mock.expect(:write, :return_value, [String])
-      mock.expect(:write, :return_value, ["\n"])
-
-      @printer.instance_variable_set(:@output, mock)
+      r, w = IO.pipe
+      Lhm.logger = Logger.new(w)
       @printer.end
 
-      mock.verify
+      assert_equal(log_expression_message(r.gets), "100% complete\n")
     end
 
     it 'prints the exception message' do
-      mock = MiniTest::Mock.new
-      mock.expect(:write, :return_value, ["\rfailed: woops"])
-      mock.expect(:write, :return_value, ["\n"])
-
+      r, w = IO.pipe
+      Lhm.logger = Logger.new(w)
       e = StandardError.new('woops')
-
-      @printer.instance_variable_set(:@output, mock)
       @printer.exception(e)
 
-      mock.verify
+      assert_equal(log_expression_message(r.gets), "failed: #{e}\n")
     end
   end
 

data/spec/unit/sql_helper_spec.rb

@@ -7,26 +7,22 @@ require 'lhm/sql_helper'
 
 describe Lhm::SqlHelper do
   it 'should name index with a single column' do
-    Lhm::SqlHelper.
-      idx_name(:users, :name).
-      must_equal('index_users_on_name')
+    value(Lhm::SqlHelper.idx_name(:users, :name))
+      .must_equal('index_users_on_name')
   end
 
   it 'should name index with multiple columns' do
-    Lhm::SqlHelper.
-      idx_name(:users, [:name, :firstname]).
-      must_equal('index_users_on_name_and_firstname')
+    value(Lhm::SqlHelper.idx_name(:users, [:name, :firstname]))
+      .must_equal('index_users_on_name_and_firstname')
   end
 
   it 'should name index with prefixed column' do
-    Lhm::SqlHelper.
-      idx_name(:tracks, ['title(10)', 'album']).
-      must_equal('index_tracks_on_title_and_album')
+    value(Lhm::SqlHelper.idx_name(:tracks, ['title(10)', 'album']))
+      .must_equal('index_tracks_on_title_and_album')
   end
 
   it 'should quote column names in index specification' do
-    Lhm::SqlHelper.
-      idx_spec(['title(10)', 'album']).
-      must_equal('`title`(10), `album`')
+    value(Lhm::SqlHelper.idx_spec(['title(10)', 'album']))
+      .must_equal('`title`(10), `album`')
   end
 end

data/spec/unit/table_spec.rb

@@ -11,7 +11,7 @@ describe Lhm::Table do
   describe 'names' do
     it 'should name destination' do
       @table = Lhm::Table.new('users')
-      @table.destination_name.must_equal 'lhmn_users'
+      value(@table.destination_name).must_equal 'lhmn_users'
     end
   end
 
@@ -23,25 +23,25 @@ describe Lhm::Table do
     it 'should be satisfied with a single column primary key called id' do
       @table = Lhm::Table.new('table', 'id')
       set_columns(@table, { 'id' => { :type => 'int(1)' } })
-      @table.satisfies_id_column_requirement?.must_equal true
+      value(@table.satisfies_id_column_requirement?).must_equal true
     end
 
     it 'should be satisfied with a primary key not called id, as long as there is still an id' do
       @table = Lhm::Table.new('table', 'uuid')
       set_columns(@table, { 'id' => { :type => 'int(1)' } })
-      @table.satisfies_id_column_requirement?.must_equal true
+      value(@table.satisfies_id_column_requirement?).must_equal true
     end
 
     it 'should be satisifed if display attributes are not present (deprecated in mysql 8)' do
       @table = Lhm::Table.new('table', 'id')
       set_columns(@table, { 'id' => { :type => 'int' } })
-      @table.satisfies_id_column_requirement?.must_equal true
+      value(@table.satisfies_id_column_requirement?).must_equal true
     end
 
     it 'should not be satisfied if id is not numeric' do
       @table = Lhm::Table.new('table', 'id')
       set_columns(@table, { 'id' => { :type => 'varchar(255)' } })
-      @table.satisfies_id_column_requirement?.must_equal false
+      value(@table.satisfies_id_column_requirement?).must_equal false
     end
   end
 end

data/spec/unit/throttler_spec.rb

@@ -23,11 +23,11 @@ describe Lhm::Throttler do
       end
 
       it 'instantiates the time throttle' do
-        @mock.throttler.class.must_equal Lhm::Throttler::Time
+        value(@mock.throttler.class).must_equal Lhm::Throttler::Time
       end
 
       it 'returns 2 seconds as time' do
-        @mock.throttler.timeout_seconds.must_equal 2
+        value(@mock.throttler.timeout_seconds).must_equal 2
       end
     end
 
@@ -37,11 +37,11 @@ describe Lhm::Throttler do
       end
 
       it 'instantiates the slave_lag throttle' do
-        @mock.throttler.class.must_equal Lhm::Throttler::SlaveLag
+        value(@mock.throttler.class).must_equal Lhm::Throttler::SlaveLag
       end
 
       it 'returns 20 seconds as allowed_lag' do
-        @mock.throttler.allowed_lag.must_equal 20
+        value(@mock.throttler.allowed_lag).must_equal 20
       end
     end
 
@@ -58,11 +58,11 @@ describe Lhm::Throttler do
       end
 
       it 'returns the instace given' do
-        @mock.throttler.must_equal @instance
+        value(@mock.throttler).must_equal @instance
       end
 
       it 'returns 0 seconds as time' do
-        @mock.throttler.timeout_seconds.must_equal 0
+        value(@mock.throttler.timeout_seconds).must_equal 0
       end
     end
 
@@ -78,11 +78,11 @@ describe Lhm::Throttler do
       end
 
       it 'returns the instace given' do
-        @mock.throttler.must_equal @instance
+        value(@mock.throttler).must_equal @instance
       end
 
       it 'returns 0 seconds as time' do
-        @mock.throttler.timeout_seconds.must_equal 0
+        value(@mock.throttler.timeout_seconds).must_equal 0
       end
     end
 
@@ -94,7 +94,7 @@ describe Lhm::Throttler do
       end
 
       it 'has the same class as given' do
-        @mock.throttler.class.must_equal @klass
+        value(@mock.throttler.class).must_equal @klass
       end
     end
 
@@ -106,7 +106,7 @@ describe Lhm::Throttler do
       end
 
       it 'has the same class as given' do
-        @mock.throttler.class.must_equal @klass
+        value(@mock.throttler.class).must_equal @klass
       end
     end
   end
@@ -114,11 +114,11 @@ describe Lhm::Throttler do
   describe '#throttler' do
 
     it 'returns the default Time based' do
-      @mock.throttler.class.must_equal Lhm::Throttler::Time
+      value(@mock.throttler.class).must_equal Lhm::Throttler::Time
     end
 
     it 'should default to 100 milliseconds' do
-      @mock.throttler.timeout_seconds.must_equal 0.1
+      value(@mock.throttler.timeout_seconds).must_equal 0.1
     end
   end
 end

data/spec/unit/unit_helper.rb

@@ -3,6 +3,8 @@
 require 'test_helper'
 
 module UnitHelper
+  LOG_EXPRESSION = /([\w]+),\s+\[([^\]\s]+)\s+#([^\]]+)]\s+(\w+)\s+--\s+(\w+)?:\s+(.+)/
+
   def fixture(name)
     File.read $fixtures.join(name)
   end
@@ -10,4 +12,15 @@ module UnitHelper
   def strip(sql)
     sql.strip.gsub(/\n */, "\n")
   end
+
+  def log_expression_message(msg)
+    msg.gsub(LOG_EXPRESSION) do |match|
+      severity  = $1
+      date      = $2
+      pid       = $3
+      label     = $4
+      app       = $5
+      message   = $6
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm-shopify
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.4.2
 platform: ruby
 authors:
 - SoundCloud
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
@@ -141,6 +141,7 @@ files:
 - gemfiles/ar-4.2_mysql2.gemfile
 - gemfiles/ar-5.0_mysql2.gemfile
 - lhm.gemspec
+- lib/lhm-shopify.rb
 - lib/lhm.rb
 - lib/lhm/atomic_switcher.rb
 - lib/lhm/chunk_finder.rb
@@ -172,7 +173,9 @@ files:
 - spec/README.md
 - spec/fixtures/bigint_table.ddl
 - spec/fixtures/composite_primary_key.ddl
+- spec/fixtures/composite_primary_key_dest.ddl
 - spec/fixtures/custom_primary_key.ddl
+- spec/fixtures/custom_primary_key_dest.ddl
 - spec/fixtures/destination.ddl
 - spec/fixtures/lines.ddl
 - spec/fixtures/origin.ddl