zdm 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 325f45e849c39b9770c22c7ce892a41f153b6a30
-  data.tar.gz: acb9889d53d320c1d9b74d570f2cfdbc18d2828f
+  metadata.gz: 57107f23e50a2c471f98eaf7d93e99247900985c
+  data.tar.gz: 3c994ebdaf1238794f67270a285e2d8bf9e21ee2
 SHA512:
-  metadata.gz: 3a6efd42171ebfe5bc3f152cbc238cf06cfe53322e66d6198bd45dcd702ed5ce6b67446aaee5251f21c63c7de32ae3c7493357b5039457ce513fbd8c7040c813
-  data.tar.gz: 6773233f8e943de709541d87ea7517b0a0d2d662564d27d5f235976086410a22ed845c2b723a5a5ab0e758fb1dc9183e95016cf0a7007d9d0aa501f6dda156f2
+  metadata.gz: d1afedadc7e2ef4e3c70897ecfe77d3a5234895eab7cde56a48a39b1cf44d44a08c25179a78fe000120caf829bcd3c61423e7047efc2452a0039632137db7490
+  data.tar.gz: d43ccdc6e57bf6a0d9761b64b8331810b8c183e077363d80afff7a783764752fab879f6b31e323256eb1148edc297ffd061b0af7d5420b0ec0d3eca8c2ba2133

data/.travis.yml

@@ -1,15 +1,14 @@
 language: ruby
 
 rvm:
-  - 2.3.0
-  - 2.4.0
+  - 2.4.3
+  - 2.5.1
 
 sudo: false
 
 gemfile:
-  - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
-  - gemfiles/5.0.gemfile
+  - gemfiles/5.2.gemfile
 
 services:
   - mysql

data/Appraisals

@@ -1,9 +1,6 @@
-appraise '4.1' do
-  gem 'activerecord', '4.1.15'
-end
 appraise '4.2' do
-  gem 'activerecord', '4.2.8'
+  gem 'activerecord', '4.2.10'
 end
-appraise '5.0' do
-  gem 'activerecord', '5.0.1'
+appraise '5.2' do
+  gem 'activerecord', '5.2.0'
 end

data/gemfiles/4.2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "4.2.8"
+gem "activerecord", "4.2.10"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/4.2.gemfile.lock

@@ -1,64 +1,66 @@
 PATH
   remote: ..
   specs:
-    zdm (1.0.7)
-      activerecord (>= 4.0)
+    zdm (1.1.0)
+      activerecord (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.8)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    appraisal (2.1.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     arel (6.0.4)
     builder (3.2.3)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    i18n (0.8.1)
-    minitest (5.10.1)
-    mysql2 (0.4.5)
-    rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    mysql2 (0.3.20)
+    rake (12.3.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    thor (0.19.4)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.2)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 4.2.8)
+  activerecord (= 4.2.10)
   appraisal
-  bundler (~> 1)
+  bundler
   mysql2
   rake
   rspec
   zdm!
 
 BUNDLED WITH
-   1.14.5
+   1.16.2

data/gemfiles/{5.0.gemfile → 5.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5.0.1"
+gem "activerecord", "5.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/5.2.gemfile.lock

@@ -0,0 +1,64 @@
+PATH
+  remote: ..
+  specs:
+    zdm (1.1.0)
+      activerecord (>= 4.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    mysql2 (0.5.1)
+    rake (12.3.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 5.2.0)
+  appraisal
+  bundler
+  mysql2
+  rake
+  rspec
+  zdm!
+
+BUNDLED WITH
+   1.16.2

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Zdm
-  VERSION = '1.0.7'
+  VERSION = '1.1.0'
 end

data/lib/zdm.rb

@@ -25,7 +25,11 @@ module Zdm
     end
 
     def tables_method
-      ActiveRecord.version.to_s =~ /^5/ ? :data_sources : :tables
+      rails5? ? :data_sources : :tables
+    end
+
+    def rails5?
+      ActiveRecord.version.to_s =~ /^5/
     end
 
     BATCH_SIZE = 40_000

data/spec/zdm_spec.rb

@@ -45,7 +45,7 @@ describe Zdm do
     stmt = conn.select_rows('show create table people')[0][1]
     expect(stmt.squish).to eq(<<-EOS.squish)
       CREATE TABLE `people` (
-        `id` int(11) NOT NULL AUTO_INCREMENT,
+        `id` #{Zdm.rails5? ? 'bigint(20)' : 'int(11)'} NOT NULL AUTO_INCREMENT,
         `account_id` int(11) DEFAULT NULL,
         `name` varchar(99) COLLATE utf8_unicode_ci NOT NULL,
         `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -82,7 +82,7 @@ describe Zdm do
     stmt = conn.select_rows('show create table people')[0][1]
     expect(stmt.squish).to eq(<<-EOS.squish)
         CREATE TABLE `people` (
-          `id` int(11) NOT NULL AUTO_INCREMENT,
+          `id` #{Zdm.rails5? ? 'bigint(20)' : 'int(11)'} NOT NULL AUTO_INCREMENT,
           `account_id` int(11) DEFAULT NULL,
           `name` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
           `code` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -171,5 +171,18 @@ describe Zdm do
 
   end
 
+  it 'cleans up archive tables' do
+    Zdm.change_table(:people) do |m|
+      m.add_column('test2', "varchar(1)")
+    end
 
+    Zdm.cleanup(before: 1.day.ago)
+    conn = ActiveRecord::Base.connection
+    tables = conn.send(Zdm.tables_method).select { |name| name.starts_with?('zdma_') }
+    expect(tables).to_not be_empty
+
+    Zdm.cleanup(before: 1.day.from_now)
+    tables = conn.send(Zdm.tables_method).select { |name| name.starts_with?('zdma_') }
+    expect(tables).to be_empty
+  end
 end

data/zdm.gemspec

@@ -4,8 +4,8 @@ require 'version'
 Gem::Specification.new do |s|
   s.name          = 'zdm'
   s.version       = Zdm::VERSION
-  s.authors       = ['ITRP Institute, Inc.']
-  s.email         = ['support@itrp.com']
+  s.authors       = ['4me, Inc.']
+  s.email         = ['support@4me.com']
   s.description   = %q{Zero Downtime Migrator of mysql compatible databases}
   s.summary       = %q{Zero Downtime Migrator for mysql in ruby}
   s.homepage      = 'https://github.com/itrp/zdm'
@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_dependency 'activerecord', '>= 4.0'
+  s.add_dependency 'activerecord', '>= 4.2'
 
-  s.add_development_dependency 'bundler', '~> 1'
+  s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'mysql2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zdm
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
-- ITRP Institute, Inc.
+- 4me, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: '0'
 description: Zero Downtime Migrator of mysql compatible databases
 email:
-- support@itrp.com
+- support@4me.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -108,12 +108,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/4.1.gemfile
-- gemfiles/4.1.gemfile.lock
 - gemfiles/4.2.gemfile
 - gemfiles/4.2.gemfile.lock
-- gemfiles/5.0.gemfile
-- gemfiles/5.0.gemfile.lock
+- gemfiles/5.2.gemfile
+- gemfiles/5.2.gemfile.lock
 - lib/version.rb
 - lib/zdm.rb
 - spec/database.yml
@@ -140,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Zero Downtime Migrator for mysql in ruby

data/gemfiles/4.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "4.1.15"
-
-gemspec :path => "../"

data/gemfiles/4.1.gemfile.lock

@@ -1,66 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    zdm (1.0.7)
-      activerecord (>= 4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.1.15)
-      activesupport (= 4.1.15)
-      builder (~> 3.1)
-    activerecord (4.1.15)
-      activemodel (= 4.1.15)
-      activesupport (= 4.1.15)
-      arel (~> 5.0.0)
-    activesupport (4.1.15)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (5.0.1.20140414130214)
-    builder (3.2.3)
-    diff-lcs (1.3)
-    i18n (0.8.1)
-    json (1.8.6)
-    minitest (5.10.1)
-    mysql2 (0.3.20)
-    rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 4.1.15)
-  appraisal
-  bundler (~> 1)
-  mysql2
-  rake
-  rspec
-  zdm!
-
-BUNDLED WITH
-   1.14.5

data/gemfiles/5.0.gemfile.lock

@@ -1,63 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    zdm (1.0.7)
-      activerecord (>= 4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (7.1.4)
-    concurrent-ruby (1.0.4)
-    diff-lcs (1.3)
-    i18n (0.8.1)
-    minitest (5.10.1)
-    mysql2 (0.4.5)
-    rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 5.0.1)
-  appraisal
-  bundler (~> 1)
-  mysql2
-  rake
-  rspec
-  zdm!
-
-BUNDLED WITH
-   1.14.5