ridgepole 0.7.1 → 0.7.2.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90f621aa6de8516bd158864682fe89603fefc092
-  data.tar.gz: e45980a01f44af78034b0630db67db3dc2ce2f54
+  metadata.gz: 7319dc643a56f2417a20536a52d64d6b83abb83b
+  data.tar.gz: '088ee747f3c078b55b1c9ce32bc0ace3969502c5'
 SHA512:
-  metadata.gz: 8dbc3694b920fe4b5fc7e7a314ffba87b5b3ea446e1515eae154874735025002b2593325edef4295a530768d8fec7c043199049af11ea03de8d41d8aa5c6bd7a
-  data.tar.gz: c9fd88d65b39f9e84918ca0fba15ea9023eb36aa291000da141bdfcf5fc73966038f47be109ff04d737a995f79229f60bcb9c115ad0a76dd987b4729c7d0369a
+  metadata.gz: 60e566a779bd9e5beb702b950ad738946c7b3df77b0d0249ee1dfd0b11b395f25b44470dde0f40848cb9dbc4715b2e09da3abe160ea88ffbc7c9f3f6924dfc10
+  data.tar.gz: 56bddabd3f673ab2e803891fe298732b33c28b23e529104647e9f43e56e57fc2c0ed36e2d487fb49ca723da3d79fb5fe8d76890a24c0876345330770173bde9e

data/.travis.yml

@@ -6,9 +6,9 @@ cache:
   - bundler
   - apt
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
 before_install:
   - gem install bundler
 before_script:
@@ -26,6 +26,7 @@ script:
 gemfile:
   - gemfiles/activerecord_5.0.gemfile
   - gemfiles/activerecord_5.1.gemfile
+  - gemfiles/activerecord_5.2.gemfile
 env:
   matrix:
     - MYSQL56=1

data/Appraisals

@@ -5,3 +5,11 @@ end
 appraise 'activerecord-5.1' do
   gem 'activerecord', '~> 5.1.0'
 end
+
+appraise 'activerecord-5.2' do
+  gem 'mysql2', '~> 0.4.4'
+
+  git 'https://github.com/rails/rails.git' do
+    gem 'activerecord', '>= 5.2.0.beta2', '< 6'
+  end
+end

data/README.md

@@ -84,6 +84,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Add `--allow-pk-change` option
   * Add `--create-table-with-index` option
   * Add `--mysql-dump-auto-increment` option (`rails >= 5.1`)
+* `>= 0.7.2`
+  * Support Rails 5.2
 
 ## Installation
 

data/docker-compose.yml

@@ -1,11 +1,11 @@
 mysql:
-  image: "mysql:5.6"
+  image: "mysql:5.6.38"
   ports:
     - "13316:3306"
   environment:
     MYSQL_ROOT_PASSWORD: password
 mysql57:
-  image: "mysql:5.7"
+  image: "mysql:5.7.20"
   ports:
     - "13317:3306"
   environment:

data/gemfiles/activerecord_5.2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+git "https://github.com/rails/rails.git" do
+  gem "activerecord", ">= 5.2.0.beta2", "< 6"
+end
+
+gem "mysql2", "~> 0.4.4"
+
+gemspec path: "../"

data/lib/ridgepole/ext/schema_dumper.rb

@@ -19,7 +19,7 @@ module Ridgepole
       end
 
       def foreign_keys(table, stream)
-        return super unless self.class.__with_default_fk_name
+        return super unless ActiveRecord::SchemaDumper.__with_default_fk_name
 
         if (foreign_keys = @connection.foreign_keys(table)).any?
           add_foreign_key_statements = foreign_keys.map do |foreign_key|

data/lib/ridgepole/schema_statements_ext.rb

@@ -2,7 +2,7 @@ require 'active_record/connection_adapters/abstract/schema_statements'
 
 module Ridgepole
   module SchemaStatementsExt
-    def index_name_exists?(table_name, column_name, default = nil)
+    def index_name_exists?(*)
       if Ridgepole::ExecuteExpander.noop
         caller_methods = caller.map {|i| i =~ /:\d+:in `(.+)'/ ? $1 : '' }
         if caller_methods.any? {|i| i =~ /\Aremove_index/ }
@@ -17,7 +17,7 @@ module Ridgepole
       end
     end
 
-    def rename_table_indexes(table_name, new_name)
+    def rename_table_indexes(*)
       # Nothing to do
     end
   end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.1'
+  VERSION = '0.7.2.beta'
 end

data/ridgepole.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'erbh', '>= 0.1.2'
   spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
   spec.add_development_dependency 'hash_order_helper', '>= 0.1.6'
+  spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
 end

data/spec/erb_helper.rb

@@ -4,8 +4,10 @@ ERBh.define_method(:i) do |obj|
   if obj.nil? or (obj.respond_to?(:empty?) and obj.empty?)
     @_erbout.sub!(/,\s*\z/, '')
     ''
-  else
+  elsif obj.is_a?(Hash)
     obj.modern_inspect_without_brace
+  else
+    obj
   end
 end
 

data/spec/mysql/_migrate/migrate_change_table_option_spec.rb

@@ -16,9 +16,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-EOS)
         create_table "employees", primary_key: "emp_no", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=ascii" do |t|
           t.date   "birth_date", null: false
-          t.string "first_name", limit: 14, null: false
-          t.string "last_name", limit: 16, null: false
-          t.string "gender", limit: 1, null: false
+          t.string "first_name", limit: 14, null: false, <%= i cond(5.2, collation: "utf8_general_ci") %>
+          t.string "last_name", limit: 16, null: false, <%= i cond(5.2, collation: "utf8_general_ci") %>
+          t.string "gender", limit: 1, null: false, <%= i cond(5.2, collation: "utf8_general_ci") %>
           t.date   "hire_date", null: false
         end
       EOS
@@ -30,9 +30,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 end

data/spec/mysql/bigint_pk/int_pk_spec.rb

@@ -17,7 +17,7 @@ describe 'Ridgepole::Client (with integer pk)', condition: 5.1 do
 
     specify {
       expect(show_create_table(:books)).to include '`id` int(11) NOT NULL AUTO_INCREMENT'
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
     }
   end
 
@@ -39,7 +39,7 @@ describe 'Ridgepole::Client (with integer pk)', condition: 5.1 do
 
     specify {
       expect(show_create_table(:books)).to include '`id` bigint(20) NOT NULL AUTO_INCREMENT'
-      expect(subject.dump).to match_fuzzy dsl
+      expect(subject.dump).to match_ruby dsl
     }
   end
 end

data/spec/mysql/collation/collation_spec.rb

@@ -2,7 +2,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (add collation)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -13,7 +13,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -28,16 +28,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
     specify {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
   context 'when change column (delete collation)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -48,7 +48,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -63,16 +63,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
     specify {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
   context 'when change column (change collation)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -83,7 +83,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "utf8mb4_bin"
@@ -98,16 +98,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
     specify {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
   context 'when change column (no change collation)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1', id: :bigint) %>, unsigned: true, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
           t.string  "string", null: false, collation: "ascii_bin"
@@ -122,9 +122,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     specify {
       delta = subject.diff(actual_dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
     }
 
     describe '#diff' do

data/spec/mysql/comment/comment_spec.rb

@@ -28,9 +28,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
@@ -63,9 +63,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
@@ -98,9 +98,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
@@ -122,9 +122,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff(actual_dsl)
       expect(delta.differ?).to be_falsey
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
     }
   end
 
@@ -147,7 +147,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump.strip).to be_empty
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl
+      expect(subject.dump).to match_ruby expected_dsl
     }
   end
 
@@ -169,7 +169,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
     it {
       delta = subject.diff('')
       expect(delta.differ?).to be_truthy
-      expect(subject.dump).to match_fuzzy actual_dsl
+      expect(subject.dump).to match_ruby actual_dsl
       delta.migrate
       expect(subject.dump).to be_empty
     }

data/spec/mysql/default_lambda/default_lambda_spec.rb

@@ -62,9 +62,9 @@ describe 'Ridgepole::Client (use default:lambda)' do
       expect(delta.differ?).to be_truthy
       delta.migrate
 
-      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+      expect(subject.dump).to match_ruby erbh(<<-EOS)
         create_table "foos", force: :cascade do |t|
-          t.datetime "bar", default: <%= cond(5.1, '"1970-01-01 00:00:00"', "'1970-01-01 00:00:00'") %>, null: false
+          t.datetime "bar", default: "1970-01-01 00:00:00", null: false
         end
       EOS
     end

data/spec/mysql/diff/diff2_spec.rb

@@ -172,11 +172,11 @@ describe 'Ridgepole::Client.diff' do
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond(5.1, comment: nil) %>)
+      expect(delta.script).to match_ruby erbh(<<-EOS)
+        change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
 
-        change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond(5.1, comment: nil) %>)
-        change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
+        change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
+        change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
       EOS
     }
 

data/spec/mysql/diff/diff_spec.rb

@@ -146,11 +146,11 @@ describe 'Ridgepole::Client.diff' do
     it {
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
-      expect(delta.script).to match_fuzzy erbh(<<-EOS)
-        change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond(5.1, comment: nil) %>)
+      expect(delta.script).to match_ruby erbh(<<-EOS)
+        change_column("employee_clubs", "club_id", :integer, <%= {:unsigned=>false, :null=>true, :default=>nil} + cond('>= 5.1', comment: nil) %>)
 
-        change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond(5.1, comment: nil) %>)
-        change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond(5.1, comment: nil) %>)
+        change_column("employees", "last_name", :string, <%= {:limit=>20, :default=>"XXX", :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
+        change_column("employees", "gender", :string, <%= {:limit=>2, :null=>false, :default=>nil, :unsigned=>false} + cond('>= 5.1', comment: nil) %>)
       EOS
     }
   end

data/spec/mysql/dump/dump_class_method_spec.rb

@@ -5,7 +5,7 @@ describe 'Ridgepole::Client.dump' do
 
     it {
       expect(subject.dump(conn_spec, dump_without_table_options: true)).to match_fuzzy erbh(<<-EOS)
-        create_table "clubs", <%= i cond(5.1, id: :integer) %>, unsigned: true, force: :cascade do |t|
+        create_table "clubs", <%= i cond('>= 5.1', id: :integer) %>, unsigned: true, force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end
@@ -33,13 +33,13 @@ describe 'Ridgepole::Client.dump' do
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employee_clubs", <%= i cond(5.1, id: :integer) %>, unsigned: true, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1', id: :integer) %>, unsigned: true, force: :cascade do |t|
           t.integer "emp_no", null: false, unsigned: true
           t.integer "club_id", null: false, unsigned: true
           t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond(5.1, default: nil) %>, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond('>= 5.1', default: nil) %>, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false

data/spec/mysql/dump/dump_some_tables_spec.rb

@@ -5,7 +5,7 @@ describe 'Ridgepole::Client#dump' do
 
     it {
       expect(subject.dump).to match_fuzzy erbh(<<-EOS)
-        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond(5.1, default: nil) %>, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond('>= 5.1', default: nil) %>, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false
@@ -39,7 +39,7 @@ describe 'Ridgepole::Client#dump' do
 
     it {
       expect(subject.dump).to match_fuzzy erbh(<<-EOS)
-        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond(5.1, default: nil) %>, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond('>= 5.1', default: nil) %>, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false

data/spec/mysql/dump/dump_spec.rb

@@ -5,7 +5,7 @@ describe 'Ridgepole::Client#dump' do
 
     it {
       expect(subject.dump).to match_fuzzy erbh(<<-EOS)
-        create_table "clubs", <%= i cond(5.1, id: :integer) %>, unsigned: true, force: :cascade do |t|
+        create_table "clubs", <%= i cond('>= 5.1',id: :integer) %>, unsigned: true, force: :cascade do |t|
           t.string "name", default: "", null: false
           t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
         end
@@ -33,13 +33,13 @@ describe 'Ridgepole::Client#dump' do
           t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employee_clubs", <%= i cond(5.1, id: :integer) %>, unsigned: true, force: :cascade do |t|
+        create_table "employee_clubs", <%= i cond('>= 5.1',id: :integer) %>, unsigned: true, force: :cascade do |t|
           t.integer "emp_no", null: false, unsigned: true
           t.integer "club_id", null: false, unsigned: true
           t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
         end
 
-        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond(5.1, default: nil) %>, force: :cascade do |t|
+        create_table "employees", primary_key: "emp_no", id: :integer, <%= i cond('>= 5.1',default: nil) %>, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false