ridgepole 0.8.0.rc1 → 0.8.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51752811fa355ec8328988d3f2b78f5eaa972379763e56498d7a9d8130e72b7c
-  data.tar.gz: 0e7dc4410a0c90fadc8c49d17292f947dfb14740cd89556e00420712a667ee79
+  metadata.gz: c2104cf0ea5eb17266081c4b2db6c7b390a3ebc4df734ccb898eb1478bb7c0ed
+  data.tar.gz: 702816a704bc72068d180d727ed553e3c76f7544db369d2cd589edc26bdd2afd
 SHA512:
-  metadata.gz: cec836a87f959d8ded39667c3e726c9c11756fa20a03e75d9082cb5e7325ecb75aa6e4faf4660ad08615d333e50f8799157228b60fed4f176480656e9b0c9d46
-  data.tar.gz: e1dd85e686cf7ebf3bee192e2ac26f1f533f935a9e0c286ab6717badd288572325fe6dca5fb8393d94d8c138407a5ca4718480274cd6c4d618ffe01b411ea196
+  metadata.gz: e04195925c916ae4c402ff82101eb27d1ee1f6e0018e1a74907257e0b6039bfd3026f4e022a14b64b884c4f22528b7292a3c9bb03ec838605467829dcfa54ce1
+  data.tar.gz: d5224c934575112e67f0932d18ec9167923f93a18d4d96924c29462576754f56c8198e4e6a19171b0bc9ddb4b5e1d849fabaff4c6b7852f32876c0f1bba08896

data/.rspec

@@ -1,3 +1,3 @@
---colour
+--color
 --require spec_helper
 --format HidePendingFormatter

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   Exclude:
     - 'gemfiles/**/*'
     - 'omnibus-ridgepole/**/*'
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
 Bundler/OrderedGems:
   Include:
     - 'Appraisals'
@@ -39,3 +39,5 @@ Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 Layout/ClosingHeredocIndentation:
   Enabled: false
+Style/NumericPredicate:
+  Enabled: false

data/.travis.yml

@@ -6,10 +6,9 @@ cache:
   - bundler
   - apt
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 before_script:
   - sudo service mysql stop
   - sudo service postgresql stop
@@ -44,5 +43,5 @@ matrix:
   exclude:
     - rvm: 2.3.8
       gemfile: gemfiles/activerecord_6.0.gemfile
-    - rvm: 2.4.5
+    - rvm: 2.4.6
       gemfile: gemfiles/activerecord_6.0.gemfile

data/Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise 'activerecord-5.0' do
   gem 'activerecord', '~> 5.0.1'
   gem 'pg', '< 1.0.0'
@@ -13,5 +15,5 @@ appraise 'activerecord-5.2' do
 end
 
 appraise 'activerecord-6.0' do
-  gem 'activerecord', '~> 6.0.0.rc1'
+  gem 'activerecord', '~> 6.0.0.rc2'
 end

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ridgepole.gemspec

data/README.md

@@ -5,9 +5,8 @@ Ridgepole is a tool to manage DB schema.
 It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.html#types-of-schema-dumps), and updates DB schema according to DSL.
 (like Chef/Puppet)
 
-[![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)<!--
-[![Unstable Version](https://img.shields.io/badge/unstable-0.7.5.beta2-green.svg?longCache=true&style=flat)](https://rubygems.org/gems/ridgepole/versions/0.7.5.beta2)
--->
+[![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
+[![Unstable Version](https://img.shields.io/badge/unstable-0.8.0.rc2-green.svg?longCache=true&style=flat)](https://rubygems.org/gems/ridgepole/versions/0.8.0.rc2)
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.7)](https://travis-ci.org/winebarrel/ridgepole)
 [![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.7)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.7)
 
@@ -99,6 +98,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Add ignore option ([pull#267](https://github.com/winebarrel/ridgepole/pull/267))
 * `>= 0.7.7`
   * Support URI query string ([pull#273](https://github.com/winebarrel/ridgepole/pull/273))
+* `>= 0.7.8`
+  * Fix for `add_foreign_key(..., column: ,,,)` ([pull#278](https://github.com/winebarrel/ridgepole/pull/278))
 </details>
 
 ## Installation

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'

data/bin/ridgepole

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 $LOAD_PATH << File.expand_path('../lib', __dir__)
 require 'yaml'
 require 'optparse'
@@ -10,9 +12,9 @@ $stdout.sync = true
 $stderr.sync = true
 
 Version = Ridgepole::VERSION
-DEFAULT_FILENAME = 'Schemafile'.freeze
+DEFAULT_FILENAME = 'Schemafile'
 
-MAGIC_COMMENT = <<-RUBY.freeze
+MAGIC_COMMENT = <<-RUBY
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 RUBY

data/gemfiles/activerecord_6.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.0.rc1"
+gem "activerecord", "~> 6.0.0.rc2"
 
 gemspec path: "../"

data/lib/ridgepole.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 require 'open3'
 require 'pp'

data/lib/ridgepole/cli/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 require 'yaml'
 

data/lib/ridgepole/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class Client
     def initialize(conn_spec, options = {})

data/lib/ridgepole/connection_adapters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class ConnectionAdapters
     def self.mysql?

data/lib/ridgepole/default_limit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class DefaultsLimit
     DEFAULTS_LIMITS = {

data/lib/ridgepole/delta.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class Delta
-    SCRIPT_NAME = '<Schema>'.freeze
+    SCRIPT_NAME = '<Schema>'
 
     def initialize(delta, options = {})
       @delta = delta

data/lib/ridgepole/diff.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class Diff
     PRIMARY_KEY_OPTIONS = %i[id limit default null precision scale collation unsigned].freeze
@@ -349,9 +351,9 @@ module Ridgepole
     end
 
     def target?(table_name)
-      if @options[:tables] && @options[:tables].include?(table_name)
+      if @options[:tables]&.include?(table_name)
         true
-      elsif @options[:ignore_tables] && @options[:ignore_tables].any? { |i| i =~ table_name }
+      elsif @options[:ignore_tables]&.any? { |i| i =~ table_name }
         false
       elsif @options[:tables]
         false

data/lib/ridgepole/dsl_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class DSLParser
     def initialize(options = {})

data/lib/ridgepole/dsl_parser/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class DSLParser
     class Context
@@ -26,7 +28,7 @@ module Ridgepole
         table_name = table_name.to_s
         table_definition = TableDefinition.new(table_name, self)
 
-        options[:primary_key] = options[:primary_key].to_s if options[:primary_key] && options[:primary_key].is_a?(Symbol)
+        options[:primary_key] = options[:primary_key].to_s if 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
@@ -80,7 +82,7 @@ module Ridgepole
         options[:column] = options[:column].to_s if options[:column]
         @__definition[from_table] ||= {}
         @__definition[from_table][:foreign_keys] ||= {}
-        idx = options[:name] || [from_table, to_table]
+        idx = options[:name] || [from_table, to_table, options[:column]]
 
         raise "Foreign Key `#{from_table}(#{idx})` already defined" if @__definition[from_table][:foreign_keys][idx]
 
@@ -91,7 +93,7 @@ module Ridgepole
       end
 
       def require(file)
-        schemafile = file =~ %r{\A/} ? file : File.join(@__working_dir, file)
+        schemafile = %r{\A/}.match?(file) ? file : File.join(@__working_dir, file)
 
         if File.exist?(schemafile)
           instance_eval(File.read(schemafile), schemafile)

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class DSLParser
     class TableDefinition

data/lib/ridgepole/dumper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class Dumper
     def initialize(options = {})

data/lib/ridgepole/execute_expander.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class ExecuteExpander
     class Stub
@@ -18,7 +20,7 @@ module Ridgepole
             callback.call(sql, name)
           end
 
-          if sql =~ /\A(SELECT|SHOW)\b/i
+          if /\A(SELECT|SHOW)\b/i.match?(sql)
             begin
               super(sql, name)
             rescue StandardError
@@ -28,7 +30,7 @@ module Ridgepole
             Stub.new
           end
         elsif Ridgepole::ExecuteExpander.use_script
-          if sql =~ /\A(SELECT|SHOW)\b/i
+          if /\A(SELECT|SHOW)\b/i.match?(sql)
             super(sql, name)
           else
             sql = append_alter_extra(sql)

data/lib/ridgepole/ext/abstract_adapter/disable_table_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/abstract_adapter'
 
 module Ridgepole

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 
 module Ridgepole

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/abstract_mysql_adapter'
 
 module Ridgepole

data/lib/ridgepole/ext/pp_sort_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   module Ext
     module PpSortHash

data/lib/ridgepole/ext/schema_dumper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/schema_dumper'
 
 module Ridgepole

data/lib/ridgepole/external_sql_executer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class ExternalSqlExecuter
     def initialize(script, logger)

data/lib/ridgepole/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
   class Logger < ::Logger
     include Singleton

data/lib/ridgepole/migration_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/migration'
 
 module Ridgepole

data/lib/ridgepole/schema_dumper_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/schema_dumper'
 
 module Ridgepole

data/lib/ridgepole/schema_statements_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/abstract/schema_statements'
 
 module Ridgepole

data/lib/ridgepole/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ridgepole
-  VERSION = '0.8.0.rc1'.freeze
+  VERSION = '0.8.0.rc2'
 end

data/ridgepole.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ridgepole/version'

data/spec/cli_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CLIHelper
   def default_cli_hook
     <<-RUBY.strip_heredoc

data/spec/erb_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include ERBh
 
 ERBh.define_method(:i) do |obj|

data/spec/hide_pending_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HidePendingFormatter < RSpec::Core::Formatters::ProgressFormatter
   RSpec::Core::Formatters.register self, :example_pending
   RSpec::Core::Formatters.register self, :dump_pending

data/spec/mysql/_migrate/migrate_change_table_option_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change mysql table options' do
     let(:actual_dsl) do

data/spec/mysql/bigint_pk/bigint_pk_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'Ridgepole::Client (with bigint pk)', condition: 5.0 do
   let(:id_primary_key_create_table) do
     <<-RUBY

data/spec/mysql/bigint_pk/int_pk_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'Ridgepole::Client (with integer pk)', condition: '>= 5.1.0' do
   context 'when with id:integer' do
     let(:dsl) do

data/spec/mysql/cli/config_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Ridgepole::Config do
   subject { Ridgepole::Config.load(config, env) }
 

data/spec/mysql/cli/ridgepole_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'ridgepole' do
   let(:differ) { false }
   let(:conf) { "'" + JSON.dump(conn_spec) + "'" }

data/spec/mysql/collation/collation_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (add collation)' do
     let(:actual_dsl) do

data/spec/mysql/comment/comment_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (add comment)' do
     let(:actual_dsl) do

data/spec/mysql/default_lambda/default_lambda_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'Ridgepole::Client (use default:lambda)' do
   context 'when create table with default:lambda' do
     subject { client }