ridgepole 0.7.0.alpha3 → 0.7.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbdcb1cafcede044e48cfd8b7a9c2799c96c98a
-  data.tar.gz: 6c9a147a2162f3c51110d9b1ee6051229638760c
+  metadata.gz: 396b70e0da23ec61bcfcbf048b12ddce3b982372
+  data.tar.gz: 42cd06dddcc39e058530cb7593bfa24163ad3252
 SHA512:
-  metadata.gz: e9f9c72ae55df7d7dce3dd7a68fd4d5b37bdd5a43df49ed5c8038ad272242cbfdf305e2f5af415f6606057a94505f61b00f7dd9e6a23bfa43b6d9d980ac27dbf
-  data.tar.gz: 6356712998757d48fc5c54e3feef06e4c3580eed2d5cb81b265af9267fb3ebf3def563e81d38dc3761c5b1dcfe3e251399fcb22787df3b84c242023d03108b92
+  metadata.gz: 055eff66d521e0a05b3d7bd5000833cd59abc9f93d363dd2dba91ace2cd0d5812c77fc197d5a0d16033d280d414a7da6974daf3b35af41f5981fb16a331656e4
+  data.tar.gz: a2340a631b404bf1341c0a6d9de8350fdb221ac33492ba16b3d08161fc362ff46f9e838d502c1a161734e77424e2004761e1b5e85562cf2e514de60ecadae2ee

data/README.md

@@ -6,21 +6,10 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 (like Chef/Puppet)
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
+[![Edge Version](https://img.shields.io/badge/edge%20version-0.7.0.beta-green.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta)
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=master)](https://travis-ci.org/winebarrel/ridgepole)
 [![Coverage Status](https://coveralls.io/repos/winebarrel/ridgepole/badge.svg?branch=master)](https://coveralls.io/r/winebarrel/ridgepole?branch=master)
 
-**Important**
-
-Please don't use the following nameless fk:
-
-```ruby
-add_foreign_key :articles, :authors # without `name:`
-```
-
-**It is highly recommended to give a name to the fk explicitly.**
-
-![](https://cdn.pbrd.co/images/8Ymz6nU5x.gif)
-
 **Notice**
 
 * `>= 0.4.8`
@@ -80,6 +69,8 @@ add_foreign_key :articles, :authors # without `name:`
   * Add `--skip-drop-table` option
   * Support foreign key without name
   * Support MySQL JSON Type and Generated Columns
+  * Add `--mysql-change-table-options` option
+  * Pass config from env
 
 ## Installation
 
@@ -130,6 +121,7 @@ Usage: ridgepole [options]
         --dump-with-default-fk-name
         --index-removed-drop-column
         --skip-drop-table
+        --mysql-change-table-options
     -r, --require LIBS
         --log-file LOG_FILE
         --verbose
@@ -151,7 +143,8 @@ username: root
 
 $ ridgepole -c config.yml --export -o Schemafile
 # or `ridgepole -c '{adapter: mysql2, database: blog}' ...`
-# or `ridgepole -c 'mysql2://root:3306@127.0.0.1/blog' ...`
+# or `ridgepole -c 'mysql2://root:pass@127.0.0.1:3306/blog' ...`
+# or `export DB_URL='mysql2://...'; ridgepole -c env:DB_URL ...`
 Export Schema to `Schemafile`
 
 $ cat Schemafile
@@ -230,10 +223,6 @@ add_index "child", ["parent_id"], name: "par_ind", using: :btree
 add_foreign_key "child", "parent", name: "child_ibfk_1"
 ```
 
-**Notice:** **It is highly recommended to give a name to the fk explicitly.**
-
-Please pass `--dump-with-default-fk-name` option if you want to use the nameless index.
-
 ## 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)
 

data/bin/ridgepole

@@ -114,6 +114,7 @@ ARGV.options do |opt|
     opt.on('',   '--dump-with-default-fk-name')       {    options[:dump_with_default_fk_name] = true           }
     opt.on('',   '--index-removed-drop-column')       {    options[:index_removed_drop_column] = true           }
     opt.on('',   '--skip-drop-table')                 {    options[:skip_drop_table] = true                     }
+    opt.on('',   '--mysql-change-table-options')      {    options[:mysql_change_table_options] = 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/cli/config.rb

@@ -4,6 +4,10 @@ require 'yaml'
 class Ridgepole::Config
   class << self
     def load(config, env = 'development')
+      if config =~ /\Aenv:(.+)\z/
+        config = ENV.fetch($1)
+      end
+
       if File.exist?(config)
         parsed_config = parse_config_file(config)
       elsif (expanded = File.expand_path(config)) and File.exist?(expanded)

data/lib/ridgepole/client.rb

@@ -22,7 +22,9 @@ class Ridgepole::Client
       require 'ridgepole/ext/schema_dumper'
     end
 
-    require 'ridgepole/ext/abstract_mysql_adapter/disable_table_options'
+    if @options[:dump_without_table_options]
+      require 'ridgepole/ext/abstract_mysql_adapter/disable_table_options'
+    end
   end
 
   def dump(&block)

data/lib/ridgepole/delta.rb

@@ -269,10 +269,20 @@ drop_table(#{table_name.inspect})
     buf.puts
   end
 
+  def append_change_table_options(table_name, table_options, buf)
+    # XXX: MySQL only
+    buf.puts(<<-EOS)
+execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name)} #{table_options}"
+    EOS
+
+    buf.puts
+  end
+
   def append_change(table_name, attrs, buf, buf_for_fk)
     definition = attrs[:definition] || {}
     indices = attrs[:indices] || {}
     foreign_keys = attrs[:foreign_keys] || {}
+    table_options = attrs[:table_options]
 
     if not definition.empty? or not indices.empty?
       append_change_table(table_name, buf) do
@@ -285,6 +295,10 @@ drop_table(#{table_name.inspect})
       append_change_foreign_keys(table_name, foreign_keys, buf_for_fk, @options)
     end
 
+    if table_options
+      append_change_table_options(table_name, table_options, buf)
+    end
+
     buf.puts
     buf_for_fk.puts
   end

data/lib/ridgepole/diff.rb

@@ -101,10 +101,21 @@ class Ridgepole::Diff
 
     normalize_default_proc_options!(from, to)
 
+    from_options = from[:options] || {}
+    to_options = to[:options] || {}
+
+    if @options[:mysql_change_table_options] and from_options != to_options and Ridgepole::ConnectionAdapters.mysql?
+      from.delete(:options)
+      to.delete(:options)
+      table_delta[:table_options] = to_options
+    end
+
     unless from == to
-      Ridgepole::Logger.instance.warn("[WARNING] No difference of schema configuration for table `#{table_name}` but table options differ.")
-      Ridgepole::Logger.instance.warn("  from: #{from}")
-      Ridgepole::Logger.instance.warn("    to: #{to}")
+      @logger.warn(<<-EOS)
+[WARNING] No difference of schema configuration for table `#{table_name}` but table options differ.
+  from: #{from}
+    to: #{to}
+      EOS
     end
   end
 

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0.alpha3'
+  VERSION = '0.7.0.beta'
 end

data/spec/mysql/_migrate/migrate_change_table_option_spec.rb

@@ -0,0 +1,38 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change mysql table options' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", force: :cascade, options: "ENGINE=MyISAM DEFAULT CHARSET=utf8" 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
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=ascii" 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
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client(dump_without_table_options: false, mysql_change_table_options: true) }
+
+    it {
+      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/mysql/cli/config_spec.rb

@@ -109,14 +109,33 @@ describe Ridgepole::Config do
   end
 
   context 'when passed DATABASE_URL' do
-    let(:config) { 'mysql2://root:1234@127.0.0.1/blog' }
+    let(:config) { 'mysql2://root:pass@127.0.0.1:3307/blog' }
     let(:env) { 'development' }
 
     it {
       expect(subject['adapter']).to eq "mysql2"
       expect(subject['database']).to eq "blog"
       expect(subject['username']).to eq "root"
-      expect(subject['password']).to eq "1234"
+      expect(subject['password']).to eq "pass"
+      expect(subject['port']).to eq 3307
+    }
+  end
+
+  context 'when passed DATABASE_URL from ENV' do
+    let(:config) { 'env:DATABASE_URL' }
+    let(:env) { 'development' }
+
+    before {
+      allow(ENV).to receive(:fetch).with('DATABASE_URL').
+        and_return('mysql2://root:pass@127.0.0.1:3307/blog')
+    }
+
+    it {
+      expect(subject['adapter']).to eq "mysql2"
+      expect(subject['database']).to eq "blog"
+      expect(subject['username']).to eq "root"
+      expect(subject['password']).to eq "pass"
+      expect(subject['port']).to eq 3307
     }
   end
 end

data/spec/mysql/cli/ridgepole_spec.rb

@@ -45,6 +45,7 @@ describe 'ridgepole' do
             --dump-with-default-fk-name
             --index-removed-drop-column
             --skip-drop-table
+            --mysql-change-table-options
         -r, --require LIBS
             --log-file LOG_FILE
             --verbose

data/spec/mysql/migrate/migrate_change_table_option_spec.rb

@@ -28,9 +28,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] No difference of schema configuration for table `employees` but table options differ.")
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(%Q!  from: {:primary_key=>"emp_no"}!))
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(%Q!    to: {:primary_key=>"emp_no2"}!))
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+[WARNING] No difference of schema configuration for table `employees` but table options differ.
+  from: {:primary_key=>"emp_no"}
+    to: {:primary_key=>"emp_no2"}
+      EOS
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey
       expect(subject.dump).to match_fuzzy actual_dsl
@@ -39,9 +41,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] No difference of schema configuration for table `employees` but table options differ.")
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(%Q!  from: {:primary_key=>"emp_no2"}!))
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(%Q!    to: {:primary_key=>"emp_no"}!))
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+[WARNING] No difference of schema configuration for table `employees` but table options differ.
+  from: {:primary_key=>"emp_no2"}
+    to: {:primary_key=>"emp_no"}
+      EOS
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
       expect(delta.differ?).to be_falsey
     }

data/spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb

@@ -78,9 +78,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
     subject { client }
 
     it {
-      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] No difference of schema configuration for table `users` but table options differ.")
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(%Q!  from: {:id=>:uuid, :default=>"uuid_generate_v1()"}!))
-      expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(%Q!    to: {:id=>:uuid, :default=>"uuid_generate_v4()"}!))
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-EOS)
+[WARNING] No difference of schema configuration for table `users` but table options differ.
+  from: {:id=>:uuid, :default=>"uuid_generate_v1()"}
+    to: {:id=>:uuid, :default=>"uuid_generate_v4()"}
+      EOS
 
       delta = subject.diff(expected_dsl)
       expect(delta.differ?).to be_falsey

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha3
+  version: 0.7.0.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -244,6 +244,7 @@ files:
 - spec/cli_helper.rb
 - spec/erb_helper.rb
 - spec/hide_pending_formatter.rb
+- spec/mysql/_migrate/migrate_change_table_option_spec.rb
 - spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/bigint_pk/int_pk_spec.rb
 - spec/mysql/cli/config_spec.rb
@@ -384,6 +385,7 @@ test_files:
 - spec/cli_helper.rb
 - spec/erb_helper.rb
 - spec/hide_pending_formatter.rb
+- spec/mysql/_migrate/migrate_change_table_option_spec.rb
 - spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/bigint_pk/int_pk_spec.rb
 - spec/mysql/cli/config_spec.rb