ridgepole 0.7.0.beta20 → 0.7.0.beta21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c0cfd9a7b1adc023b5917578969391ab60303a
-  data.tar.gz: c92c132c16fef3a322df668b252841b8f1415e82
+  metadata.gz: 4d0d05b6e86c04feb7e26a6e04a7134c3ff207a9
+  data.tar.gz: 2254a9e116f12e0f44965c244cd24fd03156425c
 SHA512:
-  metadata.gz: 4d5c711b96933ccec3b517d939133f2e826481e6b582ed22150b8e49261a61690565f5780523497ff323371e320a5e2551e10abe2619fbfd994c8a7d04461902
-  data.tar.gz: 73ee9bae1a5425ac6a4922d24210faef787893d66d8c83e147add5e1b74e691604c64e6cab7f7db6045edde4f2efc8c359003476f46fc3a0a7b781c4d11cc959
+  metadata.gz: 43d4a18863fe6e7d525f7c5e1a16a3feef0f0d41a175235c175c0257d8ddc137ef9f9d03d6e424cd8e3713f45ba61f39e23dc3c503ce7829db38a2ba19987c64
+  data.tar.gz: b6ce4968bc3d179b2134953e7b1c716bc26e09570438771599db78673459f64a1f998ba417c530281e5319e693ee3ef975c90be46149ccfc6c62bfc4538b5b21

data/README.md

@@ -9,7 +9,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.6)](https://travis-ci.org/winebarrel/ridgepole)
 [![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.6)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.6)
 
-[![Edge Version](https://img.shields.io/badge/edge_version-0.7.0.beta20-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta20)
+[![Edge Version](https://img.shields.io/badge/edge_version-0.7.0.beta21-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta21)
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.7)](https://travis-ci.org/winebarrel/ridgepole)
 [![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.7)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.7)
 

data/lib/ridgepole/diff.rb

@@ -128,6 +128,11 @@ class Ridgepole::Diff
       table_delta[:table_options] = to_options
     end
 
+    if @options[:dump_without_table_options]
+      from.delete(:options)
+      to.delete(:options)
+    end
+
     unless from == to
       @logger.warn(<<-EOS)
 [WARNING] No difference of schema configuration for table `#{table_name}` but table options differ.
@@ -517,13 +522,11 @@ class Ridgepole::Diff
           parent_label = "#{parent_table}.id"
           child_label = "#{child_table}.#{column_name}"
           label_len = [parent_label.length, child_label.length].max
-          parent_column_info_str = parent_column_info.inspect.slice(1...-1)
-          child_column_info_str = child_column_info.inspect.slice(1...-1)
 
           @logger.warn(<<-EOS % [label_len, parent_label, label_len, child_label])
 [WARNING] Relation column type is different.
-  %*s: #{parent_column_info_str}
-  %*s: #{child_column_info_str}
+  %*s: #{parent_column_info}
+  %*s: #{child_column_info}
           EOS
         end
       end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0.beta20'
+  VERSION = '0.7.0.beta21'
 end

data/spec/mysql/migrate/migrate_change_column8_spec.rb

@@ -1,8 +1,9 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   before { subject.diff(actual_dsl).migrate }
-  subject { client(:table_options => table_options, :dump_without_table_options => false) }
+  subject { client(:table_options => table_options, :dump_without_table_options => dump_without_table_options) }
 
   let(:warning_regexp) { /table options differ/ }
+  let(:dump_without_table_options) { false }
 
   let(:actual_dsl) {
     erbh(<<-EOS)
@@ -37,4 +38,15 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_falsey
     }
   end
+
+  context 'when dump_without_table_options => true' do
+    let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8mb4' }
+    let(:dump_without_table_options) { true }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
 end

data/spec/mysql/migrate/migrate_check_relation_column_type_spec.rb

@@ -45,8 +45,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
     it {
       expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
 [WARNING] Relation column type is different.
-              employees.id: :type=>:bigint
-  dept_manager.employee_id: :type=>:integer
+              employees.id: {:type=>:bigint}
+  dept_manager.employee_id: {:type=>:integer}
       EOS
 
       delta = subject.diff(expected_dsl)
@@ -103,8 +103,8 @@ describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
     it {
       expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
 [WARNING] Relation column type is different.
-              employees.id: :type=>:bigint, :unsigned=>true
-  dept_manager.employee_id: :type=>:bigint
+              employees.id: {:type=>:bigint, :unsigned=>true}
+  dept_manager.employee_id: {:type=>:bigint}
       EOS
 
       delta = subject.diff(expected_dsl)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta20
+  version: 0.7.0.beta21
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord