ridgepole 0.7.4 → 0.7.5.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9e1f7e2e2dcdca2d9af34e642e60289ee5666551
-  data.tar.gz: db223194fa6fff23ee8d8f5beeba4736f77a7f79
+SHA256:
+  metadata.gz: c44addc9926210f15e87edf0411337f5c26d438eb9c56149f0836fb00816a40a
+  data.tar.gz: 612e706281e910142283d5db37112243bdcb4aeaef80e5b477525788103336fc
 SHA512:
-  metadata.gz: 7d83dda15c6f6ba6374abfc165c688418d678d078d5ce1764f918c35209a3c67a1c61a04666b346be81076a4a19f6cd1622b6f876d79308c55401e9b14229706
-  data.tar.gz: 15cf3590d6a87f73744136b3b9f5170abedf673ccce912b16d3f6440fd7632d79e11704b6e642c890fb4260d46f92a8b57fe086cd651fb90d0250c0695b23d44
+  metadata.gz: cae35726e3780ca82aa489ee7bc77cab33c1d70d25548c152c9aadad31482deaa7e4a638b901b2a627a91c1fa796803a08b4df934e66ac1aa758e351e4f44279
+  data.tar.gz: 9be70b10cd5ef421c2bbb48a44b48a3d2dab47b10e3d941a6323cefb14f804fa46ecc411dbfabfa748d750d03ddaabdb98d766156eb6485e754d51de04c0725a

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   Exclude:
     - 'gemfiles/**/*'
+    - 'omnibus-ridgepole/**/*'
   TargetRubyVersion: 2.2
 Bundler/OrderedGems:
   Include:
@@ -34,5 +35,7 @@ Style/MethodMissingSuper:
 Style/MixinUsage:
   Exclude:
     - 'spec/**/*'
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma
 Layout/ClosingHeredocIndentation:
   Enabled: false

data/.travis.yml

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

data/README.md

@@ -89,6 +89,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Support primary key adding/dropping ([issue#246](https://github.com/winebarrel/ridgepole/issues/246))
 * `>= 0.7.4`
   * Fix `add_foreign_key` options ([issue#250](https://github.com/winebarrel/ridgepole/issues/250))
+* `>= 0.7.5`
+  * Fix polymorphic options ([pull#263](https://github.com/winebarrel/ridgepole/pull/263))
 
 ## Installation
 
@@ -104,6 +106,26 @@ Or install it yourself as:
 
     $ gem install ridgepole
 
+## Omnibus Package (deb/rpm)
+
+see https://github.com/winebarrel/ridgepole/releases.
+
+### Install from rpm
+
+```sh
+sudo dpkg -i ridgepole_x.x.x+xxx-x_amd64.deb
+sudo apt install build-essential libmysqlclient-dev
+sudo /opt/ridgepole/embedded/bin/gem install mysql2
+```
+
+### Install from rpm
+
+```sh
+sudo yum install ridgepole-x.x.x+xxx-x.el7.x86_64.rpm
+sudo yum install make gcc mariadb-devel
+sudo /opt/ridgepole/embedded/bin/gem install mysql2
+```
+
 ## Help
 ```
 Usage: ridgepole [options]

data/bin/ridgepole

@@ -24,7 +24,7 @@ COLUMN_TYPES = {
   float: :float,
   string: :string,
   text: :text,
-  binary: :binary
+  binary: :binary,
 }.freeze
 
 config = nil
@@ -40,11 +40,12 @@ exit_code = 0
 options = {
   dry_run: false,
   debug: false,
-  color: $stdout.tty?
+  color: $stdout.tty?,
 }
 
 set_mode = proc do |m|
   raise OptionParser::InvalidOption, 'More than one mode is specified' if mode
+
   mode = m
 end
 
@@ -85,6 +86,7 @@ ARGV.options do |opt|
     opt.on('',   '--external-script SCRIPT') { |v| options[:external_script] = v }
     opt.on('',   '--bulk-change') do
       raise OptionParser::InvalidOption, 'Cannot use `bulk-change` in `merge`' if options[:merge]
+
       options[:bulk_change] = true
     end
 
@@ -129,9 +131,7 @@ ARGV.options do |opt|
     opt.on('',   '--create-table-with-index') { options[:create_table_with_index] = true }
 
     opt.on('',   '--mysql-dump-auto-increment') do
-      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
+      raise OptionParser::InvalidOption, '`mysql-dump-auto-increment` is not available in `activerecord < 5.1`' if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('5.1')
 
       options[:mysql_dump_auto_increment] = true
     end
@@ -156,9 +156,7 @@ ARGV.options do |opt|
   rescue StandardError => e
     warn("[ERROR] #{e.message}")
 
-    unless e.is_a?(OptionParser::ParseError)
-      puts "\t" + e.backtrace.join("\n\t")
-    end
+    puts "\t" + e.backtrace.join("\n\t") unless e.is_a?(OptionParser::ParseError)
 
     exit 1
   end
@@ -251,6 +249,13 @@ begin
         else
           File.open(diff_file)
         end
+      elsif Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
+        YAML.safe_load(
+          diff_file,
+          permitted_classes: [],
+          permitted_symbols: [],
+          aliases: true
+        )
       else
         YAML.safe_load(diff_file, [], [], true)
       end

data/lib/ridgepole/cli/config.rb

@@ -11,13 +11,18 @@ module Ridgepole
                           parse_config_file(config)
                         elsif (expanded = File.expand_path(config)) && File.exist?(expanded)
                           parse_config_file(expanded)
+                        elsif Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
+                          YAML.safe_load(
+                            ERB.new(config).result,
+                            permitted_classes: [],
+                            permitted_symbols: [],
+                            aliases: true
+                          )
                         else
                           YAML.safe_load(ERB.new(config).result, [], [], true)
                         end
 
-        unless parsed_config.is_a?(Hash)
-          parsed_config = parse_database_url(config)
-        end
+        parsed_config = parse_database_url(config) unless parsed_config.is_a?(Hash)
 
         if parsed_config.key?(env.to_s)
           parsed_config.fetch(env.to_s)
@@ -30,23 +35,31 @@ module Ridgepole
 
       def parse_config_file(path)
         yaml = ERB.new(File.read(path)).result
-        YAML.safe_load(yaml, [], [], true)
+
+        if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
+          YAML.safe_load(
+            yaml,
+            permitted_classes: [],
+            permitted_symbols: [],
+            aliases: true
+          )
+        else
+          YAML.safe_load(yaml, [], [], true)
+        end
       end
 
       def parse_database_url(config)
         uri = URI.parse(config)
 
-        if [uri.scheme, uri.user, uri.host, uri.path].any? { |i| i.nil? || i.empty? }
-          raise "Invalid config: #{config.inspect}"
-        end
+        raise "Invalid config: #{config.inspect}" if [uri.scheme, uri.user, uri.host, uri.path].any? { |i| i.nil? || i.empty? }
 
         {
-          'adapter'  => uri.scheme,
+          'adapter' => uri.scheme,
           'username' => uri.user,
           'password' => uri.password,
-          'host'     => uri.host,
-          'port'     => uri.port,
-          'database' => uri.path.sub(%r{\A/}, '')
+          'host' => uri.host,
+          'port' => uri.port,
+          'database' => uri.path.sub(%r{\A/}, ''),
         }
       end
     end

data/lib/ridgepole/client.rb

@@ -6,22 +6,16 @@ module Ridgepole
       ActiveRecord::Base.establish_connection(conn_spec)
 
       # XXX: If the required processing in class method?
-      if !@options.key?(:index_removed_drop_column) && (Ridgepole::DefaultsLimit.adapter == :postgresql)
-        @options[:index_removed_drop_column] = true
-      end
+      @options[:index_removed_drop_column] = true if !@options.key?(:index_removed_drop_column) && (Ridgepole::DefaultsLimit.adapter == :postgresql)
 
       Ridgepole::ExecuteExpander.expand_execute(ActiveRecord::Base.connection)
       @dumper = Ridgepole::Dumper.new(@options)
       @parser = Ridgepole::DSLParser.new(@options)
       @diff = Ridgepole::Diff.new(@options)
 
-      if @options[:mysql_use_alter]
-        require 'ridgepole/ext/abstract_mysql_adapter/use_alter_index'
-      end
+      require 'ridgepole/ext/abstract_mysql_adapter/use_alter_index' if @options[:mysql_use_alter]
 
-      if @options[:mysql_dump_auto_increment]
-        require 'ridgepole/ext/abstract_mysql_adapter/dump_auto_increment'
-      end
+      require 'ridgepole/ext/abstract_mysql_adapter/dump_auto_increment' if @options[:mysql_dump_auto_increment]
     end
 
     def dump(&block)

data/lib/ridgepole/default_limit.rb

@@ -8,8 +8,8 @@ module Ridgepole
         float: 24,
         string: 255,
         text: 65_535,
-        binary: 65_535
-      }
+        binary: 65_535,
+      },
     }.freeze
 
     class << self

data/lib/ridgepole/delta.rb

@@ -110,9 +110,7 @@ module Ridgepole
 
       begin
         with_pre_post_query(options) do
-          unless script.empty?
-            ActiveRecord::Schema.new.instance_eval(script, SCRIPT_NAME, 1)
-          end
+          ActiveRecord::Schema.new.instance_eval(script, SCRIPT_NAME, 1) unless script.empty?
 
           execute_count = execute_sqls(options)
         end
@@ -311,9 +309,7 @@ execute "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name
         end
       end
 
-      unless foreign_keys.empty?
-        append_change_foreign_keys(table_name, foreign_keys, pre_buf_for_fk, post_buf_for_fk, @options)
-      end
+      append_change_foreign_keys(table_name, foreign_keys, pre_buf_for_fk, post_buf_for_fk, @options) unless foreign_keys.empty?
 
       append_change_table_options(table_name, table_options, buf) if table_options
 

data/lib/ridgepole/diff.rb

@@ -60,6 +60,7 @@ module Ridgepole
         next unless target?(table_name)
 
         next unless (from_table_name = (to_attrs[:options] || {}).delete(:renamed_from))
+
         from_table_name = from_table_name.to_s if from_table_name
 
         # Already renamed
@@ -112,9 +113,7 @@ module Ridgepole
       end
 
       [from, to].each do |table_attrs|
-        if table_attrs.key?(:default) && table_attrs[:default].nil?
-          table_attrs.delete(:default)
-        end
+        table_attrs.delete(:default) if table_attrs.key?(:default) && table_attrs[:default].nil?
       end
 
       if Ridgepole::ConnectionAdapters.mysql?
@@ -176,9 +175,7 @@ module Ridgepole
                Ridgepole::DSLParser::TableDefinition::DEFAULT_PRIMARY_KEY_TYPE
              end
 
-      if %i[integer bigint].include?(type) && !options.key?(:default) && !Ridgepole::ConnectionAdapters.postgresql?
-        options[:auto_increment] = true
-      end
+      options[:auto_increment] = true if %i[integer bigint].include?(type) && !options.key?(:default) && !Ridgepole::ConnectionAdapters.postgresql?
 
       { type: type, options: options }
     end
@@ -187,9 +184,7 @@ module Ridgepole
       normalize_column_options!(from_attrs, primary_key)
       normalize_column_options!(to_attrs, primary_key)
 
-      unless compare_column_attrs(from_attrs, to_attrs)
-        new_to_attrs = fix_change_column_options(table_name, from_attrs, to_attrs)
-      end
+      new_to_attrs = fix_change_column_options(table_name, from_attrs, to_attrs) unless compare_column_attrs(from_attrs, to_attrs)
       new_to_attrs
     end
 
@@ -197,6 +192,7 @@ module Ridgepole
       from_column_attrs = convert_to_primary_key_attrs(from.slice(*PRIMARY_KEY_OPTIONS))
       to_column_attrs = convert_to_primary_key_attrs(to.slice(*PRIMARY_KEY_OPTIONS))
       return if from_column_attrs == to_column_attrs
+
       build_attrs_if_changed(to_column_attrs, from_column_attrs, table_name, primary_key: true)
     end
 
@@ -240,9 +236,7 @@ module Ridgepole
         added_size = 0
         to.reverse_each.with_index do |(column_name, to_attrs), i|
           if to_attrs[:options].delete(:after)
-            if added_size != i
-              @logger.warn("[WARNING] PostgreSQL doesn't support adding a new column except for the last position. #{table_name}.#{column_name} will be added to the last.")
-            end
+            @logger.warn("[WARNING] PostgreSQL doesn't support adding a new column except for the last position. #{table_name}.#{column_name} will be added to the last.") if added_size != i
             added_size += 1
           end
         end
@@ -254,12 +248,11 @@ module Ridgepole
           definition_delta[:delete][column_name] = from_attrs
 
           next unless from_indices
+
           modified_indices = []
 
           from_indices.each do |name, attrs|
-            if attrs[:column_name].is_a?(Array) && attrs[:column_name].delete(column_name)
-              modified_indices << name
-            end
+            modified_indices << name if attrs[:column_name].is_a?(Array) && attrs[:column_name].delete(column_name)
           end
 
           # In PostgreSQL, the index is deleted when the column is deleted
@@ -281,14 +274,13 @@ module Ridgepole
     def scan_column_rename(from, to, definition_delta)
       to.dup.each do |column_name, to_attrs|
         next unless (from_column_name = (to_attrs[:options] || {}).delete(:renamed_from))
+
         from_column_name = from_column_name.to_s if from_column_name
 
         # Already renamed
         next if from[column_name]
 
-        unless from.key?(from_column_name)
-          raise "Column `#{from_column_name}` not found"
-        end
+        raise "Column `#{from_column_name}` not found" unless from.key?(from_column_name)
 
         definition_delta[:rename] ||= {}
         definition_delta[:rename][column_name] = from_column_name
@@ -388,9 +380,7 @@ module Ridgepole
     def columns_all_include?(expected_columns, actual_columns, table_options)
       return true unless expected_columns.is_a?(Array)
 
-      if (table_options[:id] != false) && !table_options[:primary_key].is_a?(Array)
-        actual_columns += [(table_options[:primary_key] || 'id').to_s]
-      end
+      actual_columns += [(table_options[:primary_key] || 'id').to_s] if (table_options[:id] != false) && !table_options[:primary_key].is_a?(Array)
 
       expected_columns.all? { |i| actual_columns.include?(i) }
     end
@@ -426,9 +416,7 @@ module Ridgepole
         end
       end
 
-      unless foreign_keys_delta.empty?
-        table_delta[:foreign_keys] = foreign_keys_delta
-      end
+      table_delta[:foreign_keys] = foreign_keys_delta unless foreign_keys_delta.empty?
     end
 
     # XXX: MySQL only?
@@ -450,9 +438,7 @@ module Ridgepole
       end
 
       if Ridgepole::ConnectionAdapters.mysql? && ActiveRecord::VERSION::STRING.start_with?('5.0.')
-        if to_attrs[:options][:default].nil? && (to_attrs[:options][:null] == false)
-          Ridgepole::Logger.instance.warn("[WARNING] Table `#{table_name}`: `default: nil` is ignored when `null: false`. Please apply twice")
-        end
+        Ridgepole::Logger.instance.warn("[WARNING] Table `#{table_name}`: `default: nil` is ignored when `null: false`. Please apply twice") if to_attrs[:options][:default].nil? && (to_attrs[:options][:null] == false)
       end
 
       to_attrs
@@ -498,14 +484,12 @@ module Ridgepole
       definition = table_attr[:definition] || {}
 
       definition.each do |column_name, column_attrs|
-        if column_name =~ /\w+_id\z/
-          attrs_by_column[column_name] = column_attrs.dup
-        end
+        attrs_by_column[column_name] = column_attrs.dup if column_name =~ /\w+_id\z/
       end
 
       relation_info[table_name] = {
         options: table_attr[:options] || {},
-        columns: attrs_by_column
+        columns: attrs_by_column,
       }
     end
 
@@ -537,12 +521,12 @@ module Ridgepole
 
           parent_column_info = {
             type: table_options[:id] || @options[:check_relation_type].to_sym,
-            unsigned: table_options[:unsigned]
+            unsigned: table_options[:unsigned],
           }
 
           child_column_info = {
             type: column_attrs[:type],
-            unsigned: column_attrs.fetch(:options, {})[:unsigned]
+            unsigned: column_attrs.fetch(:options, {})[:unsigned],
           }
 
           [parent_column_info, child_column_info].each do |column_info|
@@ -551,11 +535,12 @@ module Ridgepole
             # for PostgreSQL
             column_info[:type] = {
               serial: :integer,
-              bigserial: :bigint
+              bigserial: :bigint,
             }.fetch(column_info[:type], column_info[:type])
           end
 
           next unless 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
@@ -571,6 +556,7 @@ module Ridgepole
 
     def check_table_existence(definition)
       return unless @options[:tables]
+
       @options[:tables].each do |table_name|
         @logger.warn "[WARNING] '#{table_name}' definition is not found" unless definition.key?(table_name)
       end

data/lib/ridgepole/dsl_parser.rb

@@ -15,17 +15,13 @@ module Ridgepole
 
     def check_orphan_index(definition)
       definition.each do |table_name, attrs|
-        if attrs[:indices] && !(attrs[:definition])
-          raise "Table `#{table_name}` to create the index is not defined: #{attrs[:indices].keys.join(',')}"
-        end
+        raise "Table `#{table_name}` to create the index is not defined: #{attrs[:indices].keys.join(',')}" if attrs[:indices] && !(attrs[:definition])
       end
     end
 
     def check_orphan_foreign_key(definition)
       definition.each do |table_name, attrs|
-        if attrs[:foreign_keys] && !(attrs[:definition])
-          raise "Table `#{table_name}` to create the foreign key is not defined: #{attrs[:foreign_keys].keys.join(',')}"
-        end
+        raise "Table `#{table_name}` to create the foreign key is not defined: #{attrs[:foreign_keys].keys.join(',')}" if attrs[:foreign_keys] && !(attrs[:definition])
       end
     end
   end

data/lib/ridgepole/dsl_parser/context.rb

@@ -26,9 +26,7 @@ module Ridgepole
         table_name = table_name.to_s
         table_definition = TableDefinition.new(table_name, self)
 
-        if options[:primary_key] && options[:primary_key].is_a?(Symbol)
-          options[:primary_key] = options[:primary_key].to_s
-        end
+        options[:primary_key] = options[:primary_key].to_s if options[:primary_key] && options[:primary_key].is_a?(Symbol)
         if options[:id] && TableDefinition::ALIAS_TYPES.key?(options[:id])
           type, type_default_opts = TableDefinition::ALIAS_TYPES[options[:id]]
           options[:id] = type
@@ -38,9 +36,7 @@ module Ridgepole
         yield(table_definition)
         @__definition[table_name] ||= {}
 
-        if @__definition[table_name][:definition]
-          raise "Table `#{table_name}` already defined"
-        end
+        raise "Table `#{table_name}` already defined" if @__definition[table_name][:definition]
 
         @__definition[table_name][:definition] = table_definition.__definition
         options.delete(:force)
@@ -51,17 +47,13 @@ module Ridgepole
         table_name = table_name.to_s
         # Keep column_name for expression index support
         # https://github.com/rails/rails/pull/23393
-        unless column_name.is_a?(String) && /\W/ === column_name # rubocop:disable Style/CaseEquality
-          column_name = [column_name].flatten.map(&:to_s)
-        end
+        column_name = [column_name].flatten.map(&:to_s) unless column_name.is_a?(String) && /\W/ === column_name # rubocop:disable Style/CaseEquality
         options[:name] = options[:name].to_s if options[:name]
         @__definition[table_name] ||= {}
         @__definition[table_name][:indices] ||= {}
         idx = options[:name] || column_name
 
-        if @__definition[table_name][:indices][idx]
-          raise "Index `#{table_name}(#{idx})` already defined"
-        end
+        raise "Index `#{table_name}(#{idx})` already defined" if @__definition[table_name][:indices][idx]
 
         if options[:length].is_a?(Numeric)
           index_length = options[:length]
@@ -72,13 +64,11 @@ module Ridgepole
           end
         end
 
-        if options[:length]
-          options[:length] = options[:length].compact.symbolize_keys
-        end
+        options[:length] = options[:length].compact.symbolize_keys if options[:length]
 
         @__definition[table_name][:indices][idx] = {
           column_name: column_name,
-          options: options
+          options: options,
         }
       end
 
@@ -92,13 +82,11 @@ module Ridgepole
         @__definition[from_table][:foreign_keys] ||= {}
         idx = options[:name] || [from_table, to_table]
 
-        if @__definition[from_table][:foreign_keys][idx]
-          raise "Foreign Key `#{from_table}(#{idx})` already defined"
-        end
+        raise "Foreign Key `#{from_table}(#{idx})` already defined" if @__definition[from_table][:foreign_keys][idx]
 
         @__definition[from_table][:foreign_keys][idx] = {
           to_table: to_table,
-          options: options
+          options: options,
         }
       end
 
@@ -117,7 +105,7 @@ module Ridgepole
       def execute(sql, _name = nil, &cond)
         @__execute << {
           sql: sql,
-          condition: cond
+          condition: cond,
         }
       end
     end

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -14,7 +14,7 @@ module Ridgepole
 
         @__definition[name] = {
           type: type,
-          options: options
+          options: options,
         }
       end
 
@@ -87,7 +87,7 @@ module Ridgepole
         unsigned_integer: [:integer, { unsigned: true }],
         unsigned_bigint: [:bigint, { unsigned: true }],
         unsigned_float: [:float, { limit: 24, unsigned: true }],
-        unsigned_decimal: [:decimal, { precision: 10, unsigned: true }]
+        unsigned_decimal: [:decimal, { precision: 10, unsigned: true }],
       }.freeze
 
       # XXX:
@@ -124,12 +124,15 @@ module Ridgepole
       def references(*args)
         options = args.extract_options!
         polymorphic = options.delete(:polymorphic)
+        polymorphic_options = polymorphic.is_a?(Hash) ? polymorphic : {}
+        # https://github.com/rails/rails/blob/5-2-1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L167
+        polymorphic_options.merge!(options.slice(:null, :first, :after))
         index_options = options.key?(:index) ? options.delete(:index) : true
         type = options.delete(:type) || DEFAULT_PRIMARY_KEY_TYPE
 
         args.each do |col|
           column("#{col}_id", type, options)
-          column("#{col}_type", :string, polymorphic.is_a?(Hash) ? polymorphic : options) if polymorphic
+          column("#{col}_type", :string, polymorphic_options) if polymorphic
           if index_options
             columns = polymorphic ? ["#{col}_type", "#{col}_id"] : ["#{col}_id"]
             index(columns, index_options.is_a?(Hash) ? index_options : {})

data/lib/ridgepole/dumper.rb

@@ -13,23 +13,20 @@ module Ridgepole
       if target_tables
         conn.data_sources.each do |tbl|
           next if target_tables.include?(tbl)
+
           ActiveRecord::SchemaDumper.ignore_tables << tbl
         end
       end
 
       if ignore_tables
         conn.data_sources.each do |tbl|
-          if ignore_tables.any? { |i| i =~ tbl } && !(target_tables && target_tables.include?(tbl))
-            ActiveRecord::SchemaDumper.ignore_tables << tbl
-          end
+          ActiveRecord::SchemaDumper.ignore_tables << tbl if ignore_tables.any? { |i| i =~ tbl } && !(target_tables && target_tables.include?(tbl))
         end
       end
 
       stream = dump_from(conn)
 
-      if target_tables || ignore_tables
-        ActiveRecord::SchemaDumper.ignore_tables.clear
-      end
+      ActiveRecord::SchemaDumper.ignore_tables.clear if target_tables || ignore_tables
 
       stream.string.lines.each_cons(2) do |first_line, second_line|
         if first_line.start_with?('# Could not dump')

data/lib/ridgepole/execute_expander.rb

@@ -44,9 +44,7 @@ module Ridgepole
       private
 
       def append_alter_extra(sql)
-        if Ridgepole::ExecuteExpander.alter_extra && sql =~ /\AALTER\b/i
-          sql = sql + ',' + Ridgepole::ExecuteExpander.alter_extra
-        end
+        sql = sql + ',' + Ridgepole::ExecuteExpander.alter_extra if Ridgepole::ExecuteExpander.alter_extra && sql =~ /\AALTER\b/i
 
         sql
       end

data/lib/ridgepole/ext/schema_dumper.rb

@@ -28,13 +28,9 @@ module Ridgepole
               remove_prefix_and_suffix(foreign_key.to_table).inspect
             ]
 
-            if foreign_key.column != @connection.foreign_key_column_for(foreign_key.to_table)
-              parts << "column: #{foreign_key.column.inspect}"
-            end
+            parts << "column: #{foreign_key.column.inspect}" if foreign_key.column != @connection.foreign_key_column_for(foreign_key.to_table)
 
-            if foreign_key.custom_primary_key?
-              parts << "primary_key: #{foreign_key.primary_key.inspect}"
-            end
+            parts << "primary_key: #{foreign_key.primary_key.inspect}" if foreign_key.custom_primary_key?
 
             parts << "name: #{foreign_key.name.inspect}"
 

data/lib/ridgepole/external_sql_executer.rb

@@ -19,12 +19,14 @@ module Ridgepole
             ready = IO.select(files)
 
             next unless ready
+
             readable = ready[0]
 
             readable.each do |f|
               begin
                 data = f.read_nonblock(1024)
                 next if data.nil?
+
                 data.chomp!
 
                 if f == stderr

data/lib/ridgepole/version.rb

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

data/omnibus-ridgepole/.gitignore

@@ -0,0 +1,10 @@
+*.gem
+.bundle
+.kitchen/
+.kitchen.local.yml
+vendor/bundle
+pkg/*
+.vagrant
+bin/*
+files/**/cache/
+vendor/cookbooks

data/omnibus-ridgepole/Dockerfile.centos

@@ -0,0 +1,25 @@
+FROM centos:7
+
+RUN yum install -y centos-release-scl && \
+    yum-config-manager --enable rhel-server-rhscl-7-rpms && \
+    yum install -y \
+      rh-ruby25-dev \
+      rh-ruby25-ruby-devel \
+      make \
+      gcc \
+      gcc-c++ \
+      git \
+      rpm-build
+
+RUN scl enable rh-ruby25 -- \
+    gem install --no-document \
+      bundler \
+      omnibus
+
+COPY Gemfile /
+RUN scl enable rh-ruby25 -- \
+    bundle install
+
+WORKDIR /omnibus-ridgepole
+
+ENTRYPOINT ["/usr/bin/scl", "enable", "rh-ruby25", "--"]

data/omnibus-ridgepole/Dockerfile.ubuntu

@@ -0,0 +1,21 @@
+FROM ubuntu:xenial
+
+RUN apt-get update && \
+    apt-get install -y software-properties-common
+
+RUN apt-add-repository -y ppa:brightbox/ruby-ng && \
+    apt-get update && \
+    apt-get install -y \
+      ruby2.5 \
+      ruby2.5-dev \
+      build-essential \
+      git
+
+RUN gem install --no-document \
+      bundler \
+      omnibus
+
+COPY Gemfile /
+RUN bundle install
+
+WORKDIR /omnibus-ridgepole

data/omnibus-ridgepole/Gemfile

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+# Install omnibus
+gem 'omnibus', '~> 6.0'
+gem 'omnibus-software', git: 'https://github.com/chef/omnibus-software.git'
+
+gem 'rake'
+
+# Use Chef's software definitions. It is recommended that you write your own
+# software definitions, but you can clone/fork Chef's to get you started.
+# gem 'omnibus-software', github: 'chef/omnibus-software'
+
+# This development group is installed by default when you run `bundle install`,
+# but if you are using Omnibus in a CI-based infrastructure, you do not need
+# the Test Kitchen-based build lab. You can skip these unnecessary dependencies
+# by running `bundle install --without development` to speed up build times.
+group :development do
+  # Use Berkshelf for resolving cookbook dependencies
+  gem 'berkshelf', '~> 3.3'
+
+  # Use Test Kitchen with Vagrant for converging the build environment
+  gem 'test-kitchen',    '~> 1.4'
+  gem 'kitchen-vagrant', '~> 0.18'
+end

data/omnibus-ridgepole/README.md

@@ -0,0 +1,15 @@
+omnibus-ridgepole
+-----------------
+
+## Installation
+
+```sh
+bundle install
+bundle exec rake docker:image:build
+```
+
+## Build omnibus-ridgepole
+
+```sh
+bundle exec rake omnibus:build
+```

data/omnibus-ridgepole/Rakefile

@@ -0,0 +1,38 @@
+DOCKER_IMAGE_UBUNTU = 'omnibus-ridgepole-ubuntu'
+DOCKER_IMAGE_CENTOS = 'omnibus-ridgepole-chentos'
+
+namespace :docker do
+  namespace :image do
+    task build: ['build:ubuntu', 'build:centos']
+
+    namespace :build do
+      task :ubuntu do
+        sh 'docker', 'build', '-t', DOCKER_IMAGE_UBUNTU, '-f', 'Dockerfile.ubuntu', '.'
+      end
+
+      task :centos do
+        sh 'docker', 'build', '-t', DOCKER_IMAGE_CENTOS, '-f', 'Dockerfile.centos', '.'
+      end
+    end
+  end
+
+  namespace :omnibus do
+    task :build do
+      sh 'omnibus', 'build', 'ridgepole'
+    end
+  end
+end
+
+namespace :omnibus do
+  task build: ['build:ubuntu', 'build:centos']
+
+  namespace :build do
+    task :ubuntu do
+      sh 'docker', 'run', '-v', "#{pwd}:/omnibus-ridgepole", DOCKER_IMAGE_UBUNTU, 'bundle', 'exec', 'rake docker:omnibus:build'
+    end
+
+    task :centos do
+      sh 'docker', 'run', '-v', "#{pwd}:/omnibus-ridgepole", DOCKER_IMAGE_CENTOS, 'bundle', 'exec', 'rake docker:omnibus:build'
+    end
+  end
+end

data/omnibus-ridgepole/config/projects/ridgepole.rb

@@ -0,0 +1,27 @@
+require 'json'
+require 'open-uri'
+
+name 'ridgepole'
+maintainer 'winebarrel <sugawara@winebarrel.jp>'
+homepage 'https://github.com/winebarrel/ridgepole'
+
+# Defaults to C:/ridgepole on Windows
+# and /opt/ridgepole on all other platforms
+install_dir "#{default_root}/#{name}"
+
+build_version JSON.parse(open('https://rubygems.org/api/v1/gems/ridgepole.json', &:read)).fetch('version')
+build_iteration 1
+
+dependency 'preparation'
+
+# ridgepole dependencies/components
+override :ruby, version: '2.5.1'
+dependency 'ruby'
+dependency 'rubygems'
+dependency 'ridgepole'
+
+# Version manifest file
+dependency 'version-manifest'
+
+exclude '**/.git'
+exclude '**/bundler/git'

data/omnibus-ridgepole/config/software/ridgepole.rb

@@ -0,0 +1,13 @@
+require 'json'
+require 'open-uri'
+
+name 'ridgepole'
+
+default_version JSON.parse(open('https://rubygems.org/api/v1/gems/ridgepole.json', &:read)).fetch('version')
+
+license 'MIT'
+skip_transitive_dependency_licensing true
+
+build do
+  gem 'install ridgepole -N'
+end

data/omnibus-ridgepole/omnibus.rb

@@ -0,0 +1,54 @@
+#
+# This file is used to configure the ridgepole project. It contains
+# some minimal configuration examples for working with Omnibus. For a full list
+# of configurable options, please see the documentation for +omnibus/config.rb+.
+#
+
+# Build internally
+# ------------------------------
+# By default, Omnibus uses system folders (like +/var+ and +/opt+) to build and
+# cache components. If you would to build everything internally, you can
+# uncomment the following options. This will prevent the need for root
+# permissions in most cases.
+#
+# Uncomment this line to change the default base directory to "local"
+# -------------------------------------------------------------------
+# base_dir './local'
+#
+# Alternatively you can tune the individual values
+# ------------------------------------------------
+# cache_dir     './local/omnibus/cache'
+# git_cache_dir './local/omnibus/cache/git_cache'
+# source_dir    './local/omnibus/src'
+# build_dir     './local/omnibus/build'
+# package_dir   './local/omnibus/pkg'
+# package_tmp   './local/omnibus/pkg-tmp'
+
+# Disable git caching
+# ------------------------------
+# use_git_caching false
+
+# Enable S3 asset caching
+# ------------------------------
+# use_s3_caching true
+# s3_access_key  ENV['AWS_ACCESS_KEY_ID']
+# s3_secret_key  ENV['AWS_SECRET_ACCESS_KEY']
+# s3_profile     ENV['AWS_S3_PROFILE']
+# s3_bucket      ENV['AWS_S3_BUCKET']
+
+# Customize compiler bits
+# ------------------------------
+# solaris_compiler 'gcc'
+# build_retries 5
+# fetcher_read_timeout 120
+# fetcher_retries 5
+
+# Load additional software
+# ------------------------------
+# software_gems ['omnibus-software', 'my-company-software']
+# local_software_dirs ['/path/to/local/software']
+
+# Windows architecture defaults
+# ------------------------------
+windows_arch   %w{x86 x64}.include?((ENV['OMNIBUS_WINDOWS_ARCH'] || '').downcase) ?
+                 ENV['OMNIBUS_WINDOWS_ARCH'].downcase.to_sym : :x86

data/omnibus-ridgepole/package-scripts/ridgepole/postinst

@@ -0,0 +1 @@
+ln -sf /opt/ridgepole/embedded/bin/ridgepole /usr/bin

data/omnibus-ridgepole/package-scripts/ridgepole/postrm

@@ -0,0 +1 @@
+rm -f /usr/bin/ridgepole

data/spec/mysql/migrate/migrate_change_column3_spec.rb

@@ -168,6 +168,37 @@ describe 'Ridgepole::Client#diff -> migrate' do
     }
   end
 
+  context 'when use references with unsigned polymorphic (no change)' do
+    let(:actual_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "products_id", unsigned: true
+          t.string "products_type"
+          t.<%= cond('>= 5.1','bigint', 'integer') %> "user_id", unsigned: true
+          t.string "user_type"
+          t.index ["products_type", "products_id"]
+          t.index ["user_type", "user_id"]
+        end
+      ERB
+    end
+
+    let(:expected_dsl) do
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.references :products, :user, unsigned: true, polymorphic: true
+        end
+      RUBY
+    end
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
   context 'when use references (change)' do
     let(:actual_dsl) do
       erbh(<<-ERB)

data/spec/spec_helper.rb

@@ -119,7 +119,7 @@ module SpecHelper
         host: TEST_PG_HOST,
         port: TEST_PG_PORT,
         username: TEST_PG_USER,
-        password: TEST_PG_PASS
+        password: TEST_PG_PASS,
       }.merge(config)
     else
       {
@@ -128,7 +128,7 @@ module SpecHelper
         host: TEST_MYSQL_HOST,
         port: TEST_MYSQL_PORT,
         username: TEST_MYSQL_USER,
-        password: TEST_MYSQL_PASS
+        password: TEST_MYSQL_PASS,
       }.merge(config)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-05 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -272,6 +272,17 @@ files:
 - lib/ridgepole/schema_dumper_ext.rb
 - lib/ridgepole/schema_statements_ext.rb
 - lib/ridgepole/version.rb
+- omnibus-ridgepole/.gitignore
+- omnibus-ridgepole/Dockerfile.centos
+- omnibus-ridgepole/Dockerfile.ubuntu
+- omnibus-ridgepole/Gemfile
+- omnibus-ridgepole/README.md
+- omnibus-ridgepole/Rakefile
+- omnibus-ridgepole/config/projects/ridgepole.rb
+- omnibus-ridgepole/config/software/ridgepole.rb
+- omnibus-ridgepole/omnibus.rb
+- omnibus-ridgepole/package-scripts/ridgepole/postinst
+- omnibus-ridgepole/package-scripts/ridgepole/postrm
 - ridgepole.gemspec
 - spec/cli_helper.rb
 - spec/erb_helper.rb
@@ -421,12 +432,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.