lhm 2.1.0 → 2.2.0

data/spec/integration/locked_switcher_spec.rb

@@ -12,30 +12,30 @@ describe Lhm::LockedSwitcher do
 
   before(:each) { connect_master! }
 
-  describe "switching" do
+  describe 'switching' do
     before(:each) do
-      @origin = table_create("origin")
-      @destination = table_create("destination")
+      @origin = table_create('origin')
+      @destination = table_create('destination')
       @migration = Lhm::Migration.new(@origin, @destination)
     end
 
-    it "rename origin to archive" do
+    it 'rename origin to archive' do
       switcher = Lhm::LockedSwitcher.new(@migration, connection)
       switcher.run
 
       slave do
         table_exists?(@origin).must_equal true
-        table_read(@migration.archive_name).columns.keys.must_include "origin"
+        table_read(@migration.archive_name).columns.keys.must_include 'origin'
       end
     end
 
-    it "rename destination to origin" do
+    it 'rename destination to origin' do
       switcher = Lhm::LockedSwitcher.new(@migration, connection)
       switcher.run
 
       slave do
         table_exists?(@destination).must_equal false
-        table_read(@origin.name).columns.keys.must_include "destination"
+        table_read(@origin.name).columns.keys.must_include 'destination'
       end
     end
   end

data/spec/integration/table_spec.rb

@@ -8,38 +8,38 @@ describe Lhm::Table do
   include IntegrationHelper
 
   describe Lhm::Table::Parser do
-    describe "create table parsing" do
+    describe 'create table parsing' do
       before(:each) do
         connect_master!
         @table = table_create(:users)
       end
 
-      it "should parse table name in show create table" do
-        @table.name.must_equal("users")
+      it 'should parse table name in show create table' do
+        @table.name.must_equal('users')
       end
 
-      it "should parse primary key" do
-        @table.pk.must_equal("id")
+      it 'should parse primary key' do
+        @table.pk.must_equal('id')
       end
 
-      it "should parse column type in show create table" do
-        @table.columns["username"][:type].must_equal("varchar(255)")
+      it 'should parse column type in show create table' do
+        @table.columns['username'][:type].must_equal('varchar(255)')
       end
 
-      it "should parse column metadata" do
-        @table.columns["username"][:column_default].must_equal nil
+      it 'should parse column metadata' do
+        @table.columns['username'][:column_default].must_equal nil
       end
 
-      it "should parse indices" do
+      it 'should parse indices' do
         @table.
-          indices["index_users_on_username_and_created_at"].
-          must_equal(["username", "created_at"])
+          indices['index_users_on_username_and_created_at'].
+          must_equal(['username', 'created_at'])
       end
 
-      it "should parse index" do
+      it 'should parse index' do
         @table.
-          indices["index_users_on_reference"].
-          must_equal(["reference"])
+          indices['index_users_on_reference'].
+          must_equal(['reference'])
       end
     end
   end

data/spec/test_helper.rb

@@ -4,12 +4,12 @@
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'minitest/mock'
-require "pathname"
-require "lhm"
+require 'pathname'
+require 'lhm'
 
 $project = Pathname.new(File.dirname(__FILE__) + '/..').cleanpath
-$spec = $project.join("spec")
-$fixtures = $spec.join("fixtures")
+$spec = $project.join('spec')
+$fixtures = $spec.join('fixtures')
 
 begin
   require 'active_record'

data/spec/unit/atomic_switcher_spec.rb

@@ -12,19 +12,19 @@ describe Lhm::AtomicSwitcher do
 
   before(:each) do
     @start       = Time.now
-    @origin      = Lhm::Table.new("origin")
-    @destination = Lhm::Table.new("destination")
+    @origin      = Lhm::Table.new('origin')
+    @destination = Lhm::Table.new('destination')
     @migration   = Lhm::Migration.new(@origin, @destination, @start)
     @switcher    = Lhm::AtomicSwitcher.new(@migration, nil)
   end
 
-  describe "atomic switch" do
-    it "should perform a single atomic rename" do
+  describe 'atomic switch' do
+    it 'should perform a single atomic rename' do
       @switcher.
         statements.
         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

@@ -12,14 +12,14 @@ describe Lhm::Chunker do
   include UnitHelper
 
   before(:each) do
-    @origin = Lhm::Table.new("foo")
-    @destination = Lhm::Table.new("bar")
+    @origin = Lhm::Table.new('foo')
+    @destination = Lhm::Table.new('bar')
     @migration = Lhm::Migration.new(@origin, @destination)
     @connection = MiniTest::Mock.new
     # This is a poor man's stub
     @throttler = Object.new
     def @throttler.run
-      #noop
+      # noop
     end
     def @throttler.stride
       1
@@ -29,8 +29,8 @@ describe Lhm::Chunker do
                                                          :limit     => 10)
   end
 
-  describe "#run" do
-    it "chunks the result set according to the stride size" do
+  describe '#run' do
+    it 'chunks the result set according to the stride size' do
       def @throttler.stride
         2
       end
@@ -55,8 +55,8 @@ describe Lhm::Chunker do
       @connection.verify
     end
 
-    it "handles stride changes during execution" do
-      #roll our own stubbing
+    it 'handles stride changes during execution' do
+      # roll our own stubbing
       def @throttler.stride
         @run_count ||= 0
         @run_count = @run_count + 1
@@ -84,7 +84,20 @@ describe Lhm::Chunker do
       @connection.verify
     end
 
-    it "separates filter conditions from chunking conditions" do
+    it 'correctly copies single record tables' do
+      @chunker = Lhm::Chunker.new(@migration, @connection, :throttler => @throttler,
+                                                           :start     => 1,
+                                                           :limit     => 1)
+
+      @connection.expect(:update, 1) do |stmt|
+        stmt.first =~ /between 1 and 1/
+      end
+
+      @chunker.run
+      @connection.verify
+    end
+
+    it 'separates filter conditions from chunking conditions' do
       @chunker = Lhm::Chunker.new(@migration, @connection, :throttler => @throttler,
                                                            :start     => 1,
                                                            :limit     => 2)
@@ -110,7 +123,7 @@ describe Lhm::Chunker do
       end
 
       def @migration.conditions
-        "inner join bar on foo.id = bar.foo_id"
+        'inner join bar on foo.id = bar.foo_id'
       end
 
       @chunker.run

data/spec/unit/entangler_spec.rb

@@ -11,44 +11,44 @@ describe Lhm::Entangler do
   include UnitHelper
 
   before(:each) do
-    @origin = Lhm::Table.new("origin")
-    @destination = Lhm::Table.new("destination")
+    @origin = Lhm::Table.new('origin')
+    @destination = Lhm::Table.new('destination')
     @migration = Lhm::Migration.new(@origin, @destination)
     @entangler = Lhm::Entangler.new(@migration)
   end
 
-  describe "activation" do
+  describe 'activation' do
     before(:each) do
-      @origin.columns["info"] = { :type => "varchar(255)" }
-      @origin.columns["tags"] = { :type => "varchar(255)" }
+      @origin.columns['info'] = { :type => 'varchar(255)' }
+      @origin.columns['tags'] = { :type => 'varchar(255)' }
 
-      @destination.columns["info"] = { :type => "varchar(255)" }
-      @destination.columns["tags"] = { :type => "varchar(255)" }
+      @destination.columns['info'] = { :type => 'varchar(255)' }
+      @destination.columns['tags'] = { :type => 'varchar(255)' }
     end
 
-    it "should create insert trigger to destination table" do
+    it 'should create insert trigger to destination table' do
       ddl = %Q{
         create trigger `lhmt_ins_origin`
         after insert on `origin` for each row
         replace into `destination` (`info`, `tags`) /* large hadron migration */
-        values (NEW.`info`, NEW.`tags`)
+        values (`NEW`.`info`, `NEW`.`tags`)
       }
 
       @entangler.entangle.must_include strip(ddl)
     end
 
-    it "should create an update trigger to the destination table" do
+    it 'should create an update trigger to the destination table' do
       ddl = %Q{
         create trigger `lhmt_upd_origin`
         after update on `origin` for each row
         replace into `destination` (`info`, `tags`) /* large hadron migration */
-        values (NEW.`info`, NEW.`tags`)
+        values (`NEW`.`info`, `NEW`.`tags`)
       }
 
       @entangler.entangle.must_include strip(ddl)
     end
 
-    it "should create a delete trigger to the destination table" do
+    it 'should create a delete trigger to the destination table' do
       ddl = %Q{
         create trigger `lhmt_del_origin`
         after delete on `origin` for each row
@@ -60,17 +60,17 @@ describe Lhm::Entangler do
     end
   end
 
-  describe "removal" do
-    it "should remove insert trigger" do
-      @entangler.untangle.must_include("drop trigger if exists `lhmt_ins_origin`")
+  describe 'removal' do
+    it 'should remove insert trigger' do
+      @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`")
+    it 'should remove update trigger' do
+      @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`")
+    it 'should remove delete trigger' do
+      @entangler.untangle.must_include('drop trigger if exists `lhmt_del_origin`')
     end
   end
 end

data/spec/unit/intersection_spec.rb

@@ -9,31 +9,43 @@ require 'lhm/migrator'
 describe Lhm::Intersection do
   include UnitHelper
 
-  it "should not have dropped changes" do
-    origin = Lhm::Table.new("origin")
-    origin.columns["dropped"]  = varchar
-    origin.columns["retained"] = varchar
+  it 'should not have dropped changes' do
+    origin = Lhm::Table.new('origin')
+    origin.columns['dropped']  = varchar
+    origin.columns['retained'] = varchar
 
-    destination = Lhm::Table.new("destination")
-    destination.columns["retained"] = varchar
+    destination = Lhm::Table.new('destination')
+    destination.columns['retained'] = varchar
 
     intersection = Lhm::Intersection.new(origin, destination)
-    intersection.common.include?("dropped").must_equal(false)
+    intersection.destination.include?('dropped').must_equal(false)
   end
 
-  it "should have unchanged columns" do
-    origin = Lhm::Table.new("origin")
-    origin.columns["dropped"]  = varchar
-    origin.columns["retained"] = varchar
+  it 'should have unchanged columns' do
+    origin = Lhm::Table.new('origin')
+    origin.columns['dropped']  = varchar
+    origin.columns['retained'] = varchar
 
-    destination = Lhm::Table.new("destination")
-    destination.columns["retained"] = varchar
+    destination = Lhm::Table.new('destination')
+    destination.columns['retained'] = varchar
 
     intersection = Lhm::Intersection.new(origin, destination)
-    intersection.common.must_equal(["retained"])
+    intersection.destination.must_equal(['retained'])
+  end
+
+  it 'should have renamed columns' do
+    origin = Lhm::Table.new('origin')
+    origin.columns['old_name']  = varchar
+
+    destination = Lhm::Table.new('destination')
+    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'])
   end
 
   def varchar
-    { :metadata => "VARCHAR(255)"}
+    { :metadata => 'VARCHAR(255)' }
   end
 end

data/spec/unit/lhm_spec.rb

@@ -8,22 +8,22 @@ describe Lhm do
     Lhm.remove_class_variable :@@logger if Lhm.class_variable_defined? :@@logger
   end
 
-  describe "logger" do
+  describe 'logger' do
 
-    it "should use the default parameters if no logger explicitly set" 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
+      Lhm.logger.instance_eval { @logdev }.dev.must_equal STDOUT
     end
 
-    it "should use s new logger if set" do
+    it 'should use s new logger if set' do
       l = Logger.new('omg.ponies')
       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'
+      Lhm.logger.instance_eval { @logdev }.dev.must_be_kind_of File
+      Lhm.logger.instance_eval { @logdev }.dev.path.must_equal 'omg.ponies'
     end
   end
 end

data/spec/unit/locked_switcher_spec.rb

@@ -12,39 +12,39 @@ describe Lhm::LockedSwitcher do
 
   before(:each) do
     @start       = Time.now
-    @origin      = Lhm::Table.new("origin")
-    @destination = Lhm::Table.new("destination")
+    @origin      = Lhm::Table.new('origin')
+    @destination = Lhm::Table.new('destination')
     @migration   = Lhm::Migration.new(@origin, @destination, @start)
     @switcher    = Lhm::LockedSwitcher.new(@migration, nil)
   end
 
-  describe "uncommitted" do
-    it "should disable autocommit first" 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"
+          'set @lhm_auto_commit = @@session.autocommit',
+          'set session autocommit = 0'
         ])
     end
 
-    it "should reapply original autocommit settings at the end" do
+    it 'should reapply original autocommit settings at the end' do
       @switcher.
         statements[-1].
-        must_equal("set session autocommit = @lhm_auto_commit")
+        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
+  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",
+          'lock table `origin` write, `destination` write',
           "alter table `origin` rename `#{ @migration.archive_name }`",
-          "alter table `destination` rename `origin`",
-          "commit",
-          "unlock tables"
+          'alter table `destination` rename `origin`',
+          'commit',
+          'unlock tables'
         ])
     end
   end

data/spec/unit/migration_spec.rb

@@ -11,18 +11,18 @@ describe Lhm::Migration do
 
   before(:each) do
     @start = Time.now
-    @origin = Lhm::Table.new("origin")
-    @destination = Lhm::Table.new("destination")
+    @origin = Lhm::Table.new('origin')
+    @destination = Lhm::Table.new('destination')
     @migration = Lhm::Migration.new(@origin, @destination, nil, @start)
   end
 
-  it "should name archive" do
-    stamp = "%Y_%m_%d_%H_%M_%S_#{ "%03d" % (@start.usec / 1000) }"
+  it 'should name archive' do
+    stamp = "%Y_%m_%d_%H_%M_%S_#{ '%03d' % (@start.usec / 1000) }"
     @migration.archive_name.must_equal "lhma_#{ @start.strftime(stamp) }_origin"
   end
 
-  it "should limit table name to 64 characters" do
-    migration = Lhm::Migration.new(OpenStruct.new(:name => "a_very_very_long_table_name_that_should_make_the_LHMA_table_go_over_64_chars"), nil)
+  it 'should limit table name to 64 characters' do
+    migration = Lhm::Migration.new(OpenStruct.new(:name => 'a_very_very_long_table_name_that_should_make_the_LHMA_table_go_over_64_chars'), nil)
     migration.archive_name.size == 64
   end
 end