ridgepole 0.6.2 → 0.6.3.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0249e680506633b26de4433163a6b1bc634e486
-  data.tar.gz: 804b5ff18bd763fee8b2bbdc39b957ca27740ce6
+  metadata.gz: 1e0f9257b25ebf5d941734433df6dd1866b5b0e9
+  data.tar.gz: 84097da34f74782d0b1ca02bdd29842ca9167b52
 SHA512:
-  metadata.gz: b4f75c3e0d7c0b31558cefb246c78b5851c32df9441938d47cbeb2a20f4cc32405da611663509f9efffe0b2007eefeebfbe199f532942aea03d1cfb2dc4911ac
-  data.tar.gz: 2e1334ff0c89cf24c9391576add4d1193d266cf452b208b790d04e2e2b2d4b599e9a4abdd1919bebc5dd5e8882febe6d5ded6facfea8afb0678af85ce22784dd
+  metadata.gz: d4ba059da276af54510fc6e9b8c7932f3f3060b033e736bb1dfda339fdc26f534f227ae0d5071b263044d83a6aac13dfa95d68d67e79745c3f92c8983d138dce
+  data.tar.gz: b13e98c9181aca062630f96cbd79f4b87e83cb69dcb48cdf8217b90dc1c41bd7a02566851a41c5158f054d3c4d54ac82c6c43beb7907baa803b20854e6e7234d

data/.gitignore

@@ -20,3 +20,4 @@ test.rb
 Schemafile
 *.schema
 _site/
+config.yml

data/README.md

@@ -7,7 +7,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=master)](https://travis-ci.org/winebarrel/ridgepole)
-[![Coverage Status](https://img.shields.io/coveralls/winebarrel/ridgepole.svg)](https://coveralls.io/r/winebarrel/ridgepole?branch=master)
+[![Coverage Status](https://coveralls.io/repos/winebarrel/ridgepole/badge.svg?branch=master)](https://coveralls.io/r/winebarrel/ridgepole?branch=master)
 
 **Notice**
 
@@ -38,6 +38,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Remove `--mysql-awesome-unsigned-pk` option
 * `>= 0.6.1`
   * Support [PostgreSQL columns](https://github.com/winebarrel/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79)
+* `>= 0.6.3`
+  * Fix `default` option ([pull#48](https://github.com/winebarrel/ridgepole/pull/48))
 
 ## Installation
 

data/lib/ridgepole/diff.rb

@@ -76,7 +76,7 @@ class Ridgepole::Diff
     table_delta = {}
 
     scan_options_change(table_name, from[:options], to[:options], table_delta)
-    scan_definition_change(from[:definition], to[:definition], from[:indices], from[:options], table_delta)
+    scan_definition_change(from[:definition], to[:definition], from[:indices], table_name, from[:options], table_delta)
     scan_indices_change(from[:indices], to[:indices], to[:definition], table_delta, from[:options], to[:options])
     scan_foreign_keys_change(from[:foreign_keys], to[:foreign_keys], table_delta, @options)
 
@@ -92,7 +92,7 @@ class Ridgepole::Diff
     end
   end
 
-  def scan_definition_change(from, to, from_indices, table_options, table_delta)
+  def scan_definition_change(from, to, from_indices, table_name, table_options, table_delta)
     from = (from || {}).dup
     to = (to || {}).dup
     definition_delta = {}
@@ -114,6 +114,7 @@ class Ridgepole::Diff
 
         if from_attrs != to_attrs
           definition_delta[:change] ||= {}
+          to_attrs = fix_change_column_options(table_name, from_attrs, to_attrs)
           definition_delta[:change][column_name] = to_attrs
         end
       else
@@ -258,7 +259,7 @@ class Ridgepole::Diff
     opts.delete(:limit) if opts[:limit] == default_limit
 
     # XXX: MySQL only?
-    if not opts.has_key?(:default) and opts[:null]
+    if not opts.has_key?(:default)
       opts[:default] = nil
     end
 
@@ -316,4 +317,30 @@ class Ridgepole::Diff
       table_delta[:foreign_keys] = foreign_keys_delta
     end
   end
+
+
+  # XXX: MySQL only?
+  # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L760
+  # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb#L102
+  def fix_change_column_options(table_name, from_attrs, to_attrs)
+    # default: 0, null: false -> default: nil, null: false | default: nil
+    # default: 0, null: false ->               null: false | default: nil
+    # default: 0, null: false -> default: nil, null: true  | default: nil, null: true
+    # default: 0, null: false ->               null: true  | default: nil, null: true
+    # default: 0, null: true  -> default: nil, null: true  | default: nil
+    # default: 0, null: true  ->               null: true  | default: nil
+    # default: 0, null: true  -> default: nil, null: false | default: nil, null: false (`default: nil` is ignored)
+    # default: 0, null: true ->                null: false | default: nil, null: false (`default: nil` is ignored)
+
+    if from_attrs[:options][:default] != to_attrs[:options][:default] and from_attrs[:options][:null] == to_attrs[:options][:null]
+      to_attrs = to_attrs.deep_dup
+      to_attrs[:options].delete(:null)
+    end
+
+    if to_attrs[:options][:default] == nil and to_attrs[:options][:null] == false
+      Ridgepole::Logger.instance.warn("[WARNING] Table `#{table_name}`: `default: nil` is ignored when `null: false`. Please apply twice")
+    end
+
+    to_attrs
+  end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.2'
+  VERSION = '0.6.3.beta'
 end

data/spec/mysql/diff/diff2_spec.rb

@@ -173,8 +173,8 @@ describe 'Ridgepole::Client.diff' do
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})
 
-        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX", :null=>false})
-        change_column("employees", "gender", :string, {:limit=>2, :null=>false})
+        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
+        change_column("employees", "gender", :string, {:limit=>2, :null=>false, :default=>nil})
       RUBY
     }
 

data/spec/mysql/diff/diff_spec.rb

@@ -147,8 +147,8 @@ describe 'Ridgepole::Client.diff' do
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})
 
-        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX", :null=>false})
-        change_column("employees", "gender", :string, {:limit=>2, :null=>false})
+        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
+        change_column("employees", "gender", :string, {:limit=>2, :null=>false, :default=>nil})
       RUBY
     }
   end

data/spec/mysql/migrate/migrate_change_column_default_spec.rb

@@ -0,0 +1,204 @@
+unless postgresql?
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when default:0 -> (emply)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  default: 0, null: false
+          t.float   "salary",    limit: 24,             null: false
+          t.date    "from_date",                        null: false
+          t.date    "to_date",                          null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,                null: true
+          t.float   "salary",    limit: 24,               null: false
+          t.date    "from_date",                          null: false
+          t.date    "to_date",                            null: false
+        end
+      RUBY
+    }
+
+    let(:result_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4
+          t.float   "salary",    limit: 24, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date",              null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq result_dsl.strip_heredoc.strip
+    }
+  end
+
+  context 'when default:0 -> (emply with null:false)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  default: 0, null: false
+          t.float   "salary",    limit: 24,             null: false
+          t.date    "from_date",                        null: false
+          t.date    "to_date",                          null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  null: false
+          t.float   "salary",    limit: 24, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date",              null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
+    }
+  end
+
+  context 'when default:0 -> default:0' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  default: 0, null: false
+          t.float   "salary",    limit: 24,             null: false
+          t.date    "from_date",                        null: false
+          t.date    "to_date",                          null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(actual_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when default:0 -> default:0/null:true' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  default: 0, null: false
+          t.float   "salary",    limit: 24,             null: false
+          t.date    "from_date",                        null: false
+          t.date    "to_date",                          null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  default: 0, null: true
+          t.float   "salary",    limit: 24,             null: false
+          t.date    "from_date",                        null: false
+          t.date    "to_date",                          null: false
+        end
+      RUBY
+    }
+
+    let(:result_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  default: 0
+          t.float   "salary",    limit: 24,             null: false
+          t.date    "from_date",                        null: false
+          t.date    "to_date",                          null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq result_dsl.strip_heredoc.strip
+    }
+  end
+
+  context 'when default:0/null:true -> default:nil/null:false' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  default: 0
+          t.float   "salary",    limit: 24,             null: false
+          t.date    "from_date",                        null: false
+          t.date    "to_date",                          null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  null: false
+          t.float   "salary",    limit: 24, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date",              null: false
+        end
+      RUBY
+    }
+
+    let(:result_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    limit: 4,  default: 0, null: false
+          t.float   "salary",    limit: 24,             null: false
+          t.date    "from_date",                        null: false
+          t.date    "to_date",                          null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).with('[WARNING] Table `salaries`: `default: nil` is ignored when `null: false`. Please apply twice')
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq result_dsl.strip_heredoc.strip
+
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq result_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
+    }
+  end
+end
+end

data/spec/mysql/migrate/migrate_change_column_spec.rb

@@ -154,10 +154,10 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_mysql_unsigned: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
-        change_column("employee_clubs", "club_id", :integer, {:null=>false#{unsigned_if_enabled2}})
+        change_column("employee_clubs", "club_id", :integer, {:null=>false#{unsigned_if_enabled2}, :default=>nil})
 
-        change_column("employees", "last_name", :string, {:limit=>16, :null=>false})
-        change_column("employees", "gender", :string, {:limit=>1, :null=>false})
+        change_column("employees", "last_name", :string, {:limit=>16, :default=>nil})
+        change_column("employees", "gender", :string, {:limit=>1, :null=>false, :default=>nil})
       RUBY
     }
 
@@ -171,8 +171,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         change_table("employees", {:bulk => true}) do |t|
-          t.change("last_name", :string, {:limit=>20, :default=>"XXX", :null=>false#{unsigned_false_if_enabled2}})
-          t.change("gender", :string, {:limit=>2, :null=>false#{unsigned_false_if_enabled2}})
+          t.change("last_name", :string, {:limit=>20, :default=>"XXX"#{unsigned_false_if_enabled2}})
+          t.change("gender", :string, {:limit=>2, :null=>false, :default=>nil#{unsigned_false_if_enabled2}})
         end
       RUBY
       delta.migrate

data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb

@@ -149,7 +149,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_awesome: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
-        change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :unsigned=>false})
+        change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :default=>nil, :unsigned=>false})
       RUBY
     }
   end

data/spec/mysql/migrate/migrate_with_tables_spec.rb

@@ -149,7 +149,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = Ridgepole::Client.diff(current_schema, dsl, tables: ['employees'], reverse: true, enable_mysql_awesome: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
-        change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :unsigned=>false})
+        change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :default=>nil, :unsigned=>false})
       RUBY
     }
   end

data/spec/postgresql/diff/diff_spec.rb

@@ -145,7 +145,7 @@ describe 'Ridgepole::Client.diff' do
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         change_column("employee_clubs", "club_id", :integer, {:null=>true, :default=>nil})
 
-        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX", :null=>false})
+        change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX"})
       RUBY
     }
   end

data/spec/postgresql/migrate/migrate_change_column_default_spec.rb

@@ -0,0 +1,38 @@
+if postgresql?
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change column' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    default: 0, null: false
+          t.integer "salary",                null: false
+          t.date    "from_date",             null: false
+          t.date    "to_date",               null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: :cascade do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip #.gsub(/(\s*,\s*unsigned: false)?\s*,\s*null: true/, '')
+    }
+  end
+end
+end

data/spec/postgresql/migrate/migrate_change_column_spec.rb

@@ -148,9 +148,9 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_mysql_unsigned: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
-        change_column("employee_clubs", "club_id", :integer, {:null=>false})
+        change_column("employee_clubs", "club_id", :integer, {:null=>false, :default=>nil})
 
-        change_column("employees", "last_name", :string, {:limit=>16, :null=>false})
+        change_column("employees", "last_name", :string, {:limit=>16, :default=>nil})
       RUBY
     }
 
@@ -164,7 +164,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         change_table("employees", {:bulk => true}) do |t|
-          t.change("last_name", :string, {:limit=>20, :default=>"XXX", :null=>false})
+          t.change("last_name", :string, {:limit=>20, :default=>"XXX"})
         end
       RUBY
       delta.migrate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -174,6 +174,7 @@ files:
 - spec/mysql/migrate/migrate_change_column4_spec.rb
 - spec/mysql/migrate/migrate_change_column5_spec.rb
 - spec/mysql/migrate/migrate_change_column6_spec.rb
+- spec/mysql/migrate/migrate_change_column_default_spec.rb
 - spec/mysql/migrate/migrate_change_column_float_spec.rb
 - spec/mysql/migrate/migrate_change_column_spec.rb
 - spec/mysql/migrate/migrate_change_index2_spec.rb
@@ -214,6 +215,7 @@ files:
 - spec/postgresql/fk/migrate_create_fk_spec.rb
 - spec/postgresql/fk/migrate_drop_fk_spec.rb
 - spec/postgresql/migrate/migrate_add_column_spec.rb
+- spec/postgresql/migrate/migrate_change_column_default_spec.rb
 - spec/postgresql/migrate/migrate_change_column_spec.rb
 - spec/postgresql/migrate/migrate_change_index_spec.rb
 - spec/postgresql/migrate/migrate_create_table_spec.rb
@@ -244,9 +246,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14
@@ -275,6 +277,7 @@ test_files:
 - spec/mysql/migrate/migrate_change_column4_spec.rb
 - spec/mysql/migrate/migrate_change_column5_spec.rb
 - spec/mysql/migrate/migrate_change_column6_spec.rb
+- spec/mysql/migrate/migrate_change_column_default_spec.rb
 - spec/mysql/migrate/migrate_change_column_float_spec.rb
 - spec/mysql/migrate/migrate_change_column_spec.rb
 - spec/mysql/migrate/migrate_change_index2_spec.rb
@@ -315,6 +318,7 @@ test_files:
 - spec/postgresql/fk/migrate_create_fk_spec.rb
 - spec/postgresql/fk/migrate_drop_fk_spec.rb
 - spec/postgresql/migrate/migrate_add_column_spec.rb
+- spec/postgresql/migrate/migrate_change_column_default_spec.rb
 - spec/postgresql/migrate/migrate_change_column_spec.rb
 - spec/postgresql/migrate/migrate_change_index_spec.rb
 - spec/postgresql/migrate/migrate_create_table_spec.rb