ridgepole 0.6.6 → 0.7.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea467f03fc539a7a3ea42722fe4b42e552d5583a
-  data.tar.gz: 2d679e42be6a6f3a1034ff8ccfa66e8c349a9403
+  metadata.gz: 9c4e5ed48fbd6469287d34ef340f9a3693fc2470
+  data.tar.gz: e9cc11808cd560064217cf5441a875df892ca207
 SHA512:
-  metadata.gz: 297ace649b5038d556ae3255f0745daed7f3d07fb9c7dfeeedff13d4ec9fe92560a70e1076f3a6e11078e69d49341daba87f8a63456ddbbe902bb30d056f1c67
-  data.tar.gz: '062959707f274e168ae6bf8b81a65d24383fb168a1af074196aaf07ccde80a4974ffcc8ba6ff53bc881785b98220c5c0e912800c3203e567d5aa0c52f977eec6'
+  metadata.gz: ad5e244204d6cad0ea31b7b330813f2086e49881e4773277748beaf5f36de9e2c7a927bad952acdaf87631a1f932aa97ca5c0eaeeafe16bd35b06c5e9604637c
+  data.tar.gz: 4e6abdd8a8fd60bf425cf2431c693f140ddcf7836fd1b5f2353f31aa57f870def2d4c6442e0e144839010a3b8b4bd4d0927428cbb74bf23f821a68939c0fbe4b

data/.travis.yml

@@ -21,17 +21,12 @@ before_script:
 script:
   - bundle exec rake
 gemfile:
-  - gemfiles/activerecord_4.2.gemfile
   - gemfiles/activerecord_5.0.gemfile
+  - gemfiles/activerecord_5.1.gemfile
 env:
   matrix:
-    - ENABLE_MYSQL_AWESOME=0
-    - ENABLE_MYSQL_AWESOME=1
+    - POSTGRESQL=0
     - POSTGRESQL=1
-matrix:
-  exclude:
-    - env: ENABLE_MYSQL_AWESOME=1
-      gemfile: gemfiles/activerecord_5.0.gemfile
 services:
   - docker
 addons:

data/Appraisals

@@ -1,8 +1,7 @@
-appraise "activerecord-4.2" do
-  gem 'activerecord', '~> 4.2.0'
-  gem 'activerecord-mysql-awesome', '>= 0.0.7'
+appraise 'activerecord-5.0' do
+  gem 'activerecord', '~> 5.0.1'
 end
 
-appraise 'activerecord-5.0' do
-  gem 'activerecord', '~> 5.0.0'
+appraise 'activerecord-5.1' do
+  gem 'activerecord', '~> 5.1.0'
 end

data/README.md

@@ -73,6 +73,9 @@ add_foreign_key :articles, :authors # without `name:`
   * Use `t.column` for migration ([pull#114](https://github.com/winebarrel/ridgepole/pull/114))
   * Support DATABASE_URL format ([pull#118](https://github.com/winebarrel/ridgepole/pull/118))
   * Add Ruby2.4 CI ([pull#119](https://github.com/winebarrel/ridgepole/pull/119))
+* `>= 0.7.0`
+  * Remove Rails 4.x support
+  * Add Rails 5.1 support
 
 ## Installation
 

data/gemfiles/activerecord_5.0.gemfile

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

data/gemfiles/{activerecord_4.2.gemfile → activerecord_5.1.gemfile}

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.0"
-gem "activerecord-mysql-awesome", ">= 0.0.7"
+gem "activerecord", "~> 5.1.0"
 
 gemspec path: "../"

data/lib/ridgepole.rb

@@ -14,6 +14,7 @@ require 'diffy'
 module Ridgepole; end
 
 require 'ridgepole/client'
+require 'ridgepole/connection_adapters'
 require 'ridgepole/default_limit'
 require 'ridgepole/delta'
 require 'ridgepole/diff'

data/lib/ridgepole/client.rb

@@ -26,9 +26,7 @@ class Ridgepole::Client
       require 'ridgepole/ext/schema_dumper'
     end
 
-    if ActiveRecord::VERSION::MAJOR >= 5 and @options[:dump_without_table_options]
-      require 'ridgepole/ext/abstract_mysql_adapter/disable_table_options'
-    end
+    require 'ridgepole/ext/abstract_mysql_adapter/disable_table_options'
   end
 
   def dump(&block)

data/lib/ridgepole/connection_adapters.rb

@@ -0,0 +1,11 @@
+module Ridgepole
+  class ConnectionAdapters
+    def self.mysql?
+      defined?(ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter) && ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter)
+    end
+
+    def self.postgresql?
+      defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+    end
+  end
+end

data/lib/ridgepole/delta.rb

@@ -345,6 +345,11 @@ rename_column(#{table_name.inspect}, #{from_column_name.inspect}, #{to_column_na
     type = attrs.fetch(:type)
     options = attrs[:options] || {}
 
+    # Fix for https://github.com/rails/rails/commit/7f0567b43b73b1bd1a16bfac9cd32fcbf1321b51
+    if Ridgepole::ConnectionAdapters.mysql? and ActiveRecord::VERSION::STRING !~ /\A5\.0\./
+      options[:comment] = nil unless options.has_key?(:comment)
+    end
+
     if @options[:bulk_change]
       buf.puts(<<-EOS)
   t.change(#{column_name.inspect}, #{type.inspect}, #{inspect_options_include_default_proc(options)})

data/lib/ridgepole/diff.rb

@@ -55,8 +55,6 @@ class Ridgepole::Diff
       next unless target?(table_name)
 
       if (from_table_name = (to_attrs[:options] || {}).delete(:renamed_from))
-        from_table_name = from_table_name.to_s if from_table_name
-
         # Already renamed
         next if from[table_name]
 
@@ -149,7 +147,7 @@ class Ridgepole::Diff
       priv_column_name = column_name
     end
 
-    if self.class.postgresql?
+    if Ridgepole::ConnectionAdapters.postgresql?
       added_size = 0
       to.reverse_each.with_index do |(column_name, to_attrs), i|
         if to_attrs[:options].delete(:after)
@@ -197,8 +195,6 @@ class Ridgepole::Diff
   def scan_column_rename(from, to, definition_delta)
     to.dup.each do |column_name, to_attrs|
       if (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]
 
@@ -372,8 +368,10 @@ class Ridgepole::Diff
       to_attrs[:options].delete(:null)
     end
 
-    if to_attrs[:options][:default] == nil and to_attrs[:options][:null] == false
-      Ridgepole::Logger.instance.warn("[WARNING] Table `#{table_name}`: `default: nil` is ignored when `null: false`. Please apply twice")
+    if Ridgepole::ConnectionAdapters.mysql? and ActiveRecord::VERSION::STRING =~ /\A5\.0\./
+      if to_attrs[:options][:default] == nil and to_attrs[:options][:null] == false
+        Ridgepole::Logger.instance.warn("[WARNING] Table `#{table_name}`: `default: nil` is ignored when `null: false`. Please apply twice")
+      end
     end
 
     to_attrs
@@ -403,7 +401,4 @@ class Ridgepole::Diff
     diffy.to_s(:text).gsub(/\s+\z/m, '')
   end
 
-  def self.postgresql?
-    defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-  end
 end

data/lib/ridgepole/dsl_parser/context.rb

@@ -65,10 +65,7 @@ class Ridgepole::DSLParser
           options[:length][col] = index_length
         end
 
-        # XXX: fix for https://github.com/rails/rails/commit/5025fd3a99c68f95bdd6fd43f382c62e9653236b
-        if ActiveRecord::VERSION::MAJOR >= 6 or (ActiveRecord::VERSION::MAJOR == 5 and (ActiveRecord::VERSION::MINOR >= 1 or ActiveRecord::VERSION::TINY >= 1))
-          options[:length] = options[:length].symbolize_keys
-        end
+        options[:length] = options[:length].symbolize_keys
       end
 
       @__definition[table_name][:indices][idx] = {

data/lib/ridgepole/dumper.rb

@@ -36,17 +36,6 @@ class Ridgepole::Dumper
       line !~ /\Aend/
     end
 
-    # XXX: for activerecord-mysql-awesome
-    if ActiveRecord::VERSION::MAJOR < 5
-      dsl = dsl.map do |line|
-        if @options[:dump_without_table_options] and line =~ /\A  create_table /
-          line.gsub(/, options: ("(?:[^"]|\")*")/, '')
-        else
-          line
-        end
-      end
-    end
-
     dsl = dsl.join.strip_heredoc
 
     definitions = []

data/lib/ridgepole/schema_statements_ext.rb

@@ -2,7 +2,7 @@ require 'active_record/connection_adapters/abstract/schema_statements'
 
 module Ridgepole
   module SchemaStatementsExt
-    def index_name_exists?(table_name, column_name, options = {})
+    def index_name_exists?(table_name, column_name, default = nil)
       if Ridgepole::ExecuteExpander.noop
         caller_methods = caller.map {|i| i =~ /:\d+:in `(.+)'/ ? $1 : '' }
         if caller_methods.any? {|i| i =~ /\Aremove_index/ }

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.6'
+  VERSION = '0.7.0.alpha'
 end

data/ridgepole.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 4.2', '< 6'
+  spec.add_dependency 'activerecord', '>= 5.0.1', '< 6'
   spec.add_dependency 'diffy'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
   spec.add_development_dependency 'erbh', '>= 0.1.2'
   spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
-  spec.add_development_dependency 'hash_order_helper', '>= 0.1.5'
+  spec.add_development_dependency 'hash_order_helper', '>= 0.1.6'
 end

data/ridgepole.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

data/spec/erb_helper.rb

@@ -10,25 +10,29 @@ ERBh.define_method(:i) do |obj|
 end
 
 ERBh.define_method(:add_index) do |table_name, column_name, options|
-  if condition(:activerecord_5)
-    if options[:length].is_a?(Hash)
-      options[:length] = options[:length].symbolize_keys
-    end
+  if options[:length].is_a?(Hash)
+    options[:length] = options[:length].symbolize_keys
+  end
 
-    @_erbout.sub!(/\bend\s*\z/, '')
+  @_erbout.sub!(/\bend\s*\z/, '')
 
-    <<-EOS
-        t.index #{column_name.inspect}, #{options.modern_inspect_without_brace}
-      end
-    EOS
-  else
-    "add_index #{table_name.inspect}, #{column_name.inspect}, #{options.modern_inspect_without_brace}"
+  # XXX:
+  if not condition('5.0') and options[:using] == :btree
+    options.delete(:using)
   end
+
+  # XXX:
+  if options.has_key?(:force_using)
+    options[:using] = options.delete(:force_using)
+  end
+
+  <<-EOS
+      t.index #{column_name.inspect}, #{options.modern_inspect_without_brace}
+    end
+  EOS
 end
 
 ERBh.define_method(:unsigned) do |value, *conds|
-  conds = [:mysql_awesome_enabled] if conds.empty?
-
   if condition(*conds)
     {unsigned: value}
   else
@@ -37,11 +41,17 @@ ERBh.define_method(:unsigned) do |value, *conds|
 end
 
 ERBh.define_method(:limit) do |value, *conds|
-  conds = [:activerecord_4] if conds.empty?
-
   if condition(*conds)
     {limit: value}
   else
     {}
   end
 end
+
+ERBh.define_method(:cond) do |conds, m, e = nil|
+  if condition(*Array(conds))
+    m
+  else
+    e || (m.class.new rescue nil)
+  end
+end

data/spec/mysql/bigint_pk/bigint_pk_spec.rb

@@ -1,45 +1,45 @@
-describe 'Ridgepole::Client (with bigint pk)', condition: [:mysql_awesome_enabled, :activerecord_5] do
-  let(:dsl1) {
-    erbh(<<-EOS)
+describe 'Ridgepole::Client (with bigint pk)', condition: '5.0.' do
+  let(:id_primary_key_create_table) {
+    <<-RUBY
       create_table "books", id: :primary_key, limit: 8, force: :cascade do |t|
-        t.string   "title",      <%= i limit(255) + {null: false} %>
-        t.integer  "author_id",  <%= i limit(4) + {null: false} %>
+        t.string   "title",      null: false
+        t.integer  "author_id",  null: false
         t.datetime "created_at"
         t.datetime "updated_at"
       end
-    EOS
+    RUBY
   }
 
-  let(:dsl2) {
-    erbh(<<-EOS)
+  let(:id_bigint_create_table) {
+    <<-RUBY
       create_table "books", id: :bigint, force: :cascade do |t|
-        t.string   "title",      <%= i limit(255) + {null: false} %>
-        t.integer  "author_id",  <%= i limit(4) + {null: false} %>
+        t.string   "title",      null: false
+        t.integer  "author_id",  null: false
         t.datetime "created_at"
         t.datetime "updated_at"
       end
-    EOS
+    RUBY
   }
 
   context 'when with limit:8' do
     subject { client }
 
-    before { subject.diff(dsl1).migrate }
+    before { subject.diff(id_primary_key_create_table).migrate }
 
     it {
       expect(show_create_table(:books)).to include '`id` bigint(20) NOT NULL AUTO_INCREMENT'
-      expect(subject.dump).to match_fuzzy dsl2
+      expect(subject.dump).to match_fuzzy id_bigint_create_table
     }
   end
 
   context 'when with id:bigint' do
     subject { client }
 
-    before { subject.diff(dsl2).migrate }
+    before { subject.diff(id_bigint_create_table).migrate }
 
     it {
       expect(show_create_table(:books)).to include '`id` bigint(20) NOT NULL AUTO_INCREMENT'
-      expect(subject.dump).to match_fuzzy dsl2
+      expect(subject.dump).to match_fuzzy id_bigint_create_table
     }
   end
 end

data/spec/mysql/bigint_pk/int_pk_spec.rb

@@ -0,0 +1,45 @@
+describe 'Ridgepole::Client (with integer pk)', condition: '5.1.' do
+  context 'when with id:integer' do
+    let(:dsl) {
+      <<-RUBY
+        create_table "books", id: :integer, force: :cascade do |t|
+          t.string   "title",      null: false
+          t.integer  "author_id",  null: false
+          t.datetime "created_at"
+          t.datetime "updated_at"
+        end
+      RUBY
+    }
+
+    subject { client }
+
+    before { subject.diff(dsl).migrate }
+
+    specify {
+      expect(show_create_table(:books)).to include '`id` int(11) NOT NULL AUTO_INCREMENT'
+      expect(subject.dump).to match_fuzzy dsl
+    }
+  end
+
+  context 'when without id:integer' do
+    let(:dsl) {
+      <<-RUBY
+        create_table "books", force: :cascade do |t|
+          t.string   "title",      null: false
+          t.integer  "author_id",  null: false
+          t.datetime "created_at"
+          t.datetime "updated_at"
+        end
+      RUBY
+    }
+
+    subject { client }
+
+    before { subject.diff(dsl).migrate }
+
+    specify {
+      expect(show_create_table(:books)).to include '`id` bigint(20) NOT NULL AUTO_INCREMENT'
+      expect(subject.dump).to match_fuzzy dsl
+    }
+  end
+end

data/spec/mysql/cli/config_spec.rb

@@ -11,7 +11,7 @@ describe Ridgepole::Config do
       YAML
     }
     let(:env) { 'development' }
-    it {
+    specify {
       expect(subject['adapter']).to eq "mysql2"
       expect(subject['encoding']).to eq "utf8"
       expect(subject['database']).to eq "blog"
@@ -29,7 +29,7 @@ describe Ridgepole::Config do
       YAML
     }
     let(:env) { 'development' }
-    it {
+    specify {
       expect(subject['adapter']).to eq "mysql2"
       expect(subject['encoding']).to eq "utf8"
       expect(subject['database']).to eq "blog_3"
@@ -41,7 +41,7 @@ describe Ridgepole::Config do
     let(:config) {
       <<-YAML.strip_heredoc
         development:
-          adapter: sqlite
+          adapter: sqlspecifye
           database: db/sample.db
         production:
           adapter: mysql2
@@ -53,8 +53,8 @@ describe Ridgepole::Config do
 
     context 'in development env' do
       let(:env) { 'development' }
-      it {
-        expect(subject['adapter']).to eq "sqlite"
+      specify {
+        expect(subject['adapter']).to eq "sqlspecifye"
         expect(subject['database']).to eq "db/sample.db"
         expect(subject['username']).to be_nil
       }
@@ -62,7 +62,7 @@ describe Ridgepole::Config do
 
     context 'in production env' do
       let(:env) { 'production' }
-      it {
+      specify {
         expect(subject['adapter']).to eq "mysql2"
         expect(subject['encoding']).to eq "utf8"
         expect(subject['database']).to eq "blog"
@@ -101,7 +101,7 @@ describe Ridgepole::Config do
 
     let(:env) { 'development' }
 
-    it {
+    specify {
       expect {
         subject
       }.to raise_error 'Invalid config: "database.yml"'