ridgepole 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea23dd30570f2a2ffdf62e4f8ed6f6ed8c67e304928da70741efd9472a81c9f2
-  data.tar.gz: 26fd4bac4550c955931f7aacf4574fecba444950104aacd12300ce81df7cac42
+  metadata.gz: 2271671a770bf65b2503ba193108875f5892f697e37853097a0eb105024276c4
+  data.tar.gz: fb6b7f6eb304dabff71858c5029cfe92ce565c7e28612be4319b53bca669c706
 SHA512:
-  metadata.gz: af208c1fc27a0dda85a5ba67bc884726cdca4db42dc67a2a477446af9d1881311935908e207cabf0c9672021e4518fb54e1b8edc177d0cc9da8d05cc5f5394a9
-  data.tar.gz: 8d350aa7af72210307606aed1092294855df1a4cd03a64dc2be59d898ecf5fc6b2e13e6b0784e4373f89182fa9d4b30690eb7a523ba2d229845193b856739117
+  metadata.gz: 1f46efedeb45729023425090ee220c2c18ffd447ef34450d17b7f70b5c374cdaf830a9996034d1104be0f5cb8ac14aaf943edc8e0d1a936c8e9ac62fb28222b8
+  data.tar.gz: d4c338561c39f60407db3e82984f021aefe40b728bd168de046e4cd56020dfa95a97ef0a2a9d3949c2fc6cb6d2af03e10dd41b97e291b9c6e1dc397e10db9051

data/.travis.yml

@@ -6,13 +6,10 @@ cache:
   - bundler
   - apt
 rvm:
-  - 2.3.6
+  - 2.3.8
   - 2.4.5
   - 2.5.3
-  - 2.6.0-preview2
-matrix:
-  allow_failures:
-    - rvm: 2.6.0-preview2
+  - 2.6.0
 before_script:
   - sudo service mysql stop
   - sudo service postgresql stop

data/README.md

@@ -94,6 +94,9 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Fix polymorphic options ([pull#263](https://github.com/winebarrel/ridgepole/pull/263))
   * Fix `--mysql-use-alter` option ([pull#246](https://github.com/winebarrel/ridgepole/pull/264))
   * Fix Database URI parsing ([pull#265](https://github.com/winebarrel/ridgepole/pull/265))
+* `>= 0.7.6`
+  * Fix database url check ([pull#266](https://github.com/winebarrel/ridgepole/pull/266))
+  * Add ignore option ([pull#267](https://github.com/winebarrel/ridgepole/pull/267))
 </details>
 
 ## Installation
@@ -274,6 +277,18 @@ add_index "child", ["parent_id"], name: "par_ind", using: :btree
 add_foreign_key "child", "parent", name: "child_ibfk_1"
 ```
 
+## Ignore Column/Index/FK
+
+```ruby
+create_table "articles", force: :cascade do |t|
+  t.string   "title", ignore: true # All changes are ignored
+  t.text     "desc", renamed_from: "text"
+  t.text     "author"
+  t.datetime "created_at"
+  t.datetime "updated_at"
+end
+```
+
 ## Collation/Charset
 You can use the column collation by passing `--enable-mysql-awesome` ([activerecord-mysql-awesome](https://github.com/kamipo/activerecord-mysql-awesome) is required)
 
@@ -397,7 +412,7 @@ Apply `Schemafile`
 ...
 ```
 
-## Running tests
+## Run tests
 
 ```sh
 docker-compose up -d

data/lib/ridgepole/cli/config.rb

@@ -51,12 +51,19 @@ module Ridgepole
       def parse_database_url(config)
         uri = URI.parse(config)
 
-        raise "Invalid config: #{config.inspect}" if [uri.scheme, uri.user, uri.host, uri.path].any? { |i| i.nil? || i.empty? }
+        %w[scheme user host path].each do |key|
+          value = uri.send(key)
+
+          if value.nil? || value.empty?
+            key = 'database' if key == 'path'
+            raise "Invalid config: '#{key}' is empty: #{config.inspect}"
+          end
+        end
 
         {
           'adapter' => uri.scheme,
           'username' => CGI.unescape(uri.user),
-          'password' => CGI.unescape(uri.password),
+          'password' => uri.password ? CGI.unescape(uri.password) : nil,
           'host' => uri.host,
           'port' => uri.port,
           'database' => CGI.unescape(uri.path.sub(%r{\A/}, '')),

data/lib/ridgepole/delta.rb

@@ -227,6 +227,9 @@ create_table(#{table_name.inspect}, #{inspect_options_include_default_proc(optio
       definition.each do |column_name, column_attrs|
         column_type = column_attrs.fetch(:type)
         column_options = column_attrs[:options] || {}
+        ignore_column = column_options[:ignore]
+        next if ignore_column
+
         normalize_limit(column_type, column_options)
 
         buf.puts(<<-RUBY)
@@ -419,6 +422,8 @@ remove_column(#{table_name.inspect}, #{column_name.inspect})
     def append_add_index(table_name, _index_name, attrs, buf, force_bulk_change = false)
       column_name = attrs.fetch(:column_name)
       options = attrs[:options] || {}
+      ignore_index = options[:ignore]
+      return if ignore_index
 
       if force_bulk_change || @options[:bulk_change]
         buf.puts(<<-RUBY)

data/lib/ridgepole/diff.rb

@@ -210,7 +210,11 @@ module Ridgepole
                          end
 
       to.each do |column_name, to_attrs|
-        if (from_attrs = from.delete(column_name))
+        ignore_column = to_attrs.fetch(:options, {}).delete(:ignore)
+        from_attrs = from.delete(column_name)
+        next if ignore_column
+
+        if from_attrs
           to_attrs = build_attrs_if_changed(to_attrs, from_attrs, table_name)
           if to_attrs
             definition_delta[:change] ||= {}
@@ -296,6 +300,8 @@ module Ridgepole
       indices_delta = {}
 
       to.each do |index_name, to_attrs|
+        ignore_index = to_attrs.fetch(:options, {}).delete(:ignore)
+
         if index_name.is_a?(Array)
           from_index_name, from_attrs = from.find { |_name, attrs| attrs[:column_name] == index_name }
 
@@ -307,6 +313,8 @@ module Ridgepole
           from_attrs = from.delete(index_name)
         end
 
+        next if ignore_index
+
         if from_attrs
           normalize_index_options!(from_attrs[:options])
           normalize_index_options!(to_attrs[:options])
@@ -391,7 +399,9 @@ module Ridgepole
       foreign_keys_delta = {}
 
       to.each do |foreign_key_name_or_tables, to_attrs|
+        ignore_fk = to_attrs.fetch(:options, {}).delete(:ignore)
         from_attrs = from.delete(foreign_key_name_or_tables)
+        next if ignore_fk
 
         if from_attrs
           if from_attrs != to_attrs

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.5'.freeze
+  VERSION = '0.7.6'.freeze
 end

data/omnibus-ridgepole/Rakefile

@@ -24,7 +24,7 @@ namespace :docker do
 end
 
 namespace :omnibus do
-  task build: ['build:ubuntu', 'build:centos']
+  task build: ['docker:image:build', 'build:ubuntu', 'build:centos']
 
   namespace :build do
     task :ubuntu do

data/spec/mysql/cli/config_spec.rb

@@ -104,7 +104,7 @@ describe Ridgepole::Config do
     specify do
       expect do
         subject
-      end.to raise_error 'Invalid config: "database.yml"'
+      end.to raise_error %(Invalid config: 'scheme' is empty: "database.yml")
     end
   end
 

data/spec/mysql/fk/migrate_ignore_fk_spec.rb

@@ -0,0 +1,68 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when create fk with ignore:true' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(actual_dsl + <<-ERB)
+        add_foreign_key "child", "parent", name: "child_ibfk_1", ignore: true
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change fk with ignore:true' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        end
+
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        add_foreign_key "child", "parent", name: "child_ibfk_1", on_delete: :cascade
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "child", force: :cascade do |t|
+          t.integer "parent_id"
+          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "parent", <%= i cond('>= 5.1',id: :integer) %>, force: :cascade do |t|
+        end
+
+        add_foreign_key "child", "parent", name: "child_ibfk_1", ignore: true
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+end

data/spec/mysql/migrate/migrate_create_table_with_ignore_spec.rb

@@ -0,0 +1,43 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when create table with ignore:true' do
+    let(:dsl) do
+      erbh(<<-ERB)
+        create_table "departments", primary_key: "dept_no", force: :cascade do |t|
+          t.string "dept_name", limit: 40, null: false
+          t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
+        end
+
+        create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.string  "dept_no", null: false
+          t.date    "from_date", null: false, ignore: true
+          t.date    "to_date", null: false
+          t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>, ignore: true
+          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+        end
+      ERB
+    end
+
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "departments", primary_key: "dept_no", force: :cascade do |t|
+          t.string "dept_name", limit: 40, null: false
+          t.index ["dept_name"], name: "dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
+        end
+      ERB
+    end
+
+    let(:expected_dsl) { dsl.each_line.reject { |l| l =~ /ignore/ }.join }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_ruby actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+end

data/spec/mysql/migrate/migrate_ignore_column_spec.rb

@@ -0,0 +1,96 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when add column with ignore:true' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "club_id", null: false
+          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        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
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "club_id", null: false
+          t.string  "any_col", null: false, ignore: true
+          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        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
+          t.integer "age", null: false, ignore: true
+          t.date    "updated_at", ignore: true
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change column with ignore:true' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "club_id", null: false
+          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        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
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "club_id", ignore: true
+          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
+        end
+
+        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: 20, default: "XXX", null: false, ignore: true
+          t.string "gender", limit: 2, null: false, ignore: true
+          t.date   "hire_date", null: false
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+end

data/spec/mysql/migrate/migrate_ignore_index_spec.rb

@@ -0,0 +1,90 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when create index with ignore:true' do
+    let(:dsl) do
+      erbh(<<-ERB)
+        create_table "clubs", force: :cascade do |t|
+          t.string "name", default: "", null: false
+          t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>, ignore: true
+        end
+
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "club_id", null: false
+          t.index ["emp_no", "club_id"], name: "idx_emp_no_club_id", <%= i cond(5.0, using: :btree) %>, ignore: true
+        end
+
+        create_table "titles", id: false, force: :cascade 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"
+          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>, ignore: true
+        end
+      ERB
+    end
+
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "clubs", force: :cascade do |t|
+          t.string "name", default: "", null: false
+        end
+
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "club_id", null: false
+        end
+
+        create_table "titles", id: false, force: :cascade 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
+      ERB
+    end
+
+    let(:expected_dsl) { dsl }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change index with ignore:true' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        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
+          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        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
+          t.index ["from_date"], name: "emp_no", <%= i cond(5.0, using: :btree) %>, ignore: true
+        end
+      ERB
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -306,6 +306,7 @@ files:
 - spec/mysql/fk/migrate_change_fk_spec.rb
 - spec/mysql/fk/migrate_create_fk_spec.rb
 - spec/mysql/fk/migrate_drop_fk_spec.rb
+- spec/mysql/fk/migrate_ignore_fk_spec.rb
 - spec/mysql/migrate/check_orphan_index_spec.rb
 - spec/mysql/migrate/migrate_add_column2_spec.rb
 - spec/mysql/migrate/migrate_add_column_order_spec.rb
@@ -336,6 +337,7 @@ files:
 - spec/mysql/migrate/migrate_create_index2_spec.rb
 - spec/mysql/migrate/migrate_create_index_spec.rb
 - spec/mysql/migrate/migrate_create_table_spec.rb
+- spec/mysql/migrate/migrate_create_table_with_ignore_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_index_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_options_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_script_spec.rb
@@ -349,6 +351,8 @@ files:
 - spec/mysql/migrate/migrate_duplicate_table_spec.rb
 - spec/mysql/migrate/migrate_empty_spec.rb
 - spec/mysql/migrate/migrate_execute_spec.rb
+- spec/mysql/migrate/migrate_ignore_column_spec.rb
+- spec/mysql/migrate/migrate_ignore_index_spec.rb
 - spec/mysql/migrate/migrate_log_file_spec.rb
 - spec/mysql/migrate/migrate_merge_mode_spec.rb
 - spec/mysql/migrate/migrate_noop_spec.rb
@@ -464,6 +468,7 @@ test_files:
 - spec/mysql/fk/migrate_change_fk_spec.rb
 - spec/mysql/fk/migrate_create_fk_spec.rb
 - spec/mysql/fk/migrate_drop_fk_spec.rb
+- spec/mysql/fk/migrate_ignore_fk_spec.rb
 - spec/mysql/migrate/check_orphan_index_spec.rb
 - spec/mysql/migrate/migrate_add_column2_spec.rb
 - spec/mysql/migrate/migrate_add_column_order_spec.rb
@@ -494,6 +499,7 @@ test_files:
 - spec/mysql/migrate/migrate_create_index2_spec.rb
 - spec/mysql/migrate/migrate_create_index_spec.rb
 - spec/mysql/migrate/migrate_create_table_spec.rb
+- spec/mysql/migrate/migrate_create_table_with_ignore_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_index_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_options_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_script_spec.rb
@@ -507,6 +513,8 @@ test_files:
 - spec/mysql/migrate/migrate_duplicate_table_spec.rb
 - spec/mysql/migrate/migrate_empty_spec.rb
 - spec/mysql/migrate/migrate_execute_spec.rb
+- spec/mysql/migrate/migrate_ignore_column_spec.rb
+- spec/mysql/migrate/migrate_ignore_index_spec.rb
 - spec/mysql/migrate/migrate_log_file_spec.rb
 - spec/mysql/migrate/migrate_merge_mode_spec.rb
 - spec/mysql/migrate/migrate_noop_spec.rb