ridgepole 0.7.1.beta4 → 0.7.1.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573f4b844c5ea5951efd6c7a5807300a79545121
-  data.tar.gz: f94d8891b7acc9b42106bd2ccd7e08f8771f922a
+  metadata.gz: b663d82d153001757f0f7ea0437fc4ca478968c5
+  data.tar.gz: 8d0280aea682ea7aa618814305dc6a6a095765a9
 SHA512:
-  metadata.gz: d5f191e59ef592721209cc97a4f1d019297d5d6d042e9f504665c365d35a3a55cbb4480fc6345966dc227fb35229e9012fbe866beb3e4641944d6d82f675b3f9
-  data.tar.gz: 693ab38c2cb409e988311872ee9e7586b10d834a654077d98b235c7cb8f10b8339a05cf7e8036dc7518ab8ae176d7555841ead84d61d59613fbddc088d4cbd74
+  metadata.gz: b372feddfa461f7eae624ce7167323de0ce1d4aa6f5f797737603d02df15e7caae0dcab2af372823fbddbe5bb017f0da43ce1c4b874a207f0fa3cf00710c1c1c
+  data.tar.gz: 92e8c615746f466c4a557ef05c5ff7935180277f1fcae0ead01de4b485bb89718adc226a88a087fab3d3afdb4d476ad05a282c0e8b5ad46835a8c8e81d575791

data/README.md

@@ -83,6 +83,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Remove `--reverse` option
   * Add `--allow-pk-change` option
   * Add `--create-table-with-index` option
+  * Add `--mysql-dump-auto-increment` option (`rails >= 5.1`)
 
 ## Installation
 
@@ -137,6 +138,8 @@ Usage: ridgepole [options]
         --check-relation-type DEF_PK
         --ignore-table-comment
         --skip-column-comment-change
+        --create-table-with-index
+        --mysql-dump-auto-increment
     -r, --require LIBS
         --log-file LOG_FILE
         --verbose

data/bin/ridgepole

@@ -126,6 +126,15 @@ ARGV.options do |opt|
     opt.on('',   '--skip-column-comment-change')                 {    options[:skip_column_comment_change] = true          }
     opt.on('',   '--allow-pk-change')                            {    options[:allow_pk_change] = true                     }
     opt.on('',   '--create-table-with-index')                    {    options[:create_table_with_index] = true             }
+
+    opt.on('',   '--mysql-dump-auto-increment') {
+      if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('5.1')
+        raise OptionParser::InvalidOption, '`mysql-dump-auto-increment` is not available in `activerecord < 5.1`'
+      end
+
+      options[:mysql_dump_auto_increment] = 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/client.rb

@@ -17,6 +17,10 @@ class Ridgepole::Client
     if @options[:mysql_use_alter]
       require 'ridgepole/ext/abstract_mysql_adapter/use_alter_index'
     end
+
+    if @options[:mysql_dump_auto_increment]
+      require 'ridgepole/ext/abstract_mysql_adapter/dump_auto_increment'
+    end
   end
 
   def dump(&block)

data/lib/ridgepole/ext/abstract_mysql_adapter/dump_auto_increment.rb

@@ -0,0 +1,23 @@
+require 'active_record/connection_adapters/abstract_mysql_adapter'
+
+module Ridgepole
+  module Ext
+    module AbstractMysqlAdapter
+      module DumpAutoIncrement
+        def prepare_column_options(column)
+         spec = super
+         spec[:auto_increment] = "true" if column.auto_increment?
+         spec
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractMysqlAdapter
+      prepend Ridgepole::Ext::AbstractMysqlAdapter::DumpAutoIncrement
+    end
+  end
+end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.1.beta4'
+  VERSION = '0.7.1.beta5'
 end

data/spec/mysql/cli/ridgepole_spec.rb

@@ -51,6 +51,7 @@ describe 'ridgepole' do
             --skip-column-comment-change
             --allow-pk-change
             --create-table-with-index
+            --mysql-dump-auto-increment
         -r, --require LIBS
             --log-file LOG_FILE
             --verbose

data/spec/mysql/migrate/migrate_create_table_with_index_spec.rb

@@ -0,0 +1,41 @@
+describe 'Ridgepole::Client#diff -> migrate (with index)' do
+  context 'when create table' do
+    let(:actual_dsl) { '' }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        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
+          t.date    "to_date", null: false
+          t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client(create_table_with_index: true) }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+
+      expect(delta.script).to match_fuzzy erbh(<<-EOS)
+        create_table("dept_emp", {:primary_key=>["emp_no", "dept_no"]}) do |t|
+          t.column("emp_no", :"integer", {:null=>false, :limit=>4})
+          t.column("dept_no", :"string", {:null=>false, :limit=>255})
+          t.column("from_date", :"date", {:null=>false})
+          t.column("to_date", :"date", {:null=>false})
+          t.index(["dept_no"], <%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
+          t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
+        end
+      EOS
+
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

data/spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb

@@ -0,0 +1,41 @@
+describe 'Ridgepole::Client#diff -> migrate (with index)', condition: 5.1 do
+  context 'when create table with auto increment column' do
+    let(:actual_dsl) { '' }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
+          t.integer "emp_no", null: false
+          t.integer "dept_no", null: false, auto_increment: true
+          t.date    "from_date", null: false
+          t.date    "to_date", null: false
+          t.index ["dept_no"], name: "dept_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "emp_no", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client(create_table_with_index: true, mysql_dump_auto_increment: true) }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+
+      expect(delta.script).to match_fuzzy erbh(<<-EOS)
+        create_table("dept_emp", {:primary_key=>["emp_no", "dept_no"]}) do |t|
+          t.column("emp_no", :"integer", {:null=>false, :limit=>4})
+          t.column("dept_no", :"integer", {:null=>false, :auto_increment=>true, :limit=>4})
+          t.column("from_date", :"date", {:null=>false})
+          t.column("to_date", :"date", {:null=>false})
+          t.index(["dept_no"], <%= {:name=>"dept_no"} + cond(5.0, using: :btree) %>)
+          t.index(["emp_no"], <%= {:name=>"emp_no"} + cond(5.0, using: :btree) %>)
+        end
+      EOS
+
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.1.beta4
+  version: 0.7.1.beta5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -232,6 +232,7 @@ files:
 - lib/ridgepole/dumper.rb
 - lib/ridgepole/execute_expander.rb
 - lib/ridgepole/ext/abstract_adapter/disable_table_options.rb
+- lib/ridgepole/ext/abstract_mysql_adapter/dump_auto_increment.rb
 - lib/ridgepole/ext/abstract_mysql_adapter/use_alter_index.rb
 - lib/ridgepole/ext/pp_sort_hash.rb
 - lib/ridgepole/ext/schema_dumper.rb
@@ -292,6 +293,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_index_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_options_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_script_spec.rb
 - spec/mysql/migrate/migrate_drop_column_and_index2_spec.rb
@@ -330,6 +332,7 @@ files:
 - spec/mysql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_create_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb
+- spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb
 - spec/mysql57/json/add_json_column_spec.rb
 - spec/mysql57/json/change_json_column_spec.rb
 - spec/mysql57/json/drop_json_column_spec.rb
@@ -444,6 +447,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_index_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_options_spec.rb
 - spec/mysql/migrate/migrate_create_table_with_script_spec.rb
 - spec/mysql/migrate/migrate_drop_column_and_index2_spec.rb
@@ -482,6 +486,7 @@ test_files:
 - spec/mysql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_create_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb
+- spec/mysql/~dump_auto_increment/migrate_create_table_with_index_spec.rb
 - spec/mysql57/json/add_json_column_spec.rb
 - spec/mysql57/json/change_json_column_spec.rb
 - spec/mysql57/json/drop_json_column_spec.rb