lhm 2.1.0 → 2.2.0

data/lib/lhm/printer.rb

@@ -1,6 +1,5 @@
 module Lhm
   module Printer
-
     class Output
       def write(message)
         print message
@@ -8,14 +7,12 @@ module Lhm
     end
 
     class Base
-
       def initialize
         @output = Output.new
       end
     end
 
     class Percentage < Base
-
       def initialize
         super
         @max_length = 0
@@ -28,24 +25,25 @@ module Lhm
       end
 
       def end
-        write("100% complete")
+        write('100% complete')
         @output.write "\n"
       end
 
       private
+
       def write(message)
         if (extra = @max_length - message.length) < 0
           @max_length = message.length
           extra = 0
         end
 
-        @output.write "\r#{message}" + (" " * extra)
+        @output.write "\r#{message}" + (' ' * extra)
       end
     end
 
     class Dot < Base
       def notify(lowest = nil, highest = nil)
-        @output.write "."
+        @output.write '.'
       end
 
       def end

data/lib/lhm/sql_helper.rb

@@ -6,12 +6,12 @@ module Lhm
     extend self
 
     def annotation
-      "/* large hadron migration */"
+      '/* large hadron migration */'
     end
 
     def idx_name(table_name, cols)
       column_names = column_definition(cols).map(&:first)
-      "index_#{ table_name }_on_#{ column_names.join("_and_") }"
+      "index_#{ table_name }_on_#{ column_names.join('_and_') }"
     end
 
     def idx_spec(cols)
@@ -22,7 +22,7 @@ module Lhm
 
     def version_string
       row = connection.select_one("show variables like 'version'")
-      value = struct_key(row, "Value")
+      value = struct_key(row, 'Value')
       row[value]
     end
 
@@ -71,7 +71,7 @@ module Lhm
                struct.members
              end
 
-      keys.find {|k| k.to_s.downcase == key.to_s.downcase }
+      keys.find { |k| k.to_s.downcase == key.to_s.downcase }
     end
   end
 end

data/lib/lhm/table.rb

@@ -7,7 +7,7 @@ module Lhm
   class Table
     attr_reader :name, :columns, :indices, :pk, :ddl
 
-    def initialize(name, pk = "id", ddl = nil)
+    def initialize(name, pk = 'id', ddl = nil)
       @name = name
       @columns = {}
       @indices = {}
@@ -16,7 +16,7 @@ module Lhm
     end
 
     def satisfies_primary_key?
-      @pk == "id"
+      @pk == 'id'
     end
 
     def destination_name
@@ -45,10 +45,10 @@ module Lhm
 
         Table.new(@table_name, extract_primary_key(schema), ddl).tap do |table|
           schema.each do |defn|
-            column_name    = struct_key(defn, "COLUMN_NAME")
-            column_type    = struct_key(defn, "COLUMN_TYPE")
-            is_nullable    = struct_key(defn, "IS_NULLABLE")
-            column_default = struct_key(defn, "COLUMN_DEFAULT")
+            column_name    = struct_key(defn, 'COLUMN_NAME')
+            column_type    = struct_key(defn, 'COLUMN_TYPE')
+            is_nullable    = struct_key(defn, 'IS_NULLABLE')
+            column_default = struct_key(defn, 'COLUMN_DEFAULT')
             table.columns[defn[column_name]] = {
               :type => defn[column_type],
               :is_nullable => defn[is_nullable],
@@ -83,11 +83,11 @@ module Lhm
       def extract_indices(indices)
         indices.
           map do |row|
-            key_name = struct_key(row, "Key_name")
-            column_name = struct_key(row, "COLUMN_NAME")
+            key_name = struct_key(row, 'Key_name')
+            column_name = struct_key(row, 'COLUMN_NAME')
             [row[key_name], row[column_name]]
           end.
-          inject(Hash.new { |h, k| h[k] = []}) do |memo, (idx, column)|
+          inject(Hash.new { |h, k| h[k] = [] }) do |memo, (idx, column)|
             memo[idx] << column
             memo
           end
@@ -95,12 +95,12 @@ module Lhm
 
       def extract_primary_key(schema)
         cols = schema.select do |defn|
-          column_key = struct_key(defn, "COLUMN_KEY")
-          defn[column_key] == "PRI"
+          column_key = struct_key(defn, 'COLUMN_KEY')
+          defn[column_key] == 'PRI'
         end
 
         keys = cols.map do |defn|
-          column_name = struct_key(defn, "COLUMN_NAME")
+          column_name = struct_key(defn, 'COLUMN_NAME')
           defn[column_name]
         end
 

data/lib/lhm/version.rb

@@ -2,5 +2,5 @@
 # Schmidt
 
 module Lhm
-  VERSION = "2.1.0"
+  VERSION = '2.2.0'
 end

data/spec/fixtures/users.ddl

@@ -2,7 +2,7 @@ CREATE TABLE `users` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `reference` int(11) DEFAULT NULL,
   `username` varchar(255) DEFAULT NULL,
-  `group` varchar(255) DEFAULT NULL,
+  `group` varchar(255) DEFAULT 'Superfriends',
   `created_at` datetime DEFAULT NULL,
   `comment` varchar(20) DEFAULT NULL,
   `description` text,

data/spec/integration/atomic_switcher_spec.rb

@@ -12,30 +12,30 @@ describe Lhm::AtomicSwitcher 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::AtomicSwitcher.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::AtomicSwitcher.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/chunker_spec.rb

@@ -10,14 +10,14 @@ describe Lhm::Chunker do
 
   before(:each) { connect_master! }
 
-  describe "copying" do
+  describe 'copying' do
     before(:each) do
       @origin = table_create(:origin)
       @destination = table_create(:destination)
       @migration = Lhm::Migration.new(@origin, @destination)
     end
 
-    it "should copy 23 rows from origin to destination" do
+    it 'should copy 23 rows from origin to destination' do
       23.times { |n| execute("insert into origin set id = '#{ n * n + 23 }'") }
 
       printer = MiniTest::Mock.new

data/spec/integration/cleanup_spec.rb

@@ -3,11 +3,11 @@
 
 require File.expand_path(File.dirname(__FILE__)) + '/integration_helper'
 
-describe Lhm, "cleanup" do
+describe Lhm, 'cleanup' do
   include IntegrationHelper
   before(:each) { connect_master! }
 
-  describe "changes" do
+  describe 'changes' do
     before(:each) do
       table_create(:users)
       simulate_failed_migration do
@@ -22,25 +22,49 @@ describe Lhm, "cleanup" do
       Lhm.cleanup(true)
     end
 
-    it "should show temporary tables" do
+    it 'should show temporary tables' do
       output = capture_stdout do
         Lhm.cleanup
       end
-      output.must_include("Existing LHM backup tables")
+      output.must_include('Existing LHM backup tables')
       output.must_match(/lhma_[0-9_]*_users/)
     end
 
-    it "should show temporary triggers" do
+    it 'should show temporary tables within range' do
+      table = OpenStruct.new(:name => 'users')
+      table_name = Lhm::Migration.new(table, nil, nil, {}, Time.now - 172800).archive_name
+      table_rename(:users, table_name)
+
+      output = capture_stdout do
+        Lhm.cleanup false, { :until => Time.now - 86400 }
+      end
+      output.must_include('Existing LHM backup tables')
+      output.must_match(/lhma_[0-9_]*_users/)
+    end
+
+    it 'should exclude temporary tables outside range' do
+      table = OpenStruct.new(:name => 'users')
+      table_name = Lhm::Migration.new(table, nil, nil, {}, Time.now).archive_name
+      table_rename(:users, table_name)
+
+      output = capture_stdout do
+        Lhm.cleanup false, { :until => Time.now - 172800 }
+      end
+      output.must_include('Existing LHM backup tables')
+      output.wont_match(/lhma_[0-9_]*_users/)
+    end
+
+    it 'should show temporary triggers' do
       output = capture_stdout do
         Lhm.cleanup
       end
-      output.must_include("Existing LHM triggers")
-      output.must_include("lhmt_ins_users")
-      output.must_include("lhmt_del")
-      output.must_include("lhmt_upd_users")
+      output.must_include('Existing LHM triggers')
+      output.must_include('lhmt_ins_users')
+      output.must_include('lhmt_del')
+      output.must_include('lhmt_upd_users')
     end
 
-    it "should delete temporary tables" do
+    it 'should delete temporary tables' do
       Lhm.cleanup(true).must_equal(true)
       Lhm.cleanup.must_equal(true)
     end

data/spec/integration/entangler_spec.rb

@@ -12,25 +12,25 @@ describe Lhm::Entangler do
 
   before(:each) { connect_master! }
 
-  describe "entanglement" do
+  describe 'entanglement' 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)
       @entangler = Lhm::Entangler.new(@migration, connection)
     end
 
-    it "should replay inserts from origin into destination" do
+    it 'should replay inserts from origin into destination' do
       @entangler.run do |entangler|
         execute("insert into origin (common) values ('inserted')")
       end
 
       slave do
-        count(:destination, "common", "inserted").must_equal(1)
+        count(:destination, 'common', 'inserted').must_equal(1)
       end
     end
 
-    it "should replay deletes from origin into destination" do
+    it 'should replay deletes from origin into destination' do
       execute("insert into origin (common) values ('inserted')")
 
       @entangler.run do |entangler|
@@ -38,28 +38,28 @@ describe Lhm::Entangler do
       end
 
       slave do
-        count(:destination, "common", "inserted").must_equal(0)
+        count(:destination, 'common', 'inserted').must_equal(0)
       end
     end
 
-    it "should replay updates from origin into destination" do
+    it 'should replay updates from origin into destination' do
       @entangler.run do |entangler|
         execute("insert into origin (common) values ('inserted')")
         execute("update origin set common = 'updated'")
       end
 
       slave do
-        count(:destination, "common", "updated").must_equal(1)
+        count(:destination, 'common', 'updated').must_equal(1)
       end
     end
 
-    it "should remove entanglement" do
+    it 'should remove entanglement' do
       @entangler.run {}
 
       execute("insert into origin (common) values ('inserted')")
 
       slave do
-        count(:destination, "common", "inserted").must_equal(0)
+        count(:destination, 'common', 'inserted').must_equal(0)
       end
     end
   end

data/spec/integration/integration_helper.rb

@@ -2,7 +2,11 @@
 # Schmidt
 require 'test_helper'
 require 'yaml'
-$password = YAML.load_file(File.expand_path(File.dirname(__FILE__)) + "/database.yml")["password"] rescue nil
+begin
+  require 'active_support'
+rescue LoadError
+end
+$password = YAML.load_file(File.expand_path(File.dirname(__FILE__)) + '/database.yml')['password'] rescue nil
 
 require 'lhm/table'
 require 'lhm/sql_helper'
@@ -82,7 +86,6 @@ module IntegrationHelper
       connect_master!
     end
 
-
     yield block
 
     if master_slave_mode?
@@ -104,6 +107,10 @@ module IntegrationHelper
     table_read(fixture_name)
   end
 
+  def table_rename(from_name, to_name)
+    execute "rename table `#{ from_name }` to `#{ to_name }`"
+  end
+
   def table_read(fixture_name)
     Lhm::Table.parse(fixture_name, @connection)
   end
@@ -147,7 +154,7 @@ module IntegrationHelper
   #
 
   def master_slave_mode?
-    !!ENV["MASTER_SLAVE"]
+    !!ENV['MASTER_SLAVE']
   end
 
   #

data/spec/integration/lhm_spec.rb

@@ -8,44 +8,44 @@ describe Lhm do
 
   before(:each) { connect_master! }
 
-  describe "changes" do
+  describe 'changes' do
     before(:each) do
       table_create(:users)
       table_create(:tracks)
       table_create(:permissions)
     end
 
-    describe "when providing a subset of data to copy" do
+    describe 'when providing a subset of data to copy' do
 
       before do
-        execute("insert into tracks set id = 13, public = 0")
+        execute('insert into tracks set id = 13, public = 0')
         11.times { |n| execute("insert into tracks set id = #{n + 1}, public = 1") }
         11.times { |n| execute("insert into permissions set track_id = #{n + 1}") }
 
         Lhm.change_table(:permissions, :atomic_switch => false) do |t|
-          t.filter("inner join tracks on tracks.`id` = permissions.`track_id` and tracks.`public` = 1")
+          t.filter('inner join tracks on tracks.`id` = permissions.`track_id` and tracks.`public` = 1')
         end
       end
 
-      describe "when no additional data is inserted into the table" do
+      describe 'when no additional data is inserted into the table' do
 
-        it "migrates the existing data" do
+        it 'migrates the existing data' do
           slave do
             count_all(:permissions).must_equal(11)
           end
         end
       end
 
-      describe "when additional data is inserted" do
+      describe 'when additional data is inserted' do
 
         before do
-          execute("insert into tracks set id = 14, public = 0")
-          execute("insert into tracks set id = 15, public = 1")
-          execute("insert into permissions set track_id = 14")
-          execute("insert into permissions set track_id = 15")
+          execute('insert into tracks set id = 14, public = 0')
+          execute('insert into tracks set id = 15, public = 1')
+          execute('insert into permissions set track_id = 14')
+          execute('insert into permissions set track_id = 15')
         end
 
-        it "migrates all data" do
+        it 'migrates all data' do
           slave do
             count_all(:permissions).must_equal(13)
           end
@@ -53,21 +53,21 @@ describe Lhm do
       end
     end
 
-    it "should add a column" do
+    it 'should add a column' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.add_column(:logins, "INT(12) DEFAULT '0'")
       end
 
       slave do
-        table_read(:users).columns["logins"].must_equal({
-          :type => "int(12)",
-          :is_nullable => "YES",
+        table_read(:users).columns['logins'].must_equal({
+          :type => 'int(12)',
+          :is_nullable => 'YES',
           :column_default => '0'
         })
       end
     end
 
-    it "should copy all rows" do
+    it 'should copy all rows' do
       23.times { |n| execute("insert into users set reference = '#{ n }'") }
 
       Lhm.change_table(:users, :atomic_switch => false) do |t|
@@ -79,17 +79,17 @@ describe Lhm do
       end
     end
 
-    it "should remove a column" do
+    it 'should remove a column' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.remove_column(:comment)
       end
 
       slave do
-        table_read(:users).columns["comment"].must_equal nil
+        table_read(:users).columns['comment'].must_equal nil
       end
     end
 
-    it "should add an index" do
+    it 'should add an index' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.add_index([:comment, :created_at])
       end
@@ -99,7 +99,7 @@ describe Lhm do
       end
     end
 
-    it "should add an index with a custom name" do
+    it 'should add an index with a custom name' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.add_index([:comment, :created_at], :my_index_name)
       end
@@ -109,7 +109,7 @@ describe Lhm do
       end
     end
 
-    it "should add an index on a column with a reserved name" do
+    it 'should add an index on a column with a reserved name' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.add_index(:group)
       end
@@ -119,7 +119,7 @@ describe Lhm do
       end
     end
 
-    it "should add a unqiue index" do
+    it 'should add a unqiue index' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.add_unique_index(:comment)
       end
@@ -129,7 +129,7 @@ describe Lhm do
       end
     end
 
-    it "should remove an index" do
+    it 'should remove an index' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.remove_index([:username, :created_at])
       end
@@ -139,7 +139,7 @@ describe Lhm do
       end
     end
 
-    it "should remove an index with a custom name" do
+    it 'should remove an index with a custom name' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.remove_index([:username, :group])
       end
@@ -149,7 +149,7 @@ describe Lhm do
       end
     end
 
-    it "should remove an index with a custom name by name" do
+    it 'should remove an index with a custom name by name' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.remove_index(:irrelevant_column_name, :index_with_a_custom_name)
       end
@@ -159,51 +159,101 @@ describe Lhm do
       end
     end
 
-    it "should apply a ddl statement" do
+    it 'should apply a ddl statement' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
-        t.ddl("alter table %s add column flag tinyint(1)" % t.name)
+        t.ddl('alter table %s add column flag tinyint(1)' % t.name)
       end
 
       slave do
-        table_read(:users).columns["flag"].must_equal({
-          :type => "tinyint(1)",
-          :is_nullable => "YES",
+        table_read(:users).columns['flag'].must_equal({
+          :type => 'tinyint(1)',
+          :is_nullable => 'YES',
           :column_default => nil
         })
       end
     end
 
-    it "should change a column" do
+    it 'should change a column' do
       Lhm.change_table(:users, :atomic_switch => false) do |t|
         t.change_column(:comment, "varchar(20) DEFAULT 'none' NOT NULL")
       end
 
       slave do
-        table_read(:users).columns["comment"].must_equal({
-          :type => "varchar(20)",
-          :is_nullable => "NO",
-          :column_default => "none"
+        table_read(:users).columns['comment'].must_equal({
+          :type => 'varchar(20)',
+          :is_nullable => 'NO',
+          :column_default => 'none'
         })
       end
     end
 
-    it "should change the last column in a table" do
+    it 'should change the last column in a table' do
       table_create(:small_table)
 
       Lhm.change_table(:small_table, :atomic_switch => false) do |t|
-        t.change_column(:id, "int(5)")
+        t.change_column(:id, 'int(5)')
       end
 
       slave do
-        table_read(:small_table).columns["id"].must_equal({
-          :type => "int(5)",
-          :is_nullable => "NO",
-          :column_default => "0"
+        table_read(:small_table).columns['id'].must_equal({
+          :type => 'int(5)',
+          :is_nullable => 'NO',
+          :column_default => '0'
+        })
+      end
+    end
+
+    it 'should rename a column' do
+      table_create(:users)
+
+      execute("INSERT INTO users (username) VALUES ('a user')")
+      Lhm.change_table(:users, :atomic_switch => false) do |t|
+        t.rename_column(:username, :login)
+      end
+
+      slave do
+        table_data = table_read(:users)
+        table_data.columns['username'].must_equal(nil)
+        table_read(:users).columns['login'].must_equal({
+          :type => 'varchar(255)',
+          :is_nullable => 'YES',
+          :column_default => nil
         })
+
+        # DM & AR versions of select_one return different structures. The
+        # real test is whether the data was copied
+        result = select_one('SELECT login from users')
+        result = result['login'] if result.respond_to?(:has_key?)
+        result.must_equal('a user')
+      end
+    end
+
+    it 'should rename a column with a default' do
+      table_create(:users)
+
+      execute("INSERT INTO users (username) VALUES ('a user')")
+      Lhm.change_table(:users, :atomic_switch => false) do |t|
+        t.rename_column(:group, :fnord)
+      end
+
+      slave do
+        table_data = table_read(:users)
+        table_data.columns['group'].must_equal(nil)
+        table_read(:users).columns['fnord'].must_equal({
+          :type => 'varchar(255)',
+          :is_nullable => 'YES',
+          :column_default => 'Superfriends'
+        })
+
+        # DM & AR versions of select_one return different structures. The
+        # real test is whether the data was copied
+        result = select_one('SELECT `fnord` from users')
+        result = result['fnord'] if result.respond_to?(:has_key?)
+        result.must_equal('Superfriends')
       end
     end
 
-    it "works when mysql reserved words are used" do
+    it 'works when mysql reserved words are used' do
       table_create(:lines)
       execute("insert into `lines` set id = 1, `between` = 'foo'")
       execute("insert into `lines` set id = 2, `between` = 'bar'")
@@ -225,8 +275,8 @@ describe Lhm do
       end
     end
 
-    describe "parallel" do
-      it "should perserve inserts during migration" do
+    describe 'parallel' do
+      it 'should perserve inserts during migration' do
         50.times { |n| execute("insert into users set reference = '#{ n }'") }
 
         insert = Thread.new do
@@ -250,7 +300,7 @@ describe Lhm do
         end
       end
 
-      it "should perserve deletes during migration" do
+      it 'should perserve deletes during migration' do
         50.times { |n| execute("insert into users set reference = '#{ n }'") }
 
         delete = Thread.new do