ridgepole 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 540a3e7012616c467934600e8bf44d720cf33f77
-  data.tar.gz: eaebf6d806fb23a6d6cd82b6af8415d64286d0d1
+  metadata.gz: ab3d1415ea667dc38d7e9e3a039fa2faefab3e4c
+  data.tar.gz: 98097987a640fba886daf5b82202c7198576e655
 SHA512:
-  metadata.gz: b3f0ffa78c0fb82ff822e02230c9d2997823bc5090dd2e21e41f918b1436793f1f731852237843dcae2bb13ea93a48f8693127207446bc32962f90b0a069814f
-  data.tar.gz: 7e4cc137e218c8028a03b8b4c222b477dc037cc4cd99dea39e98721778354ddafa959010354ee8fc14116939b8aaa7306abde4667c4f056ee60170ab05854072
+  metadata.gz: cf3b70e23223126228023ebe3cd075711aec5c184422b1617e2b856da9ae710147c0a497d54311a1893bd0a032fe3856dd953b7130ee39bb1e3ee0f3d0485536
+  data.tar.gz: 4149d78aa6421566d07f2b2e6c2e19cd60b611d7f880776bf5b03faf2931a95dbfefefc456641a3d49bf93a4d7c39890cbb8ecdb31c6cac75781c35d36f51c98

data/lib/ridgepole/diff.rb

@@ -83,6 +83,9 @@ class Ridgepole::Diff
 
     to.each do |column_name, to_attrs|
       if (from_attrs = from.delete(column_name))
+        normalize_column_options!(from_attrs[:options])
+        normalize_column_options!(to_attrs[:options])
+
         if from_attrs != to_attrs
           definition_delta[:change] ||= {}
           definition_delta[:change][column_name] = to_attrs
@@ -152,4 +155,12 @@ class Ridgepole::Diff
   def target?(table_name)
     not @options[:tables] or @options[:tables].include?(table_name)
   end
+
+  def normalize_column_options!(opts)
+    opts[:null] = true unless opts.has_key?(:null)
+
+    unless @options[:disable_mysql_unsigned]
+      opts[:unsigned] = false unless opts.has_key?(:unsigned)
+    end
+  end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/dump/dump_disable_unsigned_spec.rb

@@ -0,0 +1,75 @@
+describe 'Ridgepole::Client#dump' do
+  context 'when there is a tables (disable unsigned)' do
+    before { restore_tables }
+    subject { client(disable_mysql_unsigned: true) }
+
+    it {
+      expect(subject.dump).to eq (<<-RUBY).undent.strip
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",              null: false
+          t.string  "dept_no",   limit: 4, null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  null: false
+          t.integer "club_id", null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true 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
+
+        create_table "salaries", id: false, force: true 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
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+  end
+end

data/spec/migrate/migrate_same_default_null_spec.rb

@@ -0,0 +1,75 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when database and definition are same (default null / nothing -> null:true)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true 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"
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true 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: true
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_false
+      expect(subject.dump).to eq actual_dsl.undent.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.undent.strip.gsub(/\s*,\s*null: true/, '')
+    }
+  end
+
+  context 'when database and definition are same (default null / null:true -> nothing)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true 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: true
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: true 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"
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_false
+      expect(subject.dump).to eq actual_dsl.undent.strip.gsub(/\s*,\s*null: true/, '')
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.undent.strip
+    }
+  end
+end

data/spec/migrate/migrate_same_default_unsigned_spec.rb

@@ -0,0 +1,63 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when database and definition are same (default unsigned / nothing -> unsigned:false)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id",                 null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: false,null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_false
+      expect(subject.dump).to eq actual_dsl.undent.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.undent.strip.gsub('unsigned: false,', '                ')
+    }
+  end
+
+  context 'when database and definition are same (default null / unsigned:false -> nothing)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: false,null: false
+        end
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id",                 null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_false
+      expect(subject.dump).to eq actual_dsl.undent.strip.gsub('unsigned: false,', '                ')
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.undent.strip
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara
@@ -120,6 +120,7 @@ files:
 - lib/ridgepole/string_ext.rb
 - lib/ridgepole/version.rb
 - ridgepole.gemspec
+- spec/dump/dump_disable_unsigned_spec.rb
 - spec/dump/dump_spec.rb
 - spec/migrate/migrate_add_column_spec.rb
 - spec/migrate/migrate_change_column_spec.rb
@@ -132,6 +133,8 @@ files:
 - spec/migrate/migrate_merge_mode_spec.rb
 - spec/migrate/migrate_rename_column_spec.rb
 - spec/migrate/migrate_rename_table_spec.rb
+- spec/migrate/migrate_same_default_null_spec.rb
+- spec/migrate/migrate_same_default_unsigned_spec.rb
 - spec/migrate/migrate_same_spec.rb
 - spec/ridgepole_test_database.sql
 - spec/ridgepole_test_tables.sql
@@ -162,6 +165,7 @@ signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to DB schema.
 test_files:
+- spec/dump/dump_disable_unsigned_spec.rb
 - spec/dump/dump_spec.rb
 - spec/migrate/migrate_add_column_spec.rb
 - spec/migrate/migrate_change_column_spec.rb
@@ -174,6 +178,8 @@ test_files:
 - spec/migrate/migrate_merge_mode_spec.rb
 - spec/migrate/migrate_rename_column_spec.rb
 - spec/migrate/migrate_rename_table_spec.rb
+- spec/migrate/migrate_same_default_null_spec.rb
+- spec/migrate/migrate_same_default_unsigned_spec.rb
 - spec/migrate/migrate_same_spec.rb
 - spec/ridgepole_test_database.sql
 - spec/ridgepole_test_tables.sql