ridgepole 0.7.0.beta8 → 0.7.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6379a32db8dc48969ccf8c184534eccdea98fdd0
-  data.tar.gz: efbb7beeb7656df70ed62a102585f7ef2bbe17d7
+  metadata.gz: 5fad6f6046bff06fbe559b4da0f9bf1f302a5d8d
+  data.tar.gz: d74561e4b51b708c04346a2d7cf23fb81b16506c
 SHA512:
-  metadata.gz: 0dfbe2a44db029662943ad2f447e4d72a26f9d970807336f0cce0806cf1758337e1f65587cd9ba0b7496887e87ebcd82d0a42cec842fd2443e90bb5b8c4cf63b
-  data.tar.gz: 4ba605415d1d48c00eb462f9dc6573c1ee131c456eb9cc215f471604b401f11972a4023ee6c14664a2c23a21a274c6b466c9e78564092cc63e034225f2ba54bb
+  metadata.gz: ee4042bf17a7f05d6fe062fa57925578e5a22a5cd7a169ddae4048ef328aff2696a90beb1b4ec8e58ea3d74b170aae4ba26d549d81e39143d7fc5b22631fb215
+  data.tar.gz: c7af7cb79c2cd5a4659de44f8b8f5a819e89b8ed7d3175eef6ff5ab417532012469b9d743059082e28f099585903602a148c953558c97f38f12d3a53939148b1

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.beta8-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta8)
+[![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)
 [![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

@@ -467,18 +467,40 @@ class Ridgepole::Diff
         next unless parent_table_info
 
         table_options = parent_table_info.fetch(:options)
-        pk_type = table_options[:id] || @options[:check_relation_type].to_sym
-        child_column_type = column_attrs[:type]
 
-        if pk_type != child_column_type
+        parent_column_info = {
+          :type => table_options[:id] || @options[:check_relation_type].to_sym,
+          :unsigned => table_options[:unsigned],
+        }
+
+        child_column_info = {
+          :type => column_attrs[:type],
+          :unsigned => column_attrs.fetch(:options, {})[:unsigned],
+        }
+
+        [parent_column_info, child_column_info].each do |column_info|
+          unless column_info[:unsigned]
+            column_info.delete(:unsigned)
+          end
+
+          # for PostgreSQL
+          column_info[:type] = {
+            :serial => :integer,
+            :bigserial => :bigint,
+          }.fetch(column_info[:type], column_info[:type])
+        end
+
+        if parent_column_info != child_column_info
           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: #{pk_type}
-  %*s: #{child_column_type}
+  %*s: #{parent_column_info_str}
+  %*s: #{child_column_info_str}
           EOS
         end
       end

data/lib/ridgepole/version.rb

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

data/spec/mysql/migrate/migrate_check_relation_column_type_spec.rb

@@ -1,4 +1,4 @@
-describe 'Ridgepole::Client#diff -> migrate', 5.1 do
+describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
   context 'with warning' do
     let(:actual_dsl) {
       erbh(<<-EOS)
@@ -45,8 +45,66 @@ describe 'Ridgepole::Client#diff -> migrate', 5.1 do
     it {
       expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
 [WARNING] Relation column type is different.
-              employees.id: bigint
-  dept_manager.employee_id: integer
+              employees.id: :type=>:bigint
+  dept_manager.employee_id: :type=>:integer
+      EOS
+
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+
+  context 'with unsigned warning' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "dept_manager", force: :cascade do |t|
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
+        end
+
+        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
+          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 "dept_manager", force: :cascade do |t|
+          t.bigint "employee_id"
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
+        end
+
+        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
+          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(check_relation_type: 'bigint') }
+
+    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
       EOS
 
       delta = subject.diff(expected_dsl)
@@ -109,4 +167,57 @@ describe 'Ridgepole::Client#diff -> migrate', 5.1 do
       expect(subject.dump).to match_fuzzy expected_dsl
     }
   end
+
+  context 'with unsigned warning' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "dept_manager", force: :cascade do |t|
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
+        end
+
+        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
+          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 "dept_manager", force: :cascade do |t|
+          t.bigint "employee_id", unsigned: true
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
+        end
+
+        create_table "employees", id: :bigint, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
+          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(check_relation_type: 'bigint') }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
 end

data/spec/postgresql/migrate/migrate_check_relation_column_type_spec.rb

@@ -0,0 +1,112 @@
+describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
+  context 'with warning' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "dept_manager", force: :cascade do |t|
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
+        end
+
+        create_table "employees", id: :serial, force: :cascade do |t|
+          t.integer "emp_no", null: false
+          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 "dept_manager", force: :cascade do |t|
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
+          t.bigint "employee_id"
+        end
+
+        create_table "employees", id: :serial, force: :cascade do |t|
+          t.integer "emp_no", null: false
+          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(check_relation_type: 'bigserial') }
+
+    it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+[WARNING] Relation column type is different.
+              employees.id: :type=>:integer
+  dept_manager.employee_id: :type=>:bigint
+      EOS
+
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+
+  context 'with warning' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "dept_manager", force: :cascade do |t|
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
+        end
+
+        create_table "employees", id: :serial, force: :cascade do |t|
+          t.integer "emp_no", null: false
+          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 "dept_manager", force: :cascade do |t|
+          t.string  "dept_no", limit: 4, null: false
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
+          t.integer "employee_id"
+        end
+
+        create_table "employees", id: :serial, force: :cascade do |t|
+          t.integer "emp_no", null: false
+          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(check_relation_type: 'bigserial') }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta8
+  version: 0.7.0.beta9
 platform: ruby
 authors:
 - Genki Sugawara
@@ -339,6 +339,7 @@ files:
 - 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_check_relation_column_type_spec.rb
 - spec/postgresql/migrate/migrate_create_table_spec.rb
 - spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_spec.rb
@@ -481,6 +482,7 @@ test_files:
 - 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_check_relation_column_type_spec.rb
 - spec/postgresql/migrate/migrate_create_table_spec.rb
 - spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_spec.rb