ridgepole 0.7.0.beta13 → 0.7.0.beta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f26a101fb8d0e30d98ed68ea44d6d10c9e1b4890
-  data.tar.gz: 765b92df8b2d0fb304f062cfdf4b2eb3eb230e0b
+  metadata.gz: 0616cfe50a584d86fcdb940ffb823c88501f7c23
+  data.tar.gz: 6c5c72c83a83bede2d0af5f538b96217267765d7
 SHA512:
-  metadata.gz: 537d7f1e01baff056b431cfa6d4f55db876e4564ae76a5da3ba2224f567c04bdacb5c0181270e7f1bba67298957506f980cab9813f88ee4c60c9b1a0102aa9bd
-  data.tar.gz: a74a3b777e4ccc6e25f9978895150beccd140585553d3dd53590ddc3b5944ce966032bf00e5f83f4137693d87c1955b2b0a8cc6befb9d1cb29d3a3c76ffd55f1
+  metadata.gz: 8cfe029b261964757b99d47f4ee15c4ea7e5fe2baa25f8b4ee668f509d1c109201c7006cf7e4209432386a6e3b9e2fc34b7758bd3c2823d066ecfbdba509b2f0
+  data.tar.gz: 5ffbcd3b7749eec49e278b47baec072bae162200398dcf5b77a186bdde3870baac07c4a38ecd472fec95e33ea57e5cdb2c772d8557f9f5345ec978fc5d99e7e5

data/README.md

@@ -9,11 +9,11 @@ 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.beta13-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta13)
+[![Edge Version](https://img.shields.io/badge/edge_version-0.7.0.beta14-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta14)
 [![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)
 
-**Notice**
+**ChangeLog**
 
 * `>= 0.4.8`
   * `activerecord-mysql-unsigned` is now optional. Please pass `--enable-mysql-unsigned` after you install [activerecord-mysql-unsigned](https://github.com/waka/activerecord-mysql-unsigned) if you want to use.
@@ -78,6 +78,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Add `--check-relation-type` option
   * Add `--skip-column-comment-change` option
   * Add `--default-bigint-limit` option
+  * Add `--ignore-table-comment` option
 
 ## Installation
 
@@ -131,6 +132,7 @@ Usage: ridgepole [options]
         --skip-drop-table
         --mysql-change-table-options
         --check-relation-type DEF_PK
+        --ignore-table-comment
         --skip-column-comment-change
     -r, --require LIBS
         --log-file LOG_FILE

data/bin/ridgepole

@@ -123,6 +123,7 @@ ARGV.options do |opt|
     opt.on('',   '--skip-drop-table')                            {    options[:skip_drop_table] = true                     }
     opt.on('',   '--mysql-change-table-options')                 {    options[:mysql_change_table_options] = true          }
     opt.on('',   '--check-relation-type DEF_PK')                 {|v| options[:check_relation_type] = v                    }
+    opt.on('',   '--ignore-table-comment')                       {    options[:ignore_table_comment] = true                }
     opt.on('',   '--skip-column-comment-change')                 {    options[:skip_column_comment_change] = true          }
     opt.on('-r', '--require LIBS', Array)                        {|v| v.each {|i| require i }                              }
     opt.on(''  , '--log-file LOG_FILE')                          {|v| options[:log_file] = v                               }

data/lib/ridgepole/diff.rb

@@ -110,6 +110,11 @@ class Ridgepole::Diff
     from_options = from[:options] || {}
     to_options = to[:options] || {}
 
+    if @options[:ignore_table_comment]
+      from.delete(:comment)
+      to.delete(:comment)
+    end
+
     if @options[:mysql_change_table_options] and from_options != to_options and Ridgepole::ConnectionAdapters.mysql?
       from.delete(:options)
       to.delete(:options)

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0.beta13'
+  VERSION = '0.7.0.beta14'
 end

data/spec/mysql/cli/ridgepole_spec.rb

@@ -48,6 +48,7 @@ describe 'ridgepole' do
             --skip-drop-table
             --mysql-change-table-options
             --check-relation-type DEF_PK
+            --ignore-table-comment
             --skip-column-comment-change
         -r, --require LIBS
             --log-file LOG_FILE

data/spec/mysql/migrate/migrate_change_table_option_spec.rb

@@ -1,5 +1,5 @@
 describe 'Ridgepole::Client#diff -> migrate' do
-  context 'when change column' do
+  context 'when create_table options are different' do
     let(:actual_dsl) {
       erbh(<<-EOS)
         create_table "employees", primary_key: "emp_no", force: :cascade do |t|
@@ -50,4 +50,42 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_falsey
     }
   end
+
+  context 'when create_table options are different (ignore comment)' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", 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
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", comment: "my comment", 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
+          t.string "gender", limit: 1, null: false
+          t.date   "hire_date", null: false
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client(ignore_table_comment: true) }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy actual_dsl
+    }
+  end
 end

metadata

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