ridgepole 0.7.0.beta9 → 0.7.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fad6f6046bff06fbe559b4da0f9bf1f302a5d8d
-  data.tar.gz: d74561e4b51b708c04346a2d7cf23fb81b16506c
+  metadata.gz: 43d1094d18230aec0edeb8cfc3ba63783b074e54
+  data.tar.gz: 3dcc6e2ead2ecd1eae6f5abd09865f272ee0ac6c
 SHA512:
-  metadata.gz: ee4042bf17a7f05d6fe062fa57925578e5a22a5cd7a169ddae4048ef328aff2696a90beb1b4ec8e58ea3d74b170aae4ba26d549d81e39143d7fc5b22631fb215
-  data.tar.gz: c7af7cb79c2cd5a4659de44f8b8f5a819e89b8ed7d3175eef6ff5ab417532012469b9d743059082e28f099585903602a148c953558c97f38f12d3a53939148b1
+  metadata.gz: '08568bf10b61386b12462595b19c6a9ee527423f7a72224978a202dd6f5a6b0c953d69669c5f3821318b72834b669f2165fa84b081657434af4ccb63224a7958'
+  data.tar.gz: fdd40f8896581ddfb80e1f5921329c8a3bdc6eb202c60cf345e1df72eb2c842b1ae3c071d111ec3e8dc003c5d16ce723e15c99e48b18acae028818f72f390310

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.beta9-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta9)
+[![Edge Version](https://img.shields.io/badge/edge_version-0.7.0.beta10-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta10)
 [![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)
 
@@ -76,6 +76,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Pass config from env
   * Fix change fk order
   * Add `--check-relation-type` option
+  * Add `--skip-column-comment-change` option
 
 ## Installation
 
@@ -128,6 +129,7 @@ Usage: ridgepole [options]
         --skip-drop-table
         --mysql-change-table-options
         --check-relation-type DEF_PK
+        --skip-column-comment-change
     -r, --require LIBS
         --log-file LOG_FILE
         --verbose

data/bin/ridgepole

@@ -122,6 +122,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('',   '--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                               }
     opt.on(''  , '--verbose')                                    {    Ridgepole::Logger.verbose = true                     }

data/lib/ridgepole/diff.rb

@@ -402,6 +402,12 @@ class Ridgepole::Diff
     attrs1 = attrs1.merge(:options => attrs1.fetch(:options, {}).dup)
     attrs2 = attrs2.merge(:options => attrs2.fetch(:options, {}).dup)
     normalize_default_proc_options!(attrs1[:options], attrs2[:options])
+
+    if @options[:skip_column_comment_change]
+      attrs1.fetch(:options).delete(:comment)
+      attrs2.fetch(:options).delete(:comment)
+    end
+
     attrs1 == attrs2
   end
 

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0.beta9'
+  VERSION = '0.7.0.beta10'
 end

data/spec/mysql/cli/ridgepole_spec.rb

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

data/spec/mysql/migrate/migrate_skip_column_comment_change_spec.rb

@@ -0,0 +1,38 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change column 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, comment: "my comment"
+          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
+          t.index ["gender"], name: "gender", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    let(:expected_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, comment: "my comment2"
+          t.string "last_name", limit: 16, null: false
+          t.string "gender", limit: 1, null: false
+          t.date   :hire_date, null: false
+          t.index :gender, name: :gender, <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client(skip_column_comment_change: true) }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      puts delta.script
+      expect(delta.differ?).to be_falsey
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta9
+  version: 0.7.0.beta10
 platform: ruby
 authors:
 - Genki Sugawara
@@ -307,6 +307,7 @@ files:
 - spec/mysql/migrate/migrate_same_default_null_spec.rb
 - spec/mysql/migrate/migrate_same_spec.rb
 - spec/mysql/migrate/migrate_script_error_spec.rb
+- spec/mysql/migrate/migrate_skip_column_comment_change_spec.rb
 - spec/mysql/migrate/migrate_skip_drop_table_spec.rb
 - spec/mysql/migrate/migrate_skip_rename_column_spec.rb
 - spec/mysql/migrate/migrate_skip_rename_table_spec.rb
@@ -450,6 +451,7 @@ test_files:
 - spec/mysql/migrate/migrate_same_default_null_spec.rb
 - spec/mysql/migrate/migrate_same_spec.rb
 - spec/mysql/migrate/migrate_script_error_spec.rb
+- spec/mysql/migrate/migrate_skip_column_comment_change_spec.rb
 - spec/mysql/migrate/migrate_skip_drop_table_spec.rb
 - spec/mysql/migrate/migrate_skip_rename_column_spec.rb
 - spec/mysql/migrate/migrate_skip_rename_table_spec.rb